Skip to content

Commit

Permalink
Merge pull request audacity#5721 from LWinterberg/strings
Browse files Browse the repository at this point in the history
* Resolves: audacity#5720

* adds @chinakov to the team credits and @teetow (who is currently doing C++ learning with me, and has been helping me out in design questions for the past few years) to the contributors list

* fixes a typo
  • Loading branch information
LWinterberg authored Dec 1, 2023
2 parents 78b5306 + 9dfca4e commit 7a5fec3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
3 changes: 3 additions & 0 deletions src/AboutDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ void AboutDialog::CreateCreditsList()
XO("%s, graphics");

// The Audacity Team: developers and support
AddCredit(wxT("Antons \u010cinakovs"), testerFormat, roleTeamMember);
AddCredit(wxT("Matthieu Hodgkinson"), developerFormat, roleTeamMember);
AddCredit(wxT("Peter Jonas"), developerFormat, roleTeamMember);
AddCredit(wxT("Martin Keary"), roleTeamMember);
Expand All @@ -142,6 +143,7 @@ void AboutDialog::CreateCreditsList()
AddCredit(wxT("Leo Wattenberg"), designerFormat, roleTeamMember);
AddCredit(wxT("Jessica Williamson"), designerFormat, roleTeamMember);


// Emeritus: people who were "lead developers" or made an
// otherwise distinguished contribution, but who are no
// longer active.
Expand Down Expand Up @@ -174,6 +176,7 @@ void AboutDialog::CreateCreditsList()

// Contributors
AddCredit(wxT("Lynn Allan"), developerFormat, roleContributor);
AddCredit(wxT("Johan Althoff (teetow)"), designerFormat, roleContributor);
AddCredit(wxT("Brian Armstrong"), developerFormat, roleContributor);
AddCredit(wxT("David Avery"), developerFormat, roleContributor);
AddCredit(wxT("David Bailes"), accessibilityAdvisorFormat, roleContributor);
Expand Down
2 changes: 1 addition & 1 deletion src/export/ExportAudioDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ChoiceSetting ExportAudioExportRange { L"/ExportAudioDialog/ExportRange",
{
{ "project", XO("Entire &Project") },
{ "split", XO("M&ultiple Files") },
{ "selection", XO("Curren&t selection") }
{ "selection", XO("Curren&t Selection") }

},
0, //project
Expand Down
19 changes: 5 additions & 14 deletions src/prefs/ModulePrefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
S.StartStatic( {} );
{
S.AddFixedText(XO(
"These are experimental modules. Enable them only if you've read the Audacity Manual\nand know what you are doing.") );
"Modules are optional components of Audacity that enable some functionality, such as importing and exporting. \nIt is generally not necessary to change these settings.") );
S.AddFixedText(XO(
/* i18n-hint preserve the leading spaces */
" 'Ask' means Audacity will ask if you want to load the module each time it starts.") );
S.AddFixedText(XO(
/* i18n-hint preserve the leading spaces */
" 'Failed' means Audacity thinks the module is broken and won't run it.") );
S.AddFixedText(XO(
/* i18n-hint preserve the leading spaces */
" 'New' means no choice has been made yet.") );
S.AddFixedText(XO(
"Changes to these settings only take effect when Audacity starts up."));
"Changes to these settings only take effect when restarting Audacity.\n") );
{
S.StartMultiColumn( 2 );
int i;
Expand All @@ -133,16 +124,16 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
{
XO("Disabled" ) ,
XO("Enabled" ) ,
XO("Ask" ) ,
XO("Always ask" ) ,
XO("Failed" ) ,
XO("New" ) ,
XO("No choice made" ) ,
}
);
S.EndMultiColumn();
}
if( mModules.size() < 1 )
{
S.AddFixedText( XO("No modules were found") );
S.AddFixedText( XO("Error: No modules were found. This may indicate a faulty installation.") );
}
}
S.EndStatic();
Expand Down

0 comments on commit 7a5fec3

Please sign in to comment.