Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-10 09:01:13 +02:00
Code Issues Releases Wiki Activity

Reduce differences between DA and Audacity

Browse Source
This commit is contained in:
James Crook 2016-09-11 11:54:33 +01:00
parent 0361169839
commit 8b3af218df
26 changed files with 134 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/AboutDialog.cpp
View File

@ -237,7 +237,7 @@ AboutDialog *AboutDialog::ActiveIntance()
}
AboutDialog::AboutDialog(wxWindow * parent)
: wxDialogWrapper(parent, -1, _("About DarkAudacity"),
: wxDialogWrapper(parent, -1, _("About Audacity"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
@ -301,12 +301,16 @@ visit our [[http://forum.audacityteam.org/|forum]].");
wxString creditStr = FormatHtmlText(
wxString( wxT("<center>") ) +
#ifdef EXPERIMENTAL_DA
#undef _
#define _(s) wxGetTranslation((s))
wxT("<h3>DarkAudacity ") + wxString(AUDACITY_VERSION_STRING) + wxT("</center></h3>") +
_("Customised version of the Audacity free, open source, cross-platform software " ) +
_("for recording and editing sounds.") +
wxT("<p><br>") + _("&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright")+
wxT("Customised version of the Audacity free, open source, cross-platform software " ) +
wxT("for recording and editing sounds.") +
wxT("<p><br>&nbsp; &nbsp; <b>Audacity<sup>&reg;</sup></b> software is copyright")+
wxT("&copy; 1999-2016 Audacity Team.<br>") +
_("&nbsp; &nbsp; The name <b>Audacity</b> is a registered trademark of Dominic Mazzoni.<br><br>") +
wxT("&nbsp; &nbsp; The name <b>Audacity</b> is a registered trademark of Dominic Mazzoni.<br><br>") +
#endif
//wxT("<p><br>") + par1Str +
//wxT("<p>") + par2Str +
@ -337,12 +341,14 @@ visit our [[http://forum.audacityteam.org/|forum]].");
GetCreditsByRole(roleThanks) +
wxT("<p><br>Audacity website: [[http://www.audacityteam.org/|http://www.audacityteam.org/]]") +
#ifdef EXPERIMENTAL_DA
wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|http://www.darkaudacity.com/]]") +
#endif
wxT("</center>")
);
auto pPage = S.StartNotebookPage( wxT("DarkAudacity") );
auto pPage = S.StartNotebookPage( _("Audacity") );
pPage->SetBackgroundColour(wxColour(0xAB, 0xAB,0xAB ));
S.StartVerticalLay(1);
{

9
src/Audacity.h
View File

@ -168,14 +168,19 @@ void QuitAudacity();
#define DB_TO_LINEAR(x) (pow(10.0, (x) / 20.0))
#define LINEAR_TO_DB(x) (20.0 * log10(x))
// Marks strings for extraction only...must use wxGetTranslation() to translate.
#define XO(s) wxT(s)
#ifndef IN_RC
#include <wx/defs.h>
#include <wx/string.h>
const wxString& GetCustomTranslation(const wxString& str1 );
const wxString& GetCustomSubstitution(const wxString& str1 );
// Marks strings for extraction only...must use wxGetTranslation() to translate.
#define XO(s) GetCustomSubstitution(s)
// Marks string for substitution only.
#define _TS( s ) GetCustomSubstitution(s)
#define WXINTL_NO_GETTEXT_MACRO
#define _(s) GetCustomTranslation((s))

37
src/AudacityApp.cpp
View File

@ -1069,7 +1069,7 @@ void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
rpt.AddAll(ctx);
wxFileName fn(FileNames::DataDir(), wxT("audacity.cfg"));
rpt.AddFile(fn.GetFullPath(), wxT("DarkAudacity Configuration"));
rpt.AddFile(fn.GetFullPath(), _TS("Audacity Configuration"));
rpt.AddFile(FileNames::PluginRegistry(), wxT("Plugin Registry"));
rpt.AddFile(FileNames::PluginSettings(), wxT("Plugin Settings"));
@ -1081,7 +1081,7 @@ void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
AudacityLogger *logger = GetLogger();
if (logger)
{
rpt.AddText(wxT("log.txt"), logger->GetLog(), wxT("DarkAudacity Log"));
rpt.AddText(wxT("log.txt"), logger->GetLog(), _TS("Audacity Log"));
}
bool ok = wxDebugReportPreviewStd().Show(rpt);
@ -1094,7 +1094,7 @@ void AudacityApp::GenerateCrashReport(wxDebugReport::Context ctx)
{
wxTextEntryDialog dlg(NULL,
_("Report generated to:"),
_("DarkAudacity Support Data"),
_("Audacity Support Data"),
rpt.GetCompressedFileName(),
wxOK | wxCENTER);
dlg.SetName(dlg.GetTitle());
@ -1191,14 +1191,18 @@ bool AudacityApp::OnInit()
#ifdef AUDACITY_NAME
wxString appName = wxT(AUDACITY_NAME);
#else
wxString appName = wxT("DarkAudacity");
#else
#ifndef EXPERIMENTAL_DA
wxString appName = wxT("Audacity");
#else
wxString appName = wxT("DarkAudacity");
#endif
#endif
wxTheApp->SetAppName(appName);
// Explicitly set since OSX will use it for the "Quit" menu item
wxTheApp->SetAppDisplayName(wxT("DarkAudacity"));
wxTheApp->SetVendorName(wxT("Audacity"));
wxTheApp->SetAppDisplayName(appName);
wxTheApp->SetVendorName(appName);
// Unused strings that we want to be translated, even though
// we're not using them yet...
@ -1223,8 +1227,11 @@ bool AudacityApp::OnInit()
/* On Unix systems, the default temp dir is in /var/tmp. */
defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId().c_str());
#ifndef EXPERIMENTAL_DA
wxString pathVar = wxGetenv(wxT("AUDACITY_PATH"));
#else
wxString pathVar = wxGetenv(wxT("DARKAUDACITY_PATH"));
#endif
if (pathVar != wxT(""))
AddMultiPathsToPathList(pathVar, audacityPathList);
AddUniquePathToPathList(::wxGetCwd(), audacityPathList);
@ -1443,7 +1450,7 @@ bool AudacityApp::OnInit()
fileMenu->Append(wxID_NEW, wxString(_("&New")) + wxT("\tCtrl+N"));
fileMenu->Append(wxID_OPEN, wxString(_("&Open...")) + wxT("\tCtrl+O"));
fileMenu->AppendSubMenu(urecentMenu.release(), _("Open &Recent..."));
fileMenu->Append(wxID_ABOUT, _("&About DarkAudacity..."));
fileMenu->Append(wxID_ABOUT, _("&About Audacity..."));
fileMenu->Append(wxID_PREFERENCES, wxString(_("&Preferences...")) + wxT("\tCtrl+,"));
{
@ -1709,16 +1716,16 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
wxString sockFile(dir + wxT("/.audacity.sock"));
#endif
wxString runningTwoCopiesStr = _("Running two copies of DarkAudacity simultaneously may cause\ndata loss or cause your system to crash.\n\n");
wxString runningTwoCopiesStr = _("Running two copies of Audacity simultaneously may cause\ndata loss or cause your system to crash.\n\n");
if (!checker->Create(name, dir)) {
// Error initializing the wxSingleInstanceChecker. We don't know
// whether there is another instance running or not.
wxString prompt =
_("DarkAudacity was not able to lock the temporary files directory.\nThis folder may be in use by another copy of Audacity.\n") +
_("Audacity was not able to lock the temporary files directory.\nThis folder may be in use by another copy of Audacity.\n") +
runningTwoCopiesStr +
_("Do you still want to start DarkAudacity?");
_("Do you still want to start Audacity?");
int action = wxMessageBox(prompt,
_("Error Locking Temporary Folder"),
wxYES_NO | wxICON_EXCLAMATION,
@ -1810,10 +1817,10 @@ bool AudacityApp::CreateSingleInstanceChecker(const wxString &dir)
// There is another copy of Audacity running. Force quit.
wxString prompt =
_("The system has detected that another copy of DarkAudacity is running.\n") +
_("The system has detected that another copy of Audacity is running.\n") +
runningTwoCopiesStr +
_("Use the New or Open commands in the currently running DarkAudacity\nprocess to open multiple projects simultaneously.\n");
wxMessageBox(prompt, _("DarkAudacity is already running"),
_("Use the New or Open commands in the currently running Audacity\nprocess to open multiple projects simultaneously.\n");
wxMessageBox(prompt, _("Audacity is already running"),
wxOK | wxICON_ERROR);
return false;
}

20
src/AudacityHeaders.cpp
View File

@ -10,10 +10,24 @@
#include "AudacityHeaders.h"
// This allows us to replace Audacity by DarkAudacity without peppering the source
// code with changes. We split out this step, the customisation, as it is
// used on its own (without translation) in the wxTS macro.
const wxString& GetCustomSubstitution(const wxString& str2)
{
// If true, already converted.
if( str2.Contains( "DarkAudacity" ))
return str2;
if( !str2.Contains( "Audacity" ))
return str2;
wxString str3 = str2;
str3.Replace( "Audacity", "DarkAudacity" );
str3.Replace( " an DarkAudacity", " a DarkAudacity" );
return wxTranslations::GetUntranslatedString(str3);
}
const wxString& GetCustomTranslation(const wxString& str1)
{
return wxGetTranslation( str1 );
//return str1;
//return wxString( "AAA" );
const wxString& str2 = wxGetTranslation( str1 );
return GetCustomSubstitution( str2 );
}

4
src/AudacityLogger.cpp
View File

@ -79,7 +79,7 @@ void AudacityLogger::DoLogText(const wxString & str)
TimeStamp(&stamp);
mBuffer << stamp << wxT("DarkAudacity ") << AUDACITY_VERSION_STRING << wxT("\n");
mBuffer << stamp << _TS("Audacity ") << AUDACITY_VERSION_STRING << wxT("\n");
}
mBuffer << str << wxT("\n");
@ -161,7 +161,7 @@ void AudacityLogger::Show(bool show)
// This is the first use, so create the frame
Destroy_ptr<wxFrame> frame
{ safenew wxFrame(NULL, wxID_ANY, _("DarkAudacity Log")) };
{ safenew wxFrame(NULL, wxID_ANY, _("Audacity Log")) };
frame->SetName(frame->GetTitle());
frame->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

4
src/BatchCommands.cpp
View File

@ -565,7 +565,7 @@ bool BatchCommands::ApplySpecialCommand(int WXUNUSED(iCommand), const wxString &
}
return mExporter.Process(project, numChannels, wxT("OGG"), filename, false, 0.0, endTime);
#else
wxMessageBox(_("Ogg Vorbis support is not included in this build of DarkAudacity"));
wxMessageBox(_("Ogg Vorbis support is not included in this build of Audacity"));
return false;
#endif
} else if (command == wxT("ExportFLAC")) {
@ -577,7 +577,7 @@ bool BatchCommands::ApplySpecialCommand(int WXUNUSED(iCommand), const wxString &
}
return mExporter.Process(project, numChannels, wxT("FLAC"), filename, false, 0.0, endTime);
#else
wxMessageBox(_("FLAC support is not included in this build of DarkAudacity"));
wxMessageBox(_("FLAC support is not included in this build of Audacity"));
return false;
#endif
}

2
src/FFmpeg.cpp
View File

@ -472,7 +472,7 @@ public:
S.SetBorder(10);
S.StartVerticalLay(true);
{
text.Printf(_("DarkAudacity needs the file '%s' to import and export audio via FFmpeg."), mName.c_str());
text.Printf(_("Audacity needs the file '%s' to import and export audio via FFmpeg."), mName.c_str());
S.AddTitle(text);
S.SetBorder(3);

12
src/HelpText.cpp
View File

@ -169,7 +169,7 @@ wxString TitleText( const wxString & Key )
if(Key ==wxT("save") )
{
/* i18n-hint: Title for a topic.*/
return _("Saving a DarkAudacity Project");
return _("Saving a Audacity Project");
}
if(Key ==wxT("wma-proprietary") )
{
@ -197,22 +197,24 @@ static wxString HelpTextBuiltIn( const wxString & Key )
/* i18n-hint: Preserve [[file:quick_help.html as it's the name of a file.*/
return WrapText(
wxString(wxT("")) +
#ifdef EXPERIMENTAL_DA
wxT("<center><h3>DarkAudacity ") + AUDACITY_VERSION_STRING + wxT("</h3></center>") +
_("<br><br>DarkAudacity is based on Audacity:") + wxT("<ul><li>") +
_(" [[http://www.darkaudacity.com|www.darkaudacity.com]] - for differences between them.") + wxT("</li><li>") +
_(" email to [[mailto:james@audacityteam.org|james@audacityteam.org]] - for help using DarkAudacity.") + wxT("</li><li>") +
_(" [[http://www.darkaudacity.com/video.html|Tutorials]] - for getting started with DarkAudacity.") + wxT("</li></ul>") +
_("<br><br>Audacity has these support methods:") + wxT("<ul><li>") +
_(" [[http://manual.audacityteam.org/|Manual]] - for comprehensive Audacity documentation") + wxT("</li><li>") +
_(" [[http://forum.audacityteam.org/|Forum]] - for large knowledge base on using Audacity.") + wxT("</li></ul>")
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>")
#endif
);
}
if(Key==wxT("wma-proprietary"))
{
return WrapText(
wxString(wxT("<p>"))+
_("DarkAudacity 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("</p><p>") +

4
src/LangChoice.cpp
View File

@ -57,7 +57,7 @@ wxString ChooseLanguage(wxWindow *parent)
/* i18n-hint: Title on a dialog indicating that this is the first
* time Audacity has been run. */
LangChoiceDialog dlog(parent, -1, _("DarkAudacity First Run"));
LangChoiceDialog dlog(parent, -1, _("Audacity First Run"));
dlog.CentreOnParent();
dlog.ShowModal();
returnVal = dlog.GetLang();
@ -90,7 +90,7 @@ LangChoiceDialog::LangChoiceDialog(wxWindow * parent,
S.StartHorizontalLay();
{
S.SetBorder(15);
mChoice = S.AddChoice(_("Choose Language for DarkAudacity to use:"),
mChoice = S.AddChoice(_("Choose Language for Audacity to use:"),
lang,
&mLangNames);
}

10
src/Menus.cpp
View File

@ -1089,11 +1089,17 @@ void AudacityProject::CreateMenusAndCommands()
c->BeginMenu(_("&Help"));
c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag);
#ifndef EXPERIMENTAL_DA
c->AddItem(wxT("QuickHelp"), _("&Quick Help"), FN(OnQuickHelp));
c->AddItem(wxT("Manual"), _("&Manual"), FN(OnManual));
#else
// 'Getting Started' rather than 'Quick Help' for DarkAudacity.
// At the moment the video tutorials are aspirational (aka do not exist yet).
// Emphasise that manual is for Audacity, not DarkAudacity.
c->AddItem(wxT("QuickHelp"), _("&Getting Started"), FN(OnQuickHelp));
c->AddItem(wxT("Manual"), _("Audacity &Manual"), FN(OnManual));
c->AddItem(wxT("Manual"), wxT("Audacity &Manual"), FN(OnManual));
#endif
c->AddSeparator();
@ -1127,7 +1133,7 @@ void AudacityProject::CreateMenusAndCommands()
#endif
//c->AddItem(wxT("Updates"), _("&Check for Updates..."), FN(OnCheckForUpdates));
c->AddItem(wxT("About"), _("&About DarkAudacity..."), FN(OnAbout));
c->AddItem(wxT("About"), _("&About Audacity..."), FN(OnAbout));
c->EndMenu();

2
src/MixerBoard.cpp
View File

@ -1584,7 +1584,7 @@ const wxSize kDefaultSize =
MixerBoardFrame::MixerBoardFrame(AudacityProject* parent)
: wxFrame(parent, -1,
wxString::Format(_("DarkAudacity Mixer Board%s"),
wxString::Format(_("Audacity Mixer Board%s"),
((parent->GetName() == wxEmptyString) ?
wxT("") :
wxString::Format(wxT(" - %s"),

6
src/ModuleManager.cpp
View File

@ -125,8 +125,8 @@ bool Module::Load()
wxString moduleVersion = versionFn();
if( !moduleVersion.IsSameAs(AUDACITY_VERSION_STRING)) {
wxString ShortName = wxFileName( mName ).GetName();
wxMessageBox(wxString::Format(_("The module %s is matched with DarkAudacity version %s.\n\nIt will not be loaded."), ShortName.c_str(), moduleVersion.c_str()), _("Module Unsuitable"));
wxLogMessage(wxString::Format(_("The module %s is matched with DarkAudacity version %s. It will not be loaded."), mName.c_str(), moduleVersion.c_str()));
wxMessageBox(wxString::Format(_("The module %s is matched with Audacity version %s.\n\nIt will not be loaded."), ShortName.c_str(), moduleVersion.c_str()), _("Module Unsuitable"));
wxLogMessage(wxString::Format(_("The module %s is matched with Audacity version %s. It will not be loaded."), mName.c_str(), moduleVersion.c_str()));
mLib->Unload();
return false;
}
@ -272,7 +272,7 @@ void ModuleManager::Initialize(CommandHandler &cmdHandler)
msg += _("\n\nOnly use modules from trusted sources");
const wxChar *buttons[] = {_("Yes"), _("No"), NULL}; // could add a button here for 'yes and remember that', and put it into the cfg file. Needs more thought.
int action;
action = ShowMultiDialog(msg, _("DarkAudacity Module Loader"), buttons, _("Try and load this module?"), false);
action = ShowMultiDialog(msg, _("Audacity Module Loader"), buttons, _("Try and load this module?"), false);
#ifdef EXPERIMENTAL_MODULE_PREFS
// If we're not prompting always, accept the answer permanantly
if( iModuleStatus == kModuleNew ){

10
src/Project.cpp
View File

@ -871,7 +871,7 @@ END_EVENT_TABLE()
AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
const wxPoint & pos,
const wxSize & size)
: wxFrame(parent, id, wxT("DarkAudacity"), pos, size),
: wxFrame(parent, id, _TS("Audacity"), pos, size),
mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())),
mDefaultFormat((sampleFormat) gPrefs->
Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample)),
@ -1155,7 +1155,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
int widths[] = {0, GetControlToolBar()->WidthForStatusBar(mStatusBar), -1, 150};
mStatusBar->SetStatusWidths(4, widths);
wxString msg = wxString::Format(_("Welcome to DarkAudacity version %s"),
wxString msg = wxString::Format(_("Welcome to Audacity version %s"),
AUDACITY_VERSION_STRING);
mStatusBar->SetStatusText(msg, mainStatusBarField);
GetControlToolBar()->UpdateStatusBar(this);
@ -1383,14 +1383,14 @@ void AudacityProject::SetProjectTitle( int number)
// is none.
if( number >= 0 ){
/* i18n-hint: The %02i is the project number, the %s is the project name.*/
name = wxString::Format( wxT("[Project %02i] Audacity \"%s\""), number+1 ,
name = wxString::Format( _TS("[Project %02i] Audacity \"%s\""), number+1 ,
name.IsEmpty() ? "<untitled>" : name.c_str() );
}
// If we are not showing numbers, then <untitled> shows as 'Audacity'.
else if( name.IsEmpty() )
{
mbLoadedFromAup = false;
name = wxT("DarkAudacity");
name = _TS("Audacity");
}
if (mIsRecovered)
@ -2929,7 +2929,7 @@ void AudacityProject::OpenFile(const wxString &fileNameArg, bool addtohistory)
// Convert to the NEW format.
bool success = ConvertLegacyProjectFile(wxFileName{ fileName });
if (!success) {
wxMessageBox(_("DarkAudacity was unable to convert an Audacity 1.0 project to the new project format."),
wxMessageBox(_("Audacity was unable to convert an Audacity 1.0 project to the new project format."),
_("Error Opening Project"),
wxOK | wxCENTRE, this);
return;

2
src/SplashDialog.cpp
View File

@ -59,7 +59,7 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(SplashDialog, wxDialogWrapper)
SplashDialog::SplashDialog(wxWindow * parent)
: wxDialogWrapper(parent, -1, _("Welcome to DarkAudacity!"),
: wxDialogWrapper(parent, -1, _("Welcome to Audacity!"),
wxPoint( -1, 60 ), // default x position, y position 60 pixels from top of screen.
wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{

16
src/Theme.cpp
View File

@ -653,7 +653,7 @@ void ThemeBase::CreateImageCache( bool bBinarySave )
{
wxMessageBox(
wxString::Format(
_("DarkAudacity could not write file:\n %s."),
_("Audacity could not write file:\n %s."),
FileName.c_str() ));
return;
}
@ -671,7 +671,7 @@ void ThemeBase::CreateImageCache( bool bBinarySave )
{
wxMessageBox(
wxString::Format(
_("DarkAudacity could not open file:\n %s\nfor writing."),
_("Audacity could not open file:\n %s\nfor writing."),
FileName.c_str() ));
return;
}
@ -679,7 +679,7 @@ void ThemeBase::CreateImageCache( bool bBinarySave )
{
wxMessageBox(
wxString::Format(
_("DarkAudacity could not write images to file:\n %s."),
_("Audacity could not write images to file:\n %s."),
FileName.c_str() ));
return;
}
@ -814,7 +814,7 @@ bool ThemeBase::ReadImageCache( bool bBinaryRead, bool bOkIfNotFound)
return false; // did not load the images, so return false.
wxMessageBox(
wxString::Format(
_("DarkAudacity could not find file:\n %s.\nTheme not loaded."),
_("Audacity could not find file:\n %s.\nTheme not loaded."),
FileName.c_str() ));
return false;
}
@ -823,7 +823,7 @@ bool ThemeBase::ReadImageCache( bool bBinaryRead, bool bOkIfNotFound)
/* i18n-hint: Do not translate png. It is the name of a file format.*/
wxMessageBox(
wxString::Format(
_("DarkAudacity could not load file:\n %s.\nBad png format perhaps?"),
_("Audacity could not load file:\n %s.\nBad png format perhaps?"),
FileName.c_str() ));
return false;
}
@ -839,7 +839,7 @@ bool ThemeBase::ReadImageCache( bool bBinaryRead, bool bOkIfNotFound)
// was not a valid png image.
// Most likely someone edited it by mistake,
// Or some experiment is being tried with NEW formats for it.
wxMessageBox(_("DarkAudacity could not read its default theme.\nPlease report the problem."));
wxMessageBox(_("Audacity could not read its default theme.\nPlease report the problem."));
return false;
}
}
@ -912,7 +912,7 @@ void ThemeBase::LoadComponents( bool bOkIfNotFound )
/* i18n-hint: Do not translate png. It is the name of a file format.*/
wxMessageBox(
wxString::Format(
_("DarkAudacity could not load file:\n %s.\nBad png format perhaps?"),
_("Audacity could not load file:\n %s.\nBad png format perhaps?"),
FileName.c_str() ));
return;
}
@ -1003,7 +1003,7 @@ void ThemeBase::SaveComponents()
{
wxMessageBox(
wxString::Format(
_("DarkAudacity could not save file:\n %s"),
_("Audacity could not save file:\n %s"),
FileName.c_str() ));
return;
}

10
src/TimerRecordDialog.cpp
View File

@ -139,7 +139,7 @@ BEGIN_EVENT_TABLE(TimerRecordDialog, wxDialogWrapper)
END_EVENT_TABLE()
TimerRecordDialog::TimerRecordDialog(wxWindow* parent, bool bAlreadySaved)
: wxDialogWrapper(parent, -1, _("DarkAudacity Timer Record"), wxDefaultPosition,
: wxDialogWrapper(parent, -1, _("Audacity Timer Record"), wxDefaultPosition,
wxDefaultSize, wxCAPTION)
{
SetName(GetTitle());
@ -566,7 +566,7 @@ int TimerRecordDialog::RunWaitDialog()
TimerProgressDialog
progress(m_TimeSpan_Duration.GetMilliseconds().GetValue(),
_("DarkAudacity Timer Record Progress"),
_("Audacity Timer Record Progress"),
strMsg,
pdlgHideCancelButton | pdlgConfirmStopCancel);
@ -919,7 +919,7 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
wxArrayString arrayOptions;
arrayOptions.Add(_("Do nothing"));
arrayOptions.Add(_("Exit DarkAudacity"));
arrayOptions.Add(_("Exit Audacity"));
arrayOptions.Add(_("Restart system"));
arrayOptions.Add(_("Shutdown system"));
@ -1038,7 +1038,7 @@ int TimerRecordDialog::WaitForStart()
wxDateTime startWait_DateTime = wxDateTime::UNow();
wxTimeSpan waitDuration = m_DateTime_Start - startWait_DateTime;
TimerProgressDialog progress(waitDuration.GetMilliseconds().GetValue(),
_("DarkAudacity Timer Record - Waiting for Start"),
_("Audacity Timer Record - Waiting for Start"),
strMsg,
pdlgHideStopButton | pdlgConfirmStopCancel | pdlgHideElapsedTime,
_("Recording will commence in:"));
@ -1075,7 +1075,7 @@ int TimerRecordDialog::PreActionDelay(int iActionIndex, TimerRecordCompletedActi
wxDateTime dtActionTime = dtNow.Add(tsWait);
TimerProgressDialog dlgAction(tsWait.GetMilliseconds().GetValue(),
_("DarkAudacity Timer Record - Waiting"),
_("Audacity Timer Record - Waiting"),
sMessage,
pdlgHideStopButton | pdlgHideElapsedTime,
sCountdownLabel);

4
src/effects/VST/VSTEffect.cpp
View File

@ -316,7 +316,7 @@ wxString VSTEffectsModule::GetVersion()
wxString VSTEffectsModule::GetDescription()
{
return XO("Adds the ability to use VST effects in DarkAudacity.");
return XO("Adds the ability to use VST effects in Audacity.");
}
// ============================================================================
@ -771,7 +771,7 @@ void VSTEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
{
S.AddVariableText(wxString() +
_("As part of their processing, some VST effects must delay returning ") +
_("audio to DarkAudacity. When not compensating for this delay, you will ") +
_("audio to Audacity. When not compensating for this delay, you will ") +
_("notice that small silences have been inserted into the audio. ") +
_("Enabling this option will provide that compensation, but it may ") +
_("not work for all VST effects."))->Wrap(650);

2
src/effects/nyquist/LoadNyquist.cpp
View File

@ -122,7 +122,7 @@ wxString NyquistEffectsModule::GetVersion()
wxString NyquistEffectsModule::GetDescription()
{
return XO("Provides Nyquist Effects support to DarkAudacity");
return XO("Provides Nyquist Effects support to Audacity");
}
// ============================================================================

2
src/effects/vamp/LoadVamp.cpp
View File

@ -98,7 +98,7 @@ wxString VampEffectsModule::GetVersion()
wxString VampEffectsModule::GetDescription()
{
return XO("Provides Vamp Effects support to DarkAudacity");
return XO("Provides Vamp Effects support to Audacity");
}
// ============================================================================

4
src/export/ExportMP3.cpp
View File

@ -610,7 +610,7 @@ public:
S.SetBorder(10);
S.StartVerticalLay(true);
{
text.Printf(_("DarkAudacity needs the file %s to create MP3s."), mName.c_str());
text.Printf(_("Audacity needs the file %s to create MP3s."), mName.c_str());
S.AddTitle(text);
S.SetBorder(3);
@ -1163,7 +1163,7 @@ bool MP3Exporter::InitLibrary(wxString libpath)
be_version v;
beVersion(&v);
mBladeVersion.Printf(_("You are linking to lame_enc.dll v%d.%d. This version is not compatible with DarkAudacity %d.%d.%d.\nPlease download the latest version of the LAME MP3 library."),
mBladeVersion.Printf(_("You are linking to lame_enc.dll v%d.%d. This version is not compatible with Audacity %d.%d.%d.\nPlease download the latest version of the LAME MP3 library."),
v.byMajorVersion,
v.byMinorVersion,
AUDACITY_VERSION,

34
src/import/Import.cpp
View File

@ -559,7 +559,7 @@ bool Importer::Import(const wxString &fName,
{
if( unusableImportPlugin->SupportsExtension(extension) )
{
errorMessage.Printf(_("This version of DarkAudacity was not compiled with %s support."),
errorMessage.Printf(_("This version of Audacity was not compiled with %s support."),
unusableImportPlugin->
GetPluginFormatDescription().c_str());
pProj->mbBusyImporting = false;
@ -572,7 +572,7 @@ bool Importer::Import(const wxString &fName,
#ifdef USE_MIDI
// MIDI files must be imported, not opened
if ((extension.IsSameAs(wxT("midi"), false))||(extension.IsSameAs(wxT("mid"), false))) {
errorMessage.Printf(_("\"%s\" \nis a MIDI file, not an audio file. \nDarkAudacity cannot open this type of file for playing, but you can\nedit it by clicking File > Import > MIDI."), fName.c_str());
errorMessage.Printf(_("\"%s\" \nis a MIDI file, not an audio file. \nAudacity cannot open this type of file for playing, but you can\nedit it by clicking File > Import > MIDI."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
@ -583,93 +583,93 @@ bool Importer::Import(const wxString &fName,
// if someone has sent us a .cda file, send them away
if (extension.IsSameAs(wxT("cda"), false)) {
/* i18n-hint: %s will be the filename */
errorMessage.Printf(_("\"%s\" is an audio CD track. \nDarkAudacity cannot open audio CDs directly. \nExtract (rip) the CD tracks to an audio format that \nDarkAudacity can import, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is an audio CD track. \nAudacity cannot open audio CDs directly. \nExtract (rip) the CD tracks to an audio format that \nAudacity can import, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// playlist type files
if ((extension.IsSameAs(wxT("m3u"), false))||(extension.IsSameAs(wxT("ram"), false))||(extension.IsSameAs(wxT("pls"), false))) {
errorMessage.Printf(_("\"%s\" is a playlist file. \nDarkAudacity cannot open this file because it only contains links to other files. \nYou may be able to open it in a text editor and download the actual audio files."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a playlist file. \nAudacity cannot open this file because it only contains links to other files. \nYou may be able to open it in a text editor and download the actual audio files."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
//WMA files of various forms
if ((extension.IsSameAs(wxT("wma"), false))||(extension.IsSameAs(wxT("asf"), false))) {
errorMessage.Printf(_("\"%s\" is a Windows Media Audio file. \nDarkAudacity cannot open this type of file due to patent restrictions. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a Windows Media Audio file. \nAudacity cannot open this type of file due to patent restrictions. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
//AAC files of various forms (probably not encrypted)
if ((extension.IsSameAs(wxT("aac"), false))||(extension.IsSameAs(wxT("m4a"), false))||(extension.IsSameAs(wxT("m4r"), false))||(extension.IsSameAs(wxT("mp4"), false))) {
errorMessage.Printf(_("\"%s\" is an Advanced Audio Coding file. \nDarkAudacity cannot open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is an Advanced Audio Coding file. \nAudacity cannot open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// encrypted itunes files
if ((extension.IsSameAs(wxT("m4p"), false))) {
errorMessage.Printf(_("\"%s\" is an encrypted audio file. \nThese typically are from an online music store. \nDarkAudacity cannot open this type of file due to the encryption. \nTry recording the file into Audacity, or burn it to audio CD then \nextract the CD track to a supported audio format such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is an encrypted audio file. \nThese typically are from an online music store. \nAudacity cannot open this type of file due to the encryption. \nTry recording the file into Audacity, or burn it to audio CD then \nextract the CD track to a supported audio format such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// Real Inc. files of various sorts
if ((extension.IsSameAs(wxT("ra"), false))||(extension.IsSameAs(wxT("rm"), false))||(extension.IsSameAs(wxT("rpm"), false))) {
errorMessage.Printf(_("\"%s\" is a RealPlayer media file. \nDarkAudacity cannot open this proprietary format. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a RealPlayer media file. \nAudacity cannot open this proprietary format. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// Other notes-based formats
if ((extension.IsSameAs(wxT("kar"), false))||(extension.IsSameAs(wxT("mod"), false))||(extension.IsSameAs(wxT("rmi"), false))) {
errorMessage.Printf(_("\"%s\" is a notes-based file, not an audio file. \nDarkAudacity cannot open this type of file. \nTry converting it to an audio file such as WAV or AIFF and \nthen import it, or record it into Audacity."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a notes-based file, not an audio file. \nAudacity cannot open this type of file. \nTry converting it to an audio file such as WAV or AIFF and \nthen import it, or record it into Audacity."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// MusePack files
if ((extension.IsSameAs(wxT("mp+"), false))||(extension.IsSameAs(wxT("mpc"), false))||(extension.IsSameAs(wxT("mpp"), false))) {
errorMessage.Printf(_("\"%s\" is a Musepack audio file. \nDarkAudacity cannot open this type of file. \nIf you think it might be an mp3 file, rename it to end with \".mp3\" \nand try importing it again. Otherwise you need to convert it to a supported audio \nformat, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a Musepack audio file. \nAudacity cannot open this type of file. \nIf you think it might be an mp3 file, rename it to end with \".mp3\" \nand try importing it again. Otherwise you need to convert it to a supported audio \nformat, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// WavPack files
if ((extension.IsSameAs(wxT("wv"), false))||(extension.IsSameAs(wxT("wvc"), false))) {
errorMessage.Printf(_("\"%s\" is a Wavpack audio file. \nDarkAudacity cannot open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a Wavpack audio file. \nAudacity cannot open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// AC3 files
if ((extension.IsSameAs(wxT("ac3"), false))) {
errorMessage.Printf(_("\"%s\" is a Dolby Digital audio file. \nDarkAudacity cannot currently open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a Dolby Digital audio file. \nAudacity cannot currently open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// Speex files
if ((extension.IsSameAs(wxT("spx"), false))) {
errorMessage.Printf(_("\"%s\" is an Ogg Speex audio file. \nDarkAudacity cannot currently open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is an Ogg Speex audio file. \nAudacity cannot currently open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// Video files of various forms
if ((extension.IsSameAs(wxT("mpg"), false))||(extension.IsSameAs(wxT("mpeg"), false))||(extension.IsSameAs(wxT("avi"), false))||(extension.IsSameAs(wxT("wmv"), false))||(extension.IsSameAs(wxT("rv"), false))) {
errorMessage.Printf(_("\"%s\" is a video file. \nDarkAudacity cannot currently open this type of file. \nYou need to extract the audio to a supported format, such as WAV or AIFF."), fName.c_str());
errorMessage.Printf(_("\"%s\" is a video file. \nAudacity cannot currently open this type of file. \nYou need to extract the audio to a supported format, such as WAV or AIFF."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// Audacity project
if (extension.IsSameAs(wxT("aup"), false)) {
errorMessage.Printf(_("\"%s\" is a DarkAudacity Project file. \nUse the 'File > Open' command to open Audacity Projects."), fName.c_str());
errorMessage.Printf(_("\"%s\" is an Audacity Project file. \nUse the 'File > Open' command to open Audacity Projects."), fName.c_str());
pProj->mbBusyImporting = false;
return false;
}
// we were not able to recognize the file type
errorMessage.Printf(_("DarkAudacity did not recognize the type of the file '%s'.\nIf it is uncompressed, try importing it using \"Import Raw\"."),fName.c_str());
errorMessage.Printf(_("Audacity did not recognize the type of the file '%s'.\nIf it is uncompressed, try importing it using \"Import Raw\"."),fName.c_str());
}
else
{
@ -684,7 +684,7 @@ bool Importer::Import(const wxString &fName,
pluglist = pluglist + wxT(", ") + plugin->GetPluginFormatDescription();
}
errorMessage.Printf(_("DarkAudacity recognized the type of the file '%s'.\nImporters supposedly supporting such files are:\n%s,\nbut none of them understood this file format."),fName.c_str(), pluglist.c_str());
errorMessage.Printf(_("Audacity recognized the type of the file '%s'.\nImporters supposedly supporting such files are:\n%s,\nbut none of them understood this file format."),fName.c_str(), pluglist.c_str());
}
pProj->mbBusyImporting = false;

2
src/import/ImportGStreamer.cpp
View File

@ -264,7 +264,7 @@ void
GetGStreamerImportPlugin(ImportPluginList &importPluginList,
UnusableImportPluginList & WXUNUSED(unusableImportPluginList))
{
wxLogMessage(wxT("DarkAudacity is built against GStreamer version %d.%d.%d-%d"),
wxLogMessage( wxString(AUDACITY_NAME) + wxT(" is built against GStreamer version %d.%d.%d-%d"),
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
GST_VERSION_MICRO,

4
src/prefs/EffectsPrefs.cpp
View File

@ -139,10 +139,10 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
#ifndef EXPERIMENTAL_EFFECT_MANAGEMENT
S.StartStatic(_("Plugin Options"));
{
S.TieCheckBox(_("Check for updated plugins when DarkAudacity starts"),
S.TieCheckBox(_("Check for updated plugins when Audacity starts"),
wxT("/Plugins/CheckForUpdates"),
true);
S.TieCheckBox(_("Rescan plugins next time DarkAudacity is started"),
S.TieCheckBox(_("Rescan plugins next time Audacity is started"),
wxT("/Plugins/Rescan"),
false);
}

4
src/prefs/KeyConfigPrefs.cpp
View File

@ -328,7 +328,7 @@ void KeyConfigPrefs::OnImport(wxCommandEvent & WXUNUSED(event))
wxString path = gPrefs->Read(wxT("/DefaultOpenPath"),
::wxGetCwd());
file = FileSelector(_("Select an XML file containing DarkAudacity keyboard shortcuts..."),
file = FileSelector(_("Select an XML file containing Audacity keyboard shortcuts..."),
path,
file,
wxT(""),
@ -909,7 +909,7 @@ void KeyConfigPrefs::OnImport(wxCommandEvent & WXUNUSED(event))
wxString path = gPrefs->Read(wxT("/DefaultOpenPath"),
::wxGetCwd());
file = FileSelector(_("Select an XML file containing DarkAudacity keyboard shortcuts..."),
file = FileSelector(_("Select an XML file containing Audacity keyboard shortcuts..."),
path,
file,
wxT(""),

2
src/prefs/LibraryPrefs.cpp
View File

@ -206,7 +206,7 @@ void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & WXUNUSED(event))
// Libs are fine, don't show "locate" dialog unless user really wants it
if (!locate) {
int response = wxMessageBox(_("DarkAudacity has automatically detected valid FFmpeg libraries.\nDo you still want to locate them manually?"),
int response = wxMessageBox(_("Audacity has automatically detected valid FFmpeg libraries.\nDo you still want to locate them manually?"),
wxT("Success"),
wxCENTRE | wxYES_NO | wxNO_DEFAULT |wxICON_QUESTION);
if (response == wxYES) {

4
src/prefs/ThemePrefs.cpp
View File

@ -88,12 +88,12 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
S.StartStatic(_("Info"));
{
S.AddFixedText(
_("Themability is an experimental feature.\n\nTo try it out, click \"Save Theme Cache\" then find and modify the images and colors in\nImageCacheVxx.png using an image editor such as the Gimp.\n\nClick \"Load Theme Cache\" to load the changed images and colors back into DarkAudacity.\n\n(Only the Transport Toolbar and the colors on the wavetrack are currently affected, even\nthough the image file shows other icons too.)")
_("Themability is an experimental feature.\n\nTo try it out, click \"Save Theme Cache\" then find and modify the images and colors in\nImageCacheVxx.png using an image editor such as the Gimp.\n\nClick \"Load Theme Cache\" to load the changed images and colors back into Audacity.\n\n(Only the Transport Toolbar and the colors on the wavetrack are currently affected, even\nthough the image file shows other icons too.)")
);
#ifdef __WXDEBUG__
S.AddFixedText(
_("You have compiled DarkAudacity with an extra button, 'Output Sourcery'. This will save a\nC version of the image cache that can be compiled in as a default.")
_("You have compiled Audacity with an extra button, 'Output Sourcery'. This will save a\nC version of the image cache that can be compiled in as a default.")
);
#endif