diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index c7af3a4e8..859a65e59 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -49,98 +49,147 @@ hold information about one contributor to Audacity. void AboutDialog::CreateCreditsList() { // The Audacity Team: developers and support - AddCredit(wxT("Richard Ash"), roleTeamDeveloper); - AddCredit(wxT("James Crook"), roleTeamDeveloper); - AddCredit(wxString(wxT("Roger Dannenberg - ")) + _("co-founder"), roleTeamDeveloper); - AddCredit(wxT("Benjamin Drung"), roleTeamDeveloper); - AddCredit(wxT("Vaughan Johnson"), roleTeamDeveloper); - AddCredit(wxT("Paul Licameli"), roleTeamDeveloper); - AddCredit(wxT("Leland Lucius"), roleTeamDeveloper); - AddCredit(wxT("Martyn Shaw"), roleTeamDeveloper); - - AddCredit(wxString(wxT("Gale Andrews - ")) + _("quality assurance"), roleTeamSupport); - AddCredit(wxT("Christian Brochec"), roleTeamSupport); - AddCredit(wxT("Steve Daulton"), roleTeamSupport); - AddCredit(wxT("Greg Kozikowski"), roleTeamSupport); - AddCredit(wxT("Peter Sampson"), roleTeamSupport); - AddCredit(wxT("Bill Wharrie"), roleTeamSupport); + AddCredit(wxString(wxT("Gale Andrews, ")) + _("quality assurance"), roleTeamMember); + AddCredit(wxString(wxT("Richard Ash, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Christian Brochec, ")) + _("documentation and support, French"), roleTeamMember); + AddCredit(wxString(wxT("Arturo \"Buanzo\" Busleiman, ")) + _("system administration"), roleTeamMember); + AddCredit(wxString(wxT("James Crook, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Roger Dannenberg, ")) + _("co-founder and developer"), roleTeamMember); + AddCredit(wxString(wxT("Steve Daulton, ")) + _("developer, documentation and support"), roleTeamMember); + AddCredit(wxString(wxT("Benjamin Drung, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Vaughan Johnson, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Greg Kozikowski, ")) + _("documentation and support"), roleTeamMember); + AddCredit(wxString(wxT("Paul Licameli, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Leland Lucius, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Peter Sampson, ")) + _("documentation and support"), roleTeamMember); + AddCredit(wxString(wxT("Martyn Shaw, ")) + _("developer"), roleTeamMember); + AddCredit(wxString(wxT("Bill Wharrie, ")) + _("documentation and support"), roleTeamMember); // Emeritus: people who were "lead developers" or made an // otherwise distinguished contribution, but who are no // longer active. - AddCredit(wxT("Matt Brubeck"), roleEmeritusDeveloper); - AddCredit(wxT("Michael Chinen"), roleEmeritusDeveloper); - AddCredit(wxT("Al Dimond"), roleEmeritusDeveloper); - AddCredit(wxT("Joshua Haberman"), roleEmeritusDeveloper); - AddCredit(wxT("Ruslan Ijbulatov"), roleEmeritusDeveloper); - AddCredit(wxString(wxT("Dominic Mazzoni - "))+_("co-founder"), roleEmeritusDeveloper); - AddCredit(wxT("Markus Meyer"), roleEmeritusDeveloper); - AddCredit(wxT("Monty Montgomery"), roleEmeritusDeveloper); - AddCredit(wxT("Shane Mueller"), roleEmeritusDeveloper); - AddCredit(wxT("Tony Oetzmann"), roleEmeritusSupport); - AddCredit(wxT("Alexandre Prokoudine"), roleEmeritusSupport); + AddCredit(wxString(wxT("Matt Brubeck, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Michael Chinen, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Al Dimond, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Joshua Haberman, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Ruslan Ijbulatov, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Dominic Mazzoni, "))+_("co-founder and developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Markus Meyer, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Monty Montgomery, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Shane Mueller, ")) + _("developer"), roleEmeritusTeam); + AddCredit(wxString(wxT("Tony Oetzmann, ")) + _("documentation and support"), roleEmeritusTeam); + AddCredit(wxString(wxT("Alexandre Prokoudine, ")) + _("documentation and support"), roleEmeritusTeam); - // All other contributors - AddCredit(wxT("Lynn Allan"), roleContributor); - AddCredit(wxT("David Avery"), roleContributor); - AddCredit(wxT("David Bailes"), roleContributor); - AddCredit(wxT("William Bland"), roleContributor); - AddCredit(wxT("Sami Boukortt"), roleContributor); - AddCredit(wxT("Jeremy R. Brown"), roleContributor); - AddCredit(wxT("Alex S. Brown"), roleContributor); - AddCredit(wxT("Chris Cannam"), roleContributor); - AddCredit(wxT("Cory Cook"), roleContributor); - AddCredit(wxT("Craig DeForest"), roleContributor); - AddCredit(wxT("Mitch Golden"), roleContributor); - AddCredit(wxT("Brian Gunlogson"), roleContributor); - AddCredit(wxT("Andrew Hallendorff"), roleContributor); - AddCredit(wxT("Robert H\x00e4nggi"), roleContributor); - AddCredit(wxT("Daniel Horgan"), roleContributor); - AddCredit(wxT("David Hostetler"), roleContributor); - AddCredit(wxT("Steve Jolly"), roleContributor); - AddCredit(wxT("Steven Jones"), roleContributor); - AddCredit(wxT("Arun Kishore"), roleContributor); - AddCredit(wxT("Paul Livesey"), roleContributor); - AddCredit(wxT("Harvey Lubin"), roleContributor); - AddCredit(wxT("Greg Mekkes"), roleContributor); - AddCredit(wxT("Abe Milde"), roleContributor); - AddCredit(wxT("Paul Nasca"), roleContributor); - AddCredit(wxT("Clayton Otey"), roleContributor); - AddCredit(wxT("Andr\x00e9 Pinto"), roleContributor); - AddCredit(wxT("Mark Phillips"), roleContributor); - AddCredit(wxT("Jean Claude Risset"), roleContributor); - AddCredit(wxT("Edgar-RFT"), roleContributor); - AddCredit(wxT("Augustus Saunders"), roleContributor); - AddCredit(wxT("Benjamin Schwartz"), roleContributor); - AddCredit(wxT("David R. Sky"), roleContributor); - AddCredit(wxT("Rob Sykes"), roleContributor); - AddCredit(wxT("Mike Underwood"), roleContributor); - AddCredit(wxT("Philip Van Baren"), roleContributor); - AddCredit(wxT("Salvo Ventura"), roleContributor); - AddCredit(wxT("Jun Wan"), roleContributor); - AddCredit(wxT("Daniel Winzen"), roleContributor); - AddCredit(wxT("Tom Woodhams"), roleContributor); - AddCredit(wxT("Wing Yu"), roleContributor); + // Contributors + AddCredit(wxString(wxT("Lynn Allan, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("David Avery, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("David Bailes, ")) + _("accessibility advisor"), roleContributor); + AddCredit(wxString(wxT("William Bland, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Sami Boukortt, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Jeremy R. Brown, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Alex S. Brown, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Chris Cannam, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Cory Cook, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Craig DeForest, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Edgar Franke (Edgar-RFT), ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Mitch Golden, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Brian Gunlogson, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Andrew Hallendorff, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Robert Hänggi, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Daniel Horgan, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("David Hostetler, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Steve Jolly, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Steven Jones, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Arun Kishore, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Paul Livesey, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Harvey Lubin, ")) + _("graphic artist"), roleContributor); + AddCredit(wxString(wxT("Greg Mekkes, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Abe Milde, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Paul Nasca, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Clayton Otey, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Mark Phillips, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("André Pinto, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Jean Claude Risset, ")) + _("composer"), roleContributor); + AddCredit(wxString(wxT("Augustus Saunders, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Benjamin Schwartz, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("David R. Sky, ")) + _("Nyquist plug-ins"), roleContributor); + AddCredit(wxString(wxT("Rob Sykes, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Mike Underwood, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Philip Van Baren, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Salvo Ventura, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Jun Wan, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Daniel Winzen, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Tom Woodhams, ")) + _("developer"), roleContributor); + AddCredit(wxString(wxT("Wing Yu, ")) + _("developer"), roleContributor); - AddCredit(wxT("expat"), roleLibrary); - AddCredit(wxT("FLAC"), roleLibrary); - AddCredit(wxT("LAME"), roleLibrary); - AddCredit(wxT("libmad"), roleLibrary); - AddCredit(wxT("libsoxr, by Rob Sykes"), roleLibrary); - #if USE_LV2 - AddCredit(wxT("lilv, serd, sord, and sratom, by David Robillard"), roleLibrary); - AddCredit(wxT("msinttypes, by Alexander Chemeris"), roleLibrary); - #endif - AddCredit(wxT("libsndfile"), roleLibrary); - AddCredit(wxT("Nyquist"), roleLibrary); - AddCredit(wxT("Ogg Vorbis"), roleLibrary); - AddCredit(wxT("PortAudio"), roleLibrary); - AddCredit(wxT("portsmf"), roleLibrary); - AddCredit(wxT("sbsms, by Clayton Otey"), roleLibrary); - AddCredit(wxT("SoundTouch, by Olli Parviainen"), roleLibrary); - AddCredit(wxT("TwoLAME"), roleLibrary); - AddCredit(wxT("Vamp"), roleLibrary); - AddCredit(wxT("wxWidgets"), roleLibrary); + // Translators + + AddCredit(wxT("Mikhail Balabanov (bg)"), roleTranslators); + AddCredit(wxT("Francesc Busquets (ca)"), roleTranslators); + AddCredit(wxT("Pau Crespo (ca)"), roleTranslators); + AddCredit(wxT("Aleš Tošovský (cs)"), roleTranslators); + AddCredit(wxT("Henrik Clausen (da)"), roleTranslators); + AddCredit(wxT("Christoph Kobe (de)"), roleTranslators); + AddCredit(wxT("Daniel Winzen (de)"), roleTranslators); + AddCredit(wxT("Karsten Zeller (de)"), roleTranslators); + AddCredit(wxT("Antonio Paniagua (es)"), roleTranslators); + AddCredit(wxT("Ezequiel Plaza (es)"), roleTranslators); + AddCredit(wxT("Waldo Ramirez (es)"), roleTranslators); + AddCredit(wxT("Xabier Aramendi (eu)"), roleTranslators); + AddCredit(wxT("Petri Vuorio (fi)"), roleTranslators); + AddCredit(wxT("Lionel Allorge (fr)"), roleTranslators); + AddCredit(wxT("Olivier Ballestraz (fr)"), roleTranslators); + AddCredit(wxT("Christian Brochec (fr)"), roleTranslators); + AddCredit(wxT("Fabrice Silva (fr)"), roleTranslators); + AddCredit(wxT("Micil Sheain Mhicil (ga)"), roleTranslators); + AddCredit(wxT("Xosé Antón Vicente Rodríguez (gl)"), roleTranslators); + AddCredit(wxT("Márton Balázs (hu)"), roleTranslators); + AddCredit(wxT("Jozsef Herczeg (hu)"), roleTranslators); + AddCredit(wxT("Aldo Boccacci (it)"), roleTranslators); + AddCredit(wxT("Ohkubo Kohei (ja)"), roleTranslators); + AddCredit(wxT("Šarῡnas Gliebus (lt)"), roleTranslators); + AddCredit(wxT("Ilija Iliev (mk)"), roleTranslators); + AddCredit(wxT("Kevin Brubeck Unhammer (nb)"), roleTranslators); + AddCredit(wxT("Tino Meinen (nl)"), roleTranslators); + AddCredit(wxT("Tomasz Bandura (pl)"), roleTranslators); + AddCredit(wxT("Marek Mularczyk (pl)"), roleTranslators); + AddCredit(wxT("Sebastian Pacholski (pl)"), roleTranslators); + AddCredit(wxT("Cleber Tavano (pt_BR)"), roleTranslators); + AddCredit(wxT("Victor Westmann (pt_BR)"), roleTranslators); + AddCredit(wxT("Manuel Ciosici (ro)"), roleTranslators); + AddCredit(wxT("Yuri Ilyin (ru)"), roleTranslators); + AddCredit(wxT("Alexandre Prokoudine (ru)"), roleTranslators); + AddCredit(wxT("Joe Yeti (sk)"), roleTranslators); + AddCredit(wxT("Rok Hecl (sl)"), roleTranslators); + AddCredit(wxT("Martin Srebotnjak (sl)"), roleTranslators); + AddCredit(wxT("Lars Carlsson (sv)"), roleTranslators); + AddCredit(wxT("Kaya Zeren (tr)"), roleTranslators); + AddCredit(wxT("Maxim Dziumanenko (uk)"), roleTranslators); + AddCredit(wxT("XiaoXi Liu (zh_CN)"), roleTranslators); + AddCredit(wxT("Chido (zh_TW)"), roleTranslators); + AddCredit(wxT("Panming Zhong (zh_TW)"), roleTranslators); + + // Libraries + + AddCredit(wxT("expat"), roleLibrary); + AddCredit(wxT("FLAC"), roleLibrary); + AddCredit(wxT("iAVC"), roleLibrary); + AddCredit(wxT("LAME"), roleLibrary); + AddCredit(wxT("libmad"), roleLibrary); + AddCredit(wxT("libsndfile"), roleLibrary); + AddCredit(wxT("libsoxr"), roleLibrary); + AddCredit(wxT("lv2 (") + _("incorporating") + wxT(" lilv, msinttypes, serd, sord and sratom)"), roleLibrary); + AddCredit(wxT("Nyquist"), roleLibrary); + AddCredit(wxT("Ogg Vorbis"), roleLibrary); + AddCredit(wxT("PortAudio"), roleLibrary); + AddCredit(wxT("portsmf"), roleLibrary); + AddCredit(wxT("sbsms"), roleLibrary); + AddCredit(wxT("SoundTouch"), roleLibrary); + AddCredit(wxT("TwoLAME"), roleLibrary); + AddCredit(wxT("Vamp"), roleLibrary); + AddCredit(wxT("wxWidgets"), roleLibrary); + + // Thanks AddCredit(wxT("Dave Beydler"), roleThanks); AddCredit(wxT("Brian Cameron"), roleThanks); @@ -209,7 +258,7 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) CreateCreditsList(); wxString par1Str = _( -"Audacity is a free program written by a worldwide team of volunteer developers. \ +"Audacity is a free program written by a worldwide team of volunteers. \ Audacity is available for Windows, Mac, and GNU/Linux (and other Unix-like systems)."); // This trick here means that the English language version won't mention using @@ -234,7 +283,7 @@ visit our forum."); * For example: "English translation by Dominic Mazzoni." */ if (_("translator_credits") != wxString(wxT("translator_credits"))) { - translatorCredits = _("translator_credits"); + translatorCredits = _("translator_credits") + wxT("
"); } wxString localeStr = wxLocale::GetSystemEncodingName(); @@ -243,33 +292,32 @@ visit our forum."); localeStr + wxT("\">") + wxT("
") + - wxT("

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

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

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

") + + _("Free, open source, cross-platform software for recording and editing sounds.") + + wxT(" http://audacityteam.org/") + wxT("


") + par1Str + wxT("

") + par2Str + - wxT("

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

") + - wxT("

") + translatorCredits + + wxT("

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

") + wxT("

") + - wxT("

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

") + wxString::Format(_("Team Members")) + wxT("

") + + GetCreditsByRole(roleTeamMember) + - wxT("

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

") + _("Emeritus:") + wxT("
") + + _("Distinguished Audacity Team members, not currently active") + wxT("

") + + GetCreditsByRole(roleEmeritusTeam) + - wxT("

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

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

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

") + _("Contributors") + wxT("

") + GetCreditsByRole(roleContributor) + - wxT("

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

") + _("Translators") + wxT("
") + + translatorCredits + wxT("
") + + GetCreditsByRole(roleTranslators) + + + wxT("

") + _("Libraries") + wxT("
") + + wxT("Audacity includes code from the following projects:") + wxT("

") + GetCreditsByRole(roleLibrary) + - wxT("

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

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

") + GetCreditsByRole(roleThanks) + wxT("


") + _("Audacity® software is copyright")+ diff --git a/src/AboutDialog.h b/src/AboutDialog.h index fc3c6cfe6..a0e6673dd 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -64,11 +64,10 @@ class AboutDialog final : public wxDialog { private: enum Role { - roleTeamDeveloper, - roleTeamSupport, - roleEmeritusDeveloper, - roleEmeritusSupport, + roleTeamMember, + roleEmeritusTeam, roleContributor, + roleTranslators, roleLibrary, roleThanks };