From 3b11093766505633cd2b93ebb3d450c40a351b4b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 20 Jun 2018 22:53:47 -0400
Subject: [PATCH 1/4] Change message for Punch and Roll when track selection is
 inappropriate

---
 src/Menus.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 667b5ffa4..d4a937076 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -8531,13 +8531,13 @@ void AudacityProject::OnPunchAndRoll(const CommandContext &WXUNUSED(context))
    if (tracks.empty()) {
       int recordingChannels =
          std::max(0L, gPrefs->Read(wxT("/AudioIO/RecordChannels"), 2));
-      auto format = wxPLURAL(
-         "Please select at least %d channel.",
-         "Please select at least %d channels.",
-         recordingChannels
-         );
       auto message =
-         wxString::Format(format, recordingChannels);
+         (recordingChannels == 1)
+         ? _("Please select in a mono track.")
+         : (recordingChannels == 2)
+         ? _("Please select in a stereo track.")
+         : wxString::Format(
+            _("Please select at least %d channels."), recordingChannels);
       AudacityMessageBox(message);
       return;
    }

From cbe6c9eb46f84572fa5f47c66ff5cc34802d5d6d Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 20 Jun 2018 22:55:28 -0400
Subject: [PATCH 2/4] "Time shift for record" replaces "Track shift after
 record"

---
 src/prefs/DevicePrefs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
index f7e04afac..d08ac54b2 100644
--- a/src/prefs/DevicePrefs.cpp
+++ b/src/prefs/DevicePrefs.cpp
@@ -179,7 +179,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
          S.AddUnits(_("milliseconds"));
          if( w ) w->SetName(w->GetName() + wxT(" ") + _("milliseconds"));
 
-         w = S.TieNumericTextBox(_("Track &shift after record:"),
+         w = S.TieNumericTextBox(_("Time &shift for record:"),
                                  wxT("/AudioIO/LatencyCorrection"),
                                  DEFAULT_LATENCY_CORRECTION,
                                  9);

From 76282a1da17eff04f869c022b22d4df790484369 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 20 Jun 2018 22:56:54 -0400
Subject: [PATCH 3/4] Simply "Pre-roll:" not "Pre-roll duration:"

---
 src/prefs/RecordingPrefs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index c2b475a82..d8cad408a 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -229,7 +229,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartThreeColumn();
          {
-            auto w = S.TieNumericTextBox(_("Pre-ro&ll duration:"),
+            auto w = S.TieNumericTextBox(_("Pre-ro&ll:"),
                AUDIO_PRE_ROLL_KEY,
                DEFAULT_PRE_ROLL_SECONDS,
                9);

From 46fb2960c0f6ff3dca8fa9fc20b22d4d8bd52605 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 20 Jun 2018 23:02:22 -0400
Subject: [PATCH 4/4] Links to help for errors in usage of P&R

---
 src/Menus.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index d4a937076..e66c4413a 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -8518,6 +8518,9 @@ int AudacityProject::DialogForLabelName(const wxString& initialValue, wxString&
 #ifdef EXPERIMENTAL_PUNCH_AND_ROLL
 void AudacityProject::OnPunchAndRoll(const CommandContext &WXUNUSED(context))
 {
+   static const auto url =
+      wxT("Punch_and_Roll_Record#Using_Punch_and_Roll_Record");
+
    if (gAudioIO->IsBusy()) 
       return;
 
@@ -8538,7 +8541,7 @@ void AudacityProject::OnPunchAndRoll(const CommandContext &WXUNUSED(context))
          ? _("Please select in a stereo track.")
          : wxString::Format(
             _("Please select at least %d channels."), recordingChannels);
-      AudacityMessageBox(message);
+      ShowErrorDialog(this, _("Error"), message, url);
       return;
    }
 
@@ -8554,7 +8557,7 @@ void AudacityProject::OnPunchAndRoll(const CommandContext &WXUNUSED(context))
       // that case, so a normal record, not a punch and roll, is called for.
       if (!wt->GetClipAtSample(sampleCount(floor(t1 * wt->GetRate()))) || t1 ==0.0) {
          auto message = _("Please select a time within a clip.");
-         AudacityMessageBox(message);
+         ShowErrorDialog(this, _("Error"), message, url);
          return;
       }
       const auto endTime = wt->GetEndTime();