From ef659ed8228a64b8dc1d6214beaa75e151105880 Mon Sep 17 00:00:00 2001 From: James Crook Date: Mon, 20 Apr 2020 20:45:42 +0100 Subject: [PATCH] Bug 2128 - (Residual) Better error messages for mismatched rates. --- src/ProjectAudioManager.cpp | 14 +++++++------- src/menus/TransportMenus.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp index c32fde8f8..8c7e2677d 100644 --- a/src/ProjectAudioManager.cpp +++ b/src/ProjectAudioManager.cpp @@ -488,9 +488,9 @@ void ProjectAudioManager::OnRecord(bool altAppearance) const bool allSameRate{ selectedTracks.allSameRate }; if (!allSameRate) { - AudacityMessageBox(XO("TRACK SELECTION PROBLEM:\nthe tracks selected " + AudacityMessageBox(XO("The tracks selected " "for recording must all have the same sampling rate"), - XO("Unfitting track selection"), + XO("Mismatched Sampling Rates"), wxICON_ERROR | wxCENTRE); return; @@ -508,11 +508,11 @@ void ProjectAudioManager::OnRecord(bool altAppearance) } else { if (numberOfSelected > 0 && rateOfSelected != options.rate) { - AudacityMessageBox(XO("TRACK SELECTION PROBLEM:\n" - "Not enough tracks are selected for recording on non-project rate.\n" - "(keep in mind that Audacity doesn\'t allow " - "using only one channel of a stereo track)"), - XO("Insufficient track selection"), + AudacityMessageBox(XO( + "Too few tracks are selected for recording at this sample rate.\n" + "(Audacity requires two channels at the same sample rate for\n" + "each stereo track)"), + XO("Too Few Compatible Tracks Selected"), wxICON_ERROR | wxCENTRE); return; diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index bffd454ad..f8673f90c 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -293,9 +293,9 @@ void OnTimerRecord(const CommandContext &context) const bool allSameRate{ selectedTracks.allSameRate }; if (!allSameRate) { - AudacityMessageBox(XO("TRACK SELECTION PROBLEM:\nthe tracks selected " + AudacityMessageBox(XO("The tracks selected " "for recording must all have the same sampling rate"), - XO("Unfitting track selection"), + XO("Mismatched Sampling Rates"), wxICON_ERROR | wxCENTRE); return; @@ -413,9 +413,9 @@ void OnPunchAndRoll(const CommandContext &context) const bool allSameRate{ selectedTracks.allSameRate }; if (!allSameRate) { - AudacityMessageBox(XO("TRACK SELECTION PROBLEM:\nthe tracks selected " + AudacityMessageBox(XO("The tracks selected " "for recording must all have the same sampling rate"), - XO("Unfitting track selection"), + XO("Mismatched Sampling Rates"), wxICON_ERROR | wxCENTRE); return;