1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-19 17:40:15 +02:00
This commit is contained in:
v.audacity 2011-11-15 04:03:01 +00:00
parent b2e0e984d9
commit 2bac0a07ed
2 changed files with 11 additions and 8 deletions

View File

@ -1370,7 +1370,7 @@ int DirManager::ProjectFSCK(const bool bForceError, const bool bAutoRecoverMode)
wxString msg = _("Project check read faulty Sequence tags."); wxString msg = _("Project check read faulty Sequence tags.");
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Close project immediately with no changes"), {_("Close project immediately with no changes"),
_("Continue with repairs noted in log, and check for more errors. This will save the project in its current state, unless you opt out on further error checks."), _("Continue with repairs noted in log, and check for more errors. This will save the project in its current state, unless you \"Close project immediately\" on further error alerts."),
NULL}; NULL};
wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current. wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current.
action = ShowMultiDialog(msg, _("Warning - Problems Reading Sequence Tags"), buttons); action = ShowMultiDialog(msg, _("Warning - Problems Reading Sequence Tags"), buttons);
@ -1421,7 +1421,7 @@ _("Project check of \"%s\" folder \
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Close project immediately with no changes"), {_("Close project immediately with no changes"),
_("Treat missing audio as silence (this session only)"), _("Treat missing audio as silence (this session only)"),
_("Replace missing audio with silence (permanent immediately). This will save the project in its current state."), _("Replace missing audio with silence (permanent immediately). This will save the project in its current state, unless you \"Close project immediately\" on further error alerts."),
NULL}; NULL};
wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current. wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current.
action = ShowMultiDialog(msg, _("Warning - Missing Aliased File(s)"), buttons); action = ShowMultiDialog(msg, _("Warning - Missing Aliased File(s)"), buttons);
@ -1589,14 +1589,16 @@ _("Project check of \"%s\" folder \
wxString msgA = wxString msgA =
_("Project check of \"%s\" folder \ _("Project check of \"%s\" folder \
\nfound %d orphan block file(s). These files are \ \nfound %d orphan block file(s). These files are \
\nunused by this project, but doing no harm."); \nunused by this project, but might belong to \
other projects. \
\nThey are doing no harm and are small.");
wxString msg; wxString msg;
msg.Printf(msgA, this->projName.c_str(), (int)orphanFilePathArray.GetCount()); msg.Printf(msgA, this->projName.c_str(), (int)orphanFilePathArray.GetCount());
const wxChar *buttons[] = const wxChar *buttons[] =
{_("Continue without deleting; ignore the extra files this session"), {_("Continue without deleting; ignore the extra files this session"),
_("Close project immediately with no further changes"), _("Close project immediately with no further changes"),
_("Delete orphan files permanently"), _("Delete orphan files (permanent immediately)"),
NULL}; NULL};
wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current. wxLog::FlushActive(); // MultiDialog has "Show Log..." button, so make sure log is current.
action = ShowMultiDialog(msg, _("Warning - Orphan Blockfile(s)"), buttons); action = ShowMultiDialog(msg, _("Warning - Orphan Blockfile(s)"), buttons);

View File

@ -2264,7 +2264,7 @@ bool AudacityProject::WarnOfLegacyFile( )
int action = int action =
wxMessageBox(msg, wxMessageBox(msg,
_("Opening old project file"), _("Warning - Opening Old Project File"),
wxYES_NO | wxICON_STOP | wxNO_DEFAULT | wxCENTRE, wxYES_NO | wxICON_STOP | wxNO_DEFAULT | wxCENTRE,
this); this);
return (action != wxNO); return (action != wxNO);
@ -2299,7 +2299,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
{ {
wxMessageBox( wxMessageBox(
_("You are trying to open an automatically created backup file.\nDoing this may result in severe data loss.\n\nPlease open the actual Audacity project file instead."), _("You are trying to open an automatically created backup file.\nDoing this may result in severe data loss.\n\nPlease open the actual Audacity project file instead."),
_("Backup file detected"), _("Warning - Backup File Detected"),
wxOK | wxCENTRE, this); wxOK | wxCENTRE, this);
return; return;
} }
@ -2313,7 +2313,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
if (!::wxFileExists(fileName)) { if (!::wxFileExists(fileName)) {
wxMessageBox(_("Could not open file: ") + fileName, wxMessageBox(_("Could not open file: ") + fileName,
_("Error opening file"), _("Error Opening File"),
wxOK | wxCENTRE, this); wxOK | wxCENTRE, this);
return; return;
} }
@ -2567,6 +2567,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
mFileName = wxT(""); mFileName = wxT("");
SetProjectTitle(); SetProjectTitle();
wxLogError(wxT("Could not parse file \"%s\". \nError: %s"), fileName.c_str(), xmlFile.GetErrorStr());
wxMessageBox(xmlFile.GetErrorStr(), wxMessageBox(xmlFile.GetErrorStr(),
_("Error Opening Project"), _("Error Opening Project"),
wxOK | wxCENTRE, this); wxOK | wxCENTRE, this);
@ -2829,7 +2830,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
icon_choice = wxICON_STOP | wxNO_DEFAULT; icon_choice = wxICON_STOP | wxNO_DEFAULT;
int action = int action =
wxMessageBox(msg, wxMessageBox(msg,
_("Opening old project file"), _("Warning - Opening Old Project File"),
wxYES_NO | icon_choice | wxCENTRE, wxYES_NO | icon_choice | wxCENTRE,
this); this);
if (action == wxNO) if (action == wxNO)