1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-09 08:31:13 +02:00

More merges details. (Shift-Record; About Text)

This commit is contained in:
James Crook 2016-09-11 14:33:04 +01:00
parent 324026df6c
commit 7db684d0a2
2 changed files with 23 additions and 1 deletions

View File

@ -207,6 +207,14 @@ static wxString HelpTextBuiltIn( const wxString & Key )
wxT("<br><br>Audacity has these support methods:") + wxT("<ul><li>") +
wxT(" [[http://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") +
wxT(" [[http://forum.audacityteam.org/|Forum]] - for large knowledge base on using Audacity.") + wxT("</li></ul>")
#else
wxT("<center><h3>Audacity ") + AUDACITY_VERSION_STRING + wxT("</h3><h3>") +
_("How to get help") + wxT("</h3></center>") +
_("These are our support methods:") + wxT("<p><ul><li>") +
_(" [[file:quick_help.html|Quick Help]] - if not installed locally, [[http://manual.audacityteam.org/quick_help.html|view online]]") + wxT("</li><li>") +
_(" [[file:index.html|Manual]] - if not installed locally, [[http://manual.audacityteam.org/|view online]]") + wxT("</li><li>") +
_(" [[http://forum.audacityteam.org/|Forum]] - ask your question directly, online.") + wxT("</li></ul></p><p>") + wxT("<b>") +
_("More:</b> Visit our [[http://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + wxT("</p>")
#endif
);
}
@ -231,10 +239,19 @@ audio CDs]].") + wxT("</p>")
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]].<br><br>\
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]].<br><br>\
To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")
#endif
);
}
return wxT("");

View File

@ -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"));