diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 32f65f631..77b257e5d 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -196,19 +196,18 @@ AboutDialog::AboutDialog(wxWindow * parent) void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) { - wxString versionStr = AUDACITY_VERSION_STRING; - - - creditItems.DeleteContents(true); // switchon automatic deletion of list items + creditItems.DeleteContents(true); // Switch on automatic deletion of list items. CreateCreditsList(); - wxString par1Str = _( - "Audacity is a free program written by a worldwide team of volunteer developers. We thank SourceForge.net and Google Code for our project hosting. Audacity is available for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); +"Audacity is a free program written by a worldwide team of volunteer developers. \ +We thank Google Code and SourceForge.net for hosting our project. \ +Audacity is available for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); - // No such thing as an official released 'beta' anymore, so keep this string simple. wxString par2Str = _( - "If you find a bug or have a suggestion for us, please write to our Feedback address. For help, view the tips and tricks on our Wiki or visit our Forum."); +"If you find a bug or have a suggestion for us, please write to our feedback address. \ +For help, view the tips and tricks on our wiki or \ +visit our forum."); wxString translatorCredits; /* i18n-hint: The translation of "translator_credits" will appear @@ -216,10 +215,9 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) * your own name(s) to the credits. * * For example: "English translation by Dominic Mazzoni." */ - if (_("translator_credits") != wxString(wxT("translator_credits"))) { - translatorCredits += wxT("

"); - translatorCredits += _("translator_credits"); - translatorCredits += wxT("
"); + if (_("translator_credits") != wxString(wxT("translator_credits"))) + { + translatorCredits = _("translator_credits"); } wxString localeStr = wxLocale::GetSystemEncodingName(); @@ -228,59 +226,41 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) localeStr + wxT("\">") + wxT("
") + - wxT("

Audacity ") + versionStr + wxT("

")+ - _("A Free Digital Audio Editor
") + + wxT("

Audacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("

")+ + _("free, open source, cross-platform software for recording and editing sounds
") + wxT("http://audacity.sourceforge.net/") + - wxT("

") + par1Str + + wxT("


") + par1Str + wxT("

") + par2Str + - wxT("

") + _("Credits") + wxT("
") - + translatorCredits + - wxT("

") + + wxT("

") + _("Credits") + wxT("

") + + wxT("

") + translatorCredits + - /* i18n-hint: %s will be replaced by the version number.*/ - wxString::Format(_("Audacity %s Development Team"), versionStr.c_str()) + - wxT("
") + + wxT("

") + wxString::Format(_("Audacity Developers")) + wxT("
") + GetCreditsByRole(roleTeamDeveloper) + - wxT("


") + - /* i18n-hint: %s will be replaced by the version number.*/ - wxString::Format(_("Audacity %s Support Team"), versionStr.c_str()) + - wxT("
") + + wxT("

") + wxString::Format(_("Audacity Support Team")) + wxT("
") + GetCreditsByRole(roleTeamSupport) + - wxT("


") + - _("Emeritus Developers") + - wxT("
") + + wxT("

") + _("Emeritus Developers") + wxT("
") + GetCreditsByRole(roleEmeritusDeveloper) + - wxT("


") + - - _("Other Emeritus Team Members") + - wxT("
") + + + wxT("

") + _(" Emeritus Team Members") + wxT("
") + GetCreditsByRole(roleEmeritusSupport) + - wxT("


") + - _("Other Contributors") + - wxT("
") + + wxT("

") + _("Other Contributors") + wxT("
") + GetCreditsByRole(roleContributor) + - wxT("


") + - _("Audacity is based on code from the following projects:") + - wxT("
") + + wxT("

") + _("Audacity is based on code from the following projects:") + wxT("
") + GetCreditsByRole(roleLibrary) + - wxT("


") + - - _("Special thanks:") + - wxT("
") + + + wxT("

") + _("Special thanks:") + wxT("
") + GetCreditsByRole(roleThanks) + - wxT("


") + - - _("Audacity® software is copyright")+ + + wxT("


") + _("Audacity® software is copyright")+ wxT("© 1999-2013 Audacity Team.
") + - _("The name Audacity® is a registered trademark of Dominic Mazzoni.") + - wxT(""); + wxT(""); + - this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));