diff --git a/src/DirManager.cpp b/src/DirManager.cpp index eacfcd3ae..44f560377 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -875,7 +875,7 @@ wxFileNameWrapper DirManager::MakeBlockFilePath(const wxString &value) { if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL)) { // need braces to avoid compiler warning about ambiguous else, see the macro - wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed.")); + wxLogSysError(wxT("mkdir in DirManager::MakeBlockFilePath failed.")); } } return dir; @@ -906,7 +906,7 @@ bool DirManager::AssignFile(wxFileNameWrapper &fileName, wxString collision; checkit.GetFirst(&collision,filespec); - wxLogWarning(_("Audacity found an orphan block file: %s. \nPlease consider saving and reloading the project to perform a complete project check."), + wxLogWarning(wxT("Audacity found an orphan block file: %s. \nPlease consider saving and reloading the project to perform a complete project check."), collision); return FALSE; @@ -1495,7 +1495,7 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName) wxFile testFile(renamedFullPath, wxFile::write); if (!testFile.IsOpened()) { { // need braces to avoid compiler warning about ambiguous else, see the macro - wxLogSysError(_("Unable to open/create test file."), + wxLogSysError(wxT("Unable to open/create test file."), renamedFullPath); } return false; @@ -1507,7 +1507,7 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName) if (!wxRemoveFile(renamedFullPath)) { { // need braces to avoid compiler warning about ambiguous else, see the macro /* i18n-hint: %s is the name of a file.*/ - wxLogSysError(_("Unable to remove '%s'."), + wxLogSysError(wxT("Unable to remove '%s'."), renamedFullPath); } return false; @@ -1548,7 +1548,7 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName) // just in case!!! // Print error message and cancel the export - wxLogSysError(_("Unable to rename '%s' to '%s'."), + wxLogSysError(wxT("Unable to rename '%s' to '%s'."), fullPath, renamedFullPath); @@ -1619,7 +1619,7 @@ void DirManager::FindMissingAliasFiles( iter = missingAliasFilesPathHash.begin(); while (iter != missingAliasFilesPathHash.end()) { - wxLogWarning(_("Missing aliased audio file: '%s'"), iter->first); + wxLogWarning(wxT("Missing aliased audio file: '%s'"), iter->first); ++iter; } } @@ -1643,7 +1643,7 @@ void DirManager::FindMissingAUFs( if (!fileName.FileExists()) { missingAUFHash[key] = b; - wxLogWarning(_("Missing alias (.auf) block file: '%s'"), + wxLogWarning(wxT("Missing alias (.auf) block file: '%s'"), fileName.GetFullPath()); } } @@ -1673,7 +1673,7 @@ void DirManager::FindMissingAUs( wxFile{ path }.Length() == 0) { missingAUHash[key] = b; - wxLogWarning(_("Missing data block file: '%s'"), path); + wxLogWarning(wxT("Missing data block file: '%s'"), path); } } } @@ -1716,7 +1716,7 @@ void DirManager::FindOrphanBlockFiles( } } for ( const auto &orphan : orphanFilePathArray ) - wxLogWarning(_("Orphan block file: '%s'"), orphan); + wxLogWarning(wxT("Orphan block file: '%s'"), orphan); } diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index 546420cb4..eaa681bd9 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -112,7 +112,7 @@ bool Module::Load() auto Error = wxString(wxSysErrorMsg()); AudacityMessageBox(XO("Unable to load the \"%s\" module.\n\nError: %s").Format(ShortName, Error), XO("Module Unsuitable")); - wxLogMessage(_("Unable to load the module \"%s\". Error: %s").Format(mName, Error)); + wxLogMessage(wxT("Unable to load the module \"%s\". Error: %s"), mName, Error); return false; } @@ -123,7 +123,7 @@ bool Module::Load() XO("The module \"%s\" does not provide a version string.\n\nIt will not be loaded.") .Format( ShortName), XO("Module Unsuitable")); - wxLogMessage(wxString::Format(_("The module \"%s\" does not provide a version string. It will not be loaded."), mName)); + wxLogMessage(wxT("The module \"%s\" does not provide a version string. It will not be loaded."), mName); mLib->Unload(); return false; } @@ -134,7 +134,7 @@ bool Module::Load() XO("The module \"%s\" is matched with Audacity version \"%s\".\n\nIt will not be loaded.") .Format(ShortName, moduleVersion), XO("Module Unsuitable")); - wxLogMessage(wxString::Format(_("The module \"%s\" is matched with Audacity version \"%s\". It will not be loaded."), mName, moduleVersion)); + wxLogMessage(wxT("The module \"%s\" is matched with Audacity version \"%s\". It will not be loaded."), mName, moduleVersion); mLib->Unload(); return false; } @@ -159,7 +159,7 @@ bool Module::Load() AudacityMessageBox( XO("The module \"%s\" failed to initialize.\n\nIt will not be loaded.").Format(ShortName), XO("Module Unsuitable")); - wxLogMessage(wxString::Format(_("The module \"%s\" failed to initialize.\nIt will not be loaded."), mName)); + wxLogMessage(wxT("The module \"%s\" failed to initialize.\nIt will not be loaded."), mName); mLib->Unload(); return false; @@ -342,7 +342,7 @@ void ModuleManager::Initialize(CommandHandler &cmdHandler) AudacityMessageBox( XO("The module \"%s\" does not provide any of the required functions.\n\nIt will not be loaded.").Format(ShortName), XO("Module Unsuitable")); - wxLogMessage(wxString::Format(_("The module \"%s\" does not provide any of the required functions. It will not be loaded."), files[i])); + wxLogMessage(wxT("The module \"%s\" does not provide any of the required functions. It will not be loaded."), files[i]); module->Unload(); } else diff --git a/src/ProjectFSCK.cpp b/src/ProjectFSCK.cpp index aabd106d3..1c9f8f7f6 100644 --- a/src/ProjectFSCK.cpp +++ b/src/ProjectFSCK.cpp @@ -168,7 +168,7 @@ XO("Project check of \"%s\" folder \ ++iter; } if ((action == 2) && bAutoRecoverMode) - wxLogWarning(_(" Project check replaced missing aliased file(s) with silence.")); + wxLogWarning(wxT(" Project check replaced missing aliased file(s) with silence.")); } } @@ -240,7 +240,7 @@ XO("Project check of \"%s\" folder \ ++iter; } if ((action == 0) && bAutoRecoverMode) - wxLogWarning(_(" Project check regenerated missing alias summary file(s).")); + wxLogWarning(wxT(" Project check regenerated missing alias summary file(s).")); } } @@ -316,7 +316,7 @@ XO("Project check of \"%s\" folder \ ++iter; } if ((action == 2) && bAutoRecoverMode) - wxLogWarning(_(" Project check replaced missing audio data block file(s) with silence.")); + wxLogWarning(wxT(" Project check replaced missing audio data block file(s) with silence.")); } } @@ -332,7 +332,7 @@ XO("Project check of \"%s\" folder \ // They will be deleted when project is saved the first time. if (bAutoRecoverMode) { - wxLogWarning(_(" Project check ignored orphan block file(s). They will be deleted when project is saved.")); + wxLogWarning(wxT(" Project check ignored orphan block file(s). They will be deleted when project is saved.")); action = 1; } else @@ -391,7 +391,7 @@ other projects. \ !missingAUHash.empty() || !orphanFilePathArray.empty()) { - wxLogWarning(_("Project check found file inconsistencies inspecting the loaded project data.")); + wxLogWarning(wxT("Project check found file inconsistencies inspecting the loaded project data.")); wxLog::FlushActive(); // Flush is modal and will clear the log (both desired). // In auto-recover mode, we didn't do any ShowMultiDialog calls above, so put up an alert. diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index d5c9050cb..0dc2601ab 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -542,7 +542,7 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath( } catch (...) { - wxLogMessage(_("VST plugin registration failed for %s\n"), path); + wxLogMessage(wxT("VST plugin registration failed for %s\n"), path); error = true; } @@ -2176,7 +2176,7 @@ bool VSTEffect::Load() } catch (...) { - wxLogMessage(_("VST plugin initialization failed\n")); + wxLogMessage(wxT("VST plugin initialization failed\n")); mAEffect = NULL; } diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index 2faa3d994..739a80c35 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -1827,7 +1827,7 @@ void AudioUnitEffect::ExportPresets() if (!fn.Mkdir(fn.GetFullPath(), 0755, wxPATH_MKDIR_FULL)) { - wxLogError(_("Couldn't create the \"%s\" directory").Format(fn.GetPath())); + wxLogError(wxT("Couldn't create the \"%s\" directory"), fn.GetPath()); return; } diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index c020589d1..e578a2e3f 100755 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -1131,7 +1131,7 @@ size_t LV2Effect::ProcessBlock(float **inbuf, float **outbuf, size_t size) else { zix_ring_skip(ring, atom.size); - wxLogError(_("LV2 sequence buffer overflow")); + wxLogError(wxT("LV2 sequence buffer overflow")); } } @@ -1303,7 +1303,7 @@ bool LV2Effect::RealtimeProcessStart() else { zix_ring_skip(ring, atom.size); - wxLogError(_("LV2 sequence buffer overflow")); + wxLogError(wxT("LV2 sequence buffer overflow")); } } lv2_atom_forge_pop(&mForge, &seqFrame); @@ -1911,7 +1911,7 @@ bool LV2Effect::CheckFeatures(const LilvNode *subject, const LilvNode *predicate { if (required) { - wxLogError(_("%s requires unsupported feature %s"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); + wxLogError(wxT("%s requires unsupported feature %s"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); printf(_("%s requires unsupported feature %s\n"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); break; } @@ -1975,7 +1975,7 @@ bool LV2Effect::CheckOptions(const LilvNode *subject, const LilvNode *predicate, { if (required) { - wxLogError(_("%s requires unsupported option %s"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); + wxLogError(wxT("%s requires unsupported option %s"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); printf(_("%s requires unsupported option %s\n"), lilv_node_as_string(lilv_plugin_get_uri(mPlug)), uri); break; } @@ -2823,7 +2823,7 @@ void LV2Effect::OnIdle(wxIdleEvent &evt) else { zix_ring_skip(ring, atom->size); - wxLogError(_("LV2 sequence buffer overflow")); + wxLogError(wxT("LV2 sequence buffer overflow")); } } free(atom); diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index a54baf7e0..ab54cf108 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -1379,7 +1379,7 @@ bool NyquistEffect::ProcessOne() const auto output = mDebugOutput.Translation(); if (!output.empty() && !mDebug && !mTrace) { /* i18n-hint: An effect "returned" a message.*/ - wxLogMessage(_("\'%s\' returned:\n%s"), + wxLogMessage(wxT("\'%s\' returned:\n%s"), mName.Translation(), output); } @@ -2166,7 +2166,7 @@ bool NyquistEffect::Parse( else { wxString str; - str.Printf(_("Bad Nyquist 'control' type specification: '%s' in plug-in file '%s'.\nControl not created."), + str.Printf(wxT("Bad Nyquist 'control' type specification: '%s' in plug-in file '%s'.\nControl not created."), tokens[3], mFileName.GetFullPath()); // Too disturbing to show alert before Audacity frame is up.