From 7db684d0a20140bfc2b1b71e7f175dfdb637453e Mon Sep 17 00:00:00 2001
From: James Crook
Date: Sun, 11 Sep 2016 14:33:04 +0100
Subject: [PATCH] More merges details. (Shift-Record; About Text)
---
src/HelpText.cpp | 17 +++++++++++++++++
src/toolbars/ControlToolBar.cpp | 7 ++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index d2ef09090..5685fcd54 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -207,6 +207,14 @@ static wxString HelpTextBuiltIn( const wxString & Key )
wxT("
Audacity has these support methods:") + wxT("- ") +
wxT(" [[http://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("
- ") +
wxT(" [[http://forum.audacityteam.org/|Forum]] - for large knowledge base on using Audacity.") + wxT("
")
+#else
+ wxT("Audacity ") + AUDACITY_VERSION_STRING + wxT("
") +
+ _("How to get help") + wxT("
") +
+ _("These are our support methods:") + wxT("- ") +
+ _(" [[file:quick_help.html|Quick Help]] - if not installed locally, [[http://manual.audacityteam.org/quick_help.html|view online]]") + wxT("
- ") +
+ _(" [[file:index.html|Manual]] - if not installed locally, [[http://manual.audacityteam.org/|view online]]") + wxT("
- ") +
+ _(" [[http://forum.audacityteam.org/|Forum]] - ask your question directly, online.") + wxT("
") + wxT("") +
+ _("More: Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + wxT("
")
#endif
);
}
@@ -231,10 +239,19 @@ audio CDs]].") + wxT("")
if(Key == wxT("remotehelp") )
{
// *URL* will be replaced by whatever URL we are looking for.
+#ifdef EXPERIMENTAL_DA
return WrapText(_("The Manual does not appear to be installed. \
Please [[*URL*|view the Manual online]].
\
To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")
+#else
+ return WrapText(_("The Manual does not appear to be installed. \
+Please [[*URL*|view the Manual online]] or \
+[[http://manual.audacityteam.org/man/unzipping_the_manual.html| \
+download the Manual]].
\
+To always view the Manual online, change \"Location of Manual\" in \
+Interface Preferences to \"From Internet\".")
+#endif
);
}
return wxT("");
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 9e820f9b6..fe33d4e20 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -217,14 +217,19 @@ void ControlToolBar::RegenerateTooltips()
switch (iWinID)
{
case ID_PLAY_BUTTON:
+ // Without shift
commands.push_back(wxT("Play"));
+ // With shift
commands.push_back(_("Loop Play"));
commands.push_back(wxT("PlayLooped"));
break;
case ID_RECORD_BUTTON:
+ // Without shift
commands.push_back(wxT("Record"));
+ // With shift
#ifndef EXPERIMENTAL_DA
- commands.push_back(wxT("RecordBelow"));
+ commands.push_back(_("Append Record"));
+ commands.push_back(wxT("RecordAppend"));
#else
commands.push_back(_("Record Below"));
commands.push_back(wxT("RecordBelow"));