diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 4a7f026ae..0db71048a 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -371,14 +371,9 @@ visit our [[https://forum.audacityteam.org/|forum]]."); #ifdef EXPERIMENTAL_DA wxT("
DarkAudacity website: [[https://www.darkaudacity.com/|https://www.darkaudacity.com/]]") + #else - []{ - // Will this post-translation substitution work in all locales? - // As of 2.2.2, yes for all of the up-to-date languages. - auto str = - _("


    Audacity® software is copyright © 1999-2017 Audacity Team.
"); - str.Replace( wxT("2017"), wxT("2018") ); - return str; - }() + + _("


    Audacity® software is copyright © 1999-2018 Audacity Team.
") + + + _("    The name Audacity is a registered trademark of Dominic Mazzoni.

") + #endif diff --git a/src/HelpText.cpp b/src/HelpText.cpp index c273718a7..e8180869a 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -200,27 +200,6 @@ wxString TitleText( const wxString & Key ) return Key; } -namespace { - // This is ugly transitional stuff for 2.2.0 only - // The target string may have been localized but contains a link that we - // need to change to fix remote help, while preserving the translated - // material. - // In future we should not put Wiki and HTML markup inside - // internationalized strings! Descriptive text for the link should be - // localized separately, then replaced using string formatting. - wxString Substitute(wxString target, - const wxString &given, - const wxString &replacement) { - target.Replace(given, replacement); - return target; - - } - wxString EditLink( const wxString &str ) - { - return Substitute( str, wxT("http:"), wxT("https:") ); - } -} - static wxString HelpTextBuiltIn( const wxString & Key ) { // PRL: Is it necessary to define these outside of conditional compilation so that both get into the .pot file? @@ -244,16 +223,16 @@ static wxString HelpTextBuiltIn( const wxString & Key ) #endif + " " + _("We strongly recommend that you use our latest stable released version, which has full documentation and support.

") + - EditLink (_("You can help us get Audacity ready for release by joining our [[http://www.audacityteam.org/community/|community]].




") )+ + _("You can help us get Audacity ready for release by joining our [[https://www.audacityteam.org/community/|community]].


") + #endif // DA: Support methods text. #ifdef EXPERIMENTAL_DA wxT("

DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("

") + _("

DarkAudacity is based on Audacity:") + wxT("") ) + + _(" [[https://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("") + wxT("

Audacity has these support methods:") + wxT("

") + wxT("") + + _("More: Visit our [[https://wiki.audacityteam.org/index.php|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + wxT("

"); #endif #ifdef USE_ALPHA_MANUAL @@ -279,18 +258,15 @@ static wxString HelpTextBuiltIn( const wxString & Key ) { return WrapText( wxString(wxT("

"))+ - EditLink( _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ + _("Audacity can import unprotected files in many other formats (such as M4A and WMA, \ compressed WAV files from portable recorders and audio from video files) if you download and install \ -the optional [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign| \ -FFmpeg library]] to your computer.") ) + wxT("

") + -EditLink( Substitute( +the optional [[https://manual.audacityteam.org/man/faq_opening_and_saving_files.html#foreign| \ +FFmpeg library]] to your computer.") + wxT("

") + _("You can also read our help on importing \ -[[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#midi|MIDI files]] \ +[[https://manual.audacityteam.org/man/playing_and_recording.html#midi|MIDI files]] \ and tracks from [[http://manual.audacityteam.org/man/faq_opening_and_saving_files.html#fromcd| \ -audio CDs]]."), - wxT("faq_opening_and_saving_files.html#midi"), - wxT("playing_and_recording.html#midi") -) ) + wxT("

") +audio CDs]].") + + wxT("

") ); } @@ -307,12 +283,12 @@ 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( EditLink( _("The Manual does not appear to be installed. \ + 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| \ +[[https://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\"."))); +Interface Preferences to \"From Internet\".")); #endif } return wxT("");