From d9bab5347ae91b1f05f82301b76c69e9359e7ab7 Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 17 Dec 2017 17:34:28 +0000 Subject: [PATCH] String changes: Exporting 'the audio' rather than 'the entire project'. --- src/export/ExportCL.cpp | 2 +- src/export/ExportFFmpeg.cpp | 2 +- src/export/ExportFLAC.cpp | 2 +- src/export/ExportMP2.cpp | 2 +- src/export/ExportMP3.cpp | 6 +++--- src/export/ExportOGG.cpp | 2 +- src/export/ExportPCM.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 941a33ac7..fc3b3ef96 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -451,7 +451,7 @@ ProgressResult ExportCL::Export(AudacityProject *project, ProgressDialog progress(_("Export"), selectionOnly ? _("Exporting the selected audio using command-line encoder") : - _("Exporting the entire project using command-line encoder")); + _("Exporting the audio using command-line encoder")); // Start piping the mixed data to the command while (updateResult == ProgressResult::Success && process.IsActive() && os->IsOk()) { diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index 878a5ed46..6961fcf5a 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -873,7 +873,7 @@ ProgressResult ExportFFmpeg::Export(AudacityProject *project, ProgressDialog progress(wxFileName(fName).GetName(), selectionOnly ? wxString::Format(_("Exporting selected audio as %s"), ExportFFmpegOptions::fmts[mSubFormat].Description()) : - wxString::Format(_("Exporting entire file as %s"), ExportFFmpegOptions::fmts[mSubFormat].Description())); + wxString::Format(_("Exporting the audio as %s"), ExportFFmpegOptions::fmts[mSubFormat].Description())); while (updateResult == ProgressResult::Success) { auto pcmNumSamples = mixer->Process(pcmBufferSize); diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index 122f5afb1..5c2128c5c 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -337,7 +337,7 @@ ProgressResult ExportFLAC::Export(AudacityProject *project, ProgressDialog progress(wxFileName(fName).GetName(), selectionOnly ? _("Exporting the selected audio as FLAC") : - _("Exporting the entire project as FLAC")); + _("Exporting the audio as FLAC")); while (updateResult == ProgressResult::Success) { auto samplesThisRun = mixer->Process(SAMPLES_PER_RUN); diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index 6d2400671..6f7e1ce9f 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -270,7 +270,7 @@ ProgressResult ExportMP2::Export(AudacityProject *project, ProgressDialog progress(wxFileName(fName).GetName(), selectionOnly ? wxString::Format(_("Exporting selected audio at %ld kbps"), bitrate) : - wxString::Format(_("Exporting entire file at %ld kbps"), bitrate)); + wxString::Format(_("Exporting the audio at %ld kbps"), bitrate)); while (updateResult == ProgressResult::Success) { auto pcmNumSamples = mixer->Process(pcmBufferSize); diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 436937bbb..e4c03ae53 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -1828,19 +1828,19 @@ ProgressResult ExportMP3::Export(AudacityProject *project, if (rmode == MODE_SET) { title.Printf(selectionOnly ? _("Exporting selected audio with %s preset") : - _("Exporting entire file with %s preset"), + _("Exporting the audio with %s preset"), FindName(setRates, WXSIZEOF(setRates), brate).c_str()); } else if (rmode == MODE_VBR) { title.Printf(selectionOnly ? _("Exporting selected audio with VBR quality %s") : - _("Exporting entire file with VBR quality %s"), + _("Exporting the audio with VBR quality %s"), FindName(varRates, WXSIZEOF(varRates), brate).c_str()); } else { title.Printf(selectionOnly ? _("Exporting selected audio at %d Kbps") : - _("Exporting entire file at %d Kbps"), + _("Exporting the audio at %d Kbps"), brate); } diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 6b0010151..231a31fe7 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -260,7 +260,7 @@ ProgressResult ExportOGG::Export(AudacityProject *project, ProgressDialog progress(wxFileName(fName).GetName(), selectionOnly ? _("Exporting the selected audio as Ogg Vorbis") : - _("Exporting the entire project as Ogg Vorbis")); + _("Exporting the audio as Ogg Vorbis")); while (updateResult == ProgressResult::Success && !eos) { float **vorbis_buffer = vorbis_analysis_buffer(&dsp, SAMPLES_PER_RUN); diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 896db96a2..5769f4cd2 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -493,7 +493,7 @@ ProgressResult ExportPCM::Export(AudacityProject *project, selectionOnly ? wxString::Format(_("Exporting the selected audio as %s"), formatStr.c_str()) : - wxString::Format(_("Exporting the entire project as %s"), + wxString::Format(_("Exporting the audio as %s"), formatStr.c_str())); while (updateResult == ProgressResult::Success) {