AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 00:21:31 +00:00
Files Issues Releases Activity

Consistent terminology and punctuation.

Browse Source
This commit is contained in:
Jeff Young 2021-06-16 23:35:00 +01:00
parent 2a3d8e22b6
commit 1722bc03b0
44 changed files with 187 additions and 175 deletions

8
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -752,7 +752,7 @@ void BM2CMP_FRAME::OnExportLogo()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName );
msg.Printf( _( "File '%s' could not be created." ), m_ConvertedFileName );
wxMessageBox( msg );
return;
}
@ -792,7 +792,7 @@ void BM2CMP_FRAME::exportPostScriptFormat()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName );
msg.Printf( _( "File '%s' could not be created." ), m_ConvertedFileName );
wxMessageBox( msg );
return;
}
@ -831,7 +831,7 @@ void BM2CMP_FRAME::exportEeschemaFormat()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName );
msg.Printf( _( "File '%s' could not be created." ), m_ConvertedFileName );
wxMessageBox( msg );
return;
}
@ -870,7 +870,7 @@ void BM2CMP_FRAME::exportPcbnewFormat()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName );
msg.Printf( _( "File '%s' could not be created." ), m_ConvertedFileName );
wxMessageBox( msg );
return;
}

6
common/common.cpp
View File

@ -317,7 +317,7 @@ bool EnsureFileDirectoryExists( wxFileName* aTargetFullFileName,
{
if( aReporter )
{
msg.Printf( _( "Cannot make path \"%s\" absolute with respect to \"%s\"." ),
msg.Printf( _( "Cannot make path '%s' absolute with respect to '%s'." ),
aTargetFullFileName->GetPath(),
baseFilePath );
aReporter->Report( msg, RPT_SEVERITY_ERROR );
@ -336,7 +336,7 @@ bool EnsureFileDirectoryExists( wxFileName* aTargetFullFileName,
{
if( aReporter )
{
msg.Printf( _( "Output directory \"%s\" created.\n" ), outputPath );
msg.Printf( _( "Output directory '%s' created.\n" ), outputPath );
aReporter->Report( msg, RPT_SEVERITY_INFO );
return true;
}
@ -345,7 +345,7 @@ bool EnsureFileDirectoryExists( wxFileName* aTargetFullFileName,
{
if( aReporter )
{
msg.Printf( _( "Cannot create output directory \"%s\".\n" ), outputPath );
msg.Printf( _( "Cannot create output directory '%s'.\n" ), outputPath );
aReporter->Report( msg, RPT_SEVERITY_ERROR );
}

2
common/dialogs/dialog_page_settings.cpp
View File

@ -463,7 +463,7 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
if( !fullFileName.IsEmpty() && !wxFileExists( fullFileName ) )
{
wxString msg;
msg.Printf( _( "Drawing sheet file \"%s\" not found." ), fullFileName );
msg.Printf( _( "Drawing sheet file '%s' not found." ), fullFileName );
wxMessageBox( msg );
return false;
}

2
common/dialogs/wx_html_report_panel.cpp
View File

@ -348,7 +348,7 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )
{
wxString msg;
msg.Printf( _( "Cannot write report to file \"%s\"." ),
msg.Printf( _( "Cannot write report to file '%s'." ),
fn.GetFullPath().GetData() );
wxMessageBox( msg, _( "File save error" ), wxOK | wxICON_ERROR, this );
return;

6
common/eda_base_frame.cpp
View File

@ -973,17 +973,17 @@ bool EDA_BASE_FRAME::IsWritable( const wxFileName& aFileName )
if( fn.IsDir() && !fn.IsDirWritable() )
{
msg.Printf( _( "You do not have write permissions to folder \"%s\"." ),
msg.Printf( _( "You do not have write permissions to folder '%s'." ),
fn.GetPath() );
}
else if( !fn.FileExists() && !fn.IsDirWritable() )
{
msg.Printf( _( "You do not have write permissions to save file \"%s\" to folder \"%s\"." ),
msg.Printf( _( "You do not have write permissions to save file '%s' to folder '%s'." ),
fn.GetFullName(), fn.GetPath() );
}
else if( fn.FileExists() && !fn.IsFileWritable() )
{
msg.Printf( _( "You do not have write permissions to save file \"%s\"." ),
msg.Printf( _( "You do not have write permissions to save file '%s'." ),
fn.GetFullPath() );
}

4
common/eda_doc.cpp
View File

@ -155,7 +155,7 @@ bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT
if( !wxFileExists( fullfilename ) )
{
msg.Printf( _( "Doc File \"%s\" not found" ), docname );
msg.Printf( _( "Doc File '%s' not found" ), docname );
DisplayError( aParent, msg );
return false;
}
@ -198,7 +198,7 @@ bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT
if( !success )
{
msg.Printf( _( "Unknown MIME type for doc file \"%s\"" ), fullfilename );
msg.Printf( _( "Unknown MIME type for doc file '%s'" ), fullfilename );
DisplayError( aParent, msg );
}

6
common/gestfich.cpp
View File

@ -187,7 +187,7 @@ int ExecuteFile( wxWindow* frame, const wxString& ExecFile, const wxString& para
#endif
wxString msg;
msg.Printf( _( "Command \"%s\" could not found" ), fullFileName );
msg.Printf( _( "Command '%s' could not be found." ), fullFileName );
DisplayError( frame, msg, 20 );
return -1;
}
@ -239,14 +239,14 @@ bool OpenPDF( const wxString& file )
else
{
wxString msg;
msg.Printf( _( "Problem while running the PDF viewer\nCommand is \"%s\"" ), command );
msg.Printf( _( "Problem while running the PDF viewer.\nCommand is '%s'." ), command );
DisplayError( NULL, msg );
}
}
else
{
wxString msg;
msg.Printf( _( "Unable to find a PDF viewer for \"%s\"" ), file );
msg.Printf( _( "Unable to find a PDF viewer for '%s'." ), file );
DisplayError( NULL, msg );
}

4
cvpcb/auto_associate.cpp
View File

@ -103,7 +103,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
if( aErrorMessages )
{
error_msg.Printf( _( "Equivalence file \"%s\" could not be found in the "
error_msg.Printf( _( "Equivalence file '%s' could not be found in the "
"default search paths." ),
fn.GetFullName() );
@ -124,7 +124,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
if( aErrorMessages )
{
error_msg.Printf( _( "Error opening equivalence file \"%s\"." ), tmp );
error_msg.Printf( _( "Error opening equivalence file '%s'." ), tmp );
if( ! aErrorMessages->IsEmpty() )
*aErrorMessages << wxT("\n\n");

2
cvpcb/dialogs/dialog_config_equfiles.cpp
View File

@ -290,7 +290,7 @@ void DIALOG_CONFIG_EQUFILES::OnAddFiles( wxCommandEvent& event )
else
{
wxString msg;
msg.Printf( _( "File \"%s\" already exists in list" ), equFilename.GetData() );
msg.Printf( _( "File '%s' already exists in list." ), equFilename.GetData() );
DisplayError( this, msg );
}
}

2
eeschema/dialogs/dialog_edit_symbols_libid.cpp
View File

@ -532,7 +532,7 @@ bool DIALOG_EDIT_SYMBOLS_LIBID::validateLibIds()
if( !id.IsValid() )
{
wxString msg;
msg.Printf( _( "Symbol library identifier \"%s\" is not valid." ), new_libid );
msg.Printf( _( "Symbol library identifier %s is not valid." ), new_libid );
wxMessageBox( msg );
m_grid->SetFocus();

47
eeschema/dialogs/dialog_plot_schematic.cpp
View File

@ -228,7 +228,7 @@ void DIALOG_PLOT_SCHEMATIC::OnOutputDirectoryBrowseClicked( wxCommandEvent& even
// Test if making the path relative is possible before asking the user if they want to do it
if( relPathTest.MakeRelativeTo( defaultPath ) )
{
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ), defaultPath );
msg.Printf( _( "Do you want to use a path relative to\n'%s'?" ), defaultPath );
wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
@ -246,16 +246,11 @@ PLOT_FORMAT DIALOG_PLOT_SCHEMATIC::GetPlotFileFormat()
switch( m_plotFormatOpt->GetSelection() )
{
default:
case 0:
return PLOT_FORMAT::POST;
case 1:
return PLOT_FORMAT::PDF;
case 2:
return PLOT_FORMAT::SVG;
case 3:
return PLOT_FORMAT::DXF;
case 4:
return PLOT_FORMAT::HPGL;
case 0: return PLOT_FORMAT::POST;
case 1: return PLOT_FORMAT::PDF;
case 2: return PLOT_FORMAT::SVG;
case 3: return PLOT_FORMAT::DXF;
case 4: return PLOT_FORMAT::HPGL;
}
}
@ -515,18 +510,18 @@ void DIALOG_PLOT_SCHEMATIC::createDxfFile( bool aPlotAll, bool aPlotDrawingSheet
if( plotOneSheetDxf( plotFileName.GetFullPath(), screen, aRenderSettings,
plot_offset, 1.0, aPlotDrawingSheet ) )
{
msg.Printf( _( "Plot: \"%s\" OK.\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Plotted to '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
}
else // Error
{
msg.Printf( _( "Unable to create file \"%s\".\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
}
catch( IO_ERROR& e )
{
msg.Printf( wxT( "DXF Plotter exception: %s"), e.What() );
msg.Printf( wxT( "DXF Plotter exception: %s\n"), e.What() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
schframe->SetCurrentSheet( oldsheetpath );
schframe->GetCurrentSheet().UpdateAllScreenReferences();
@ -685,18 +680,18 @@ void DIALOG_PLOT_SCHEMATIC::createHPGLFile( bool aPlotAll, bool aPlotFrameRef,
if( plotOneSheetHpgl( plotFileName.GetFullPath(), screen, plotPage, aRenderSettings,
plotOffset, plot_scale, aPlotFrameRef, getPlotOriginAndUnits() ) )
{
msg.Printf( _( "Plot: \"%s\" OK.\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Plotted to '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
}
else
{
msg.Printf( _( "Unable to create file \"%s\".\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
}
catch( IO_ERROR& e )
{
msg.Printf( wxT( "HPGL Plotter exception: %s"), e.What() );
msg.Printf( wxT( "HPGL Plotter exception: %s\n"), e.What() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
@ -842,7 +837,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotDrawingSheet
if( !plotter->OpenFile( plotFileName.GetFullPath() ) )
{
msg.Printf( _( "Unable to create file \"%s\".\n" ),
msg.Printf( _( "Unable to create file '%s'.\n" ),
plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
delete plotter;
@ -856,7 +851,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotDrawingSheet
catch( const IO_ERROR& e )
{
// Cannot plot PDF file
msg.Printf( wxT( "PDF Plotter exception: %s" ), e.What() );
msg.Printf( wxT( "PDF Plotter exception: %s\n" ), e.What() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
restoreEnvironment( plotter, oldsheetpath );
@ -877,7 +872,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotDrawingSheet
}
// Everything done, close the plot and restore the environment
msg.Printf( _( "Plot: \"%s\" OK.\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Plotted to '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
restoreEnvironment( plotter, oldsheetpath );
@ -1039,20 +1034,20 @@ void DIALOG_PLOT_SCHEMATIC::createPSFile( bool aPlotAll, bool aPlotFrameRef,
if( plotOneSheetPS( plotFileName.GetFullPath(), screen, aRenderSettings, plotPage,
plot_offset, scale, aPlotFrameRef ) )
{
msg.Printf( _( "Plot: \"%s\" OK.\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Plotted to '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
}
else
{
// Error
msg.Printf( _( "Unable to create file \"%s\".\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
}
catch( IO_ERROR& e )
{
msg.Printf( wxT( "PS Plotter exception: %s"), e.What() );
msg.Printf( wxT( "PS Plotter exception: %s\n"), e.What() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
}
@ -1165,19 +1160,19 @@ void DIALOG_PLOT_SCHEMATIC::createSVGFile( bool aPrintAll, bool aPrintFrameRef,
if( !success )
{
msg.Printf( _( "Cannot create file \"%s\".\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Cannot create file '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}
else
{
msg.Printf( _( "Plot: \"%s\" OK.\n" ), plotFileName.GetFullPath() );
msg.Printf( _( "Plotted to '%s'.\n" ), plotFileName.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
}
}
catch( const IO_ERROR& e )
{
// Cannot plot SVG file
msg.Printf( wxT( "SVG Plotter exception: %s" ), e.What() );
msg.Printf( wxT( "SVG Plotter exception: %s\n" ), e.What() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
break;
}

52
eeschema/dialogs/dialog_symbol_remap.cpp
View File

@ -207,8 +207,9 @@ void DIALOG_SYMBOL_REMAP::createProjectSymbolLibTable( REPORTER& aReporter )
// Don't add symbol libraries that do not exist.
if( tmpFn.Normalize() && tmpFn.FileExists() )
{
msg.Printf( _( "Adding library \"%s\", file \"%s\" to project symbol library table." ),
libName, fullFileName );
msg.Printf( _( "Adding library '%s', file '%s' to project symbol library table." ),
libName,
fullFileName );
aReporter.Report( msg, RPT_SEVERITY_INFO );
prjLibTable.InsertRow( new SYMBOL_LIB_TABLE_ROW( libName, fullFileName,
@ -216,7 +217,7 @@ void DIALOG_SYMBOL_REMAP::createProjectSymbolLibTable( REPORTER& aReporter )
}
else
{
msg.Printf( _( "Library \"%s\" not found." ), fullFileName );
msg.Printf( _( "Library '%s' not found." ), fullFileName );
aReporter.Report( msg, RPT_SEVERITY_WARNING );
}
}
@ -260,13 +261,13 @@ void DIALOG_SYMBOL_REMAP::remapSymbolsToLibTable( REPORTER& aReporter )
if( !remapSymbolToLibTable( symbol ) )
{
msg.Printf( _( "No symbol \"%s\" found in symbol library table." ),
msg.Printf( _( "No symbol %s found in symbol library table." ),
symbol->GetLibId().GetLibItemName().wx_str() );
aReporter.Report( msg, RPT_SEVERITY_WARNING );
}
else
{
msg.Printf( _( "Symbol \"%s\" mapped to symbol library \"%s\"." ),
msg.Printf( _( "Symbol %s mapped to symbol library '%s'." ),
symbol->GetLibId().GetLibItemName().wx_str(),
symbol->GetLibId().GetLibNickname().wx_str() );
aReporter.Report( msg, RPT_SEVERITY_ACTION );
@ -345,7 +346,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
{
if( !destFileName.Mkdir() )
{
errorMsg.Printf( _( "Cannot create project remap back up folder \"%s\"." ),
errorMsg.Printf( _( "Cannot create project remap back up folder '%s'." ),
destFileName.GetPath() );
wxMessageDialog dlg( this, errorMsg, _( "Backup Error" ),
@ -368,14 +369,16 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
destFileName.AppendDir( backupFolder );
destFileName.SetName( destFileName.GetName() + timeStamp );
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
srcFileName.GetFullPath(), destFileName.GetFullPath() );
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
srcFileName.GetFullPath(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
if( wxFileName::Exists( srcFileName.GetFullPath() )
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ),
srcFileName.GetFullPath() );
errorMsg += tmp;
}
@ -401,13 +404,14 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
destFileName.AppendDir( backupFolder );
}
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
screen->GetFileName(), destFileName.GetFullPath() );
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
screen->GetFileName(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
if( !destFileName.DirExists() && !destFileName.Mkdir( wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) )
{
tmp.Printf( _( "Failed to create backup folder \"%s\"\n" ), destFileName.GetPath() );
tmp.Printf( _( "Failed to create backup folder '%s'.\n" ), destFileName.GetPath() );
errorMsg += tmp;
continue;
}
@ -415,7 +419,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
if( wxFileName::Exists( screen->GetFileName() )
&& !wxCopyFile( screen->GetFileName(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), screen->GetFileName() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ), screen->GetFileName() );
errorMsg += tmp;
}
}
@ -425,14 +429,15 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
destFileName.SetName( destFileName.GetName() + timeStamp );
destFileName.AppendDir( backupFolder );
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
Prj().GetProjectFullName(), destFileName.GetFullPath() );
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
Prj().GetProjectFullName(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
if( wxFileName::Exists( Prj().GetProjectFullName() )
&& !wxCopyFile( Prj().GetProjectFullName(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), Prj().GetProjectFullName() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ), Prj().GetProjectFullName() );
errorMsg += tmp;
}
@ -445,14 +450,15 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
destFileName.SetName( destFileName.GetName() + timeStamp );
destFileName.AppendDir( backupFolder );
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
srcFileName.GetFullPath(), destFileName.GetFullPath() );
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
srcFileName.GetFullPath(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += tmp;
}
@ -460,7 +466,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
srcFileName.SetName( Prj().GetProjectName() + "-rescue" );
destFileName.SetName( srcFileName.GetName() + timeStamp );
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
srcFileName.GetFullPath(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
@ -468,7 +474,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += tmp;
}
@ -476,7 +482,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
srcFileName.SetExt( LegacySymbolDocumentFileExtension );
destFileName.SetExt( srcFileName.GetExt() );
tmp.Printf( _( "Backing up file \"%s\" to file \"%s\"." ),
tmp.Printf( _( "Backing up file '%s' to '%s'." ),
srcFileName.GetFullPath(),
destFileName.GetFullPath() );
aReporter.Report( tmp, RPT_SEVERITY_INFO );
@ -484,7 +490,7 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
tmp.Printf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
tmp.Printf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += tmp;
}

4
eeschema/eeschema.cpp
View File

@ -401,7 +401,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
if( !aErrors.empty() )
aErrors += "\n";
msg.Printf( _( "Cannot copy file \"%s\"." ), destFile.GetFullPath() );
msg.Printf( _( "Cannot copy file '%s'." ), destFile.GetFullPath() );
aErrors += msg;
}
}
@ -433,7 +433,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
if( !aErrors.empty() )
aErrors += "\n";
msg.Printf( _( "Cannot copy file \"%s\"." ), destFile.GetFullPath() );
msg.Printf( _( "Cannot copy file '%s'." ), destFile.GetFullPath() );
aErrors += msg;
}
}

2
eeschema/eeschema_config.cpp
View File

@ -268,7 +268,7 @@ SYMBOL_LIB_TABLE* PROJECT::SchSymbolLibTable()
catch( const IO_ERROR& ioe )
{
wxString msg;
msg.Printf( _( "An error occurred loading the symbol library table \"%s\"." ),
msg.Printf( _( "An error occurred loading the symbol library table '%s'." ),
fn.GetFullPath() );
DisplayErrorMessage( NULL, msg, ioe.What() );
}

26
eeschema/files-io.cpp
View File

@ -137,11 +137,13 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error saving schematic file \"%s\".\n%s" ),
schematicFileName.GetFullPath(), ioe.What() );
msg.Printf( _( "Error saving schematic file '%s'.\n%s" ),
schematicFileName.GetFullPath(),
ioe.What() );
DisplayError( this, msg );
msg.Printf( _( "Failed to create temporary file \"%s\"" ), tempFile.GetFullPath() );
msg.Printf( _( "Failed to create temporary file '%s'." ),
tempFile.GetFullPath() );
SetMsgPanel( wxEmptyString, msg );
// In case we started a file but didn't fully write it, clean up
@ -157,12 +159,14 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
if( !success )
{
msg.Printf( _( "Error saving schematic file \"%s\".\n"
"Failed to rename temporary file %s" ),
schematicFileName.GetFullPath(), tempFile.GetFullPath() );
msg.Printf( _( "Error saving schematic file '%s'.\n"
"Failed to rename temporary file '%s'." ),
schematicFileName.GetFullPath(),
tempFile.GetFullPath() );
DisplayError( this, msg );
msg.Printf( _( "Failed to rename temporary file \"%s\"" ), tempFile.GetFullPath() );
msg.Printf( _( "Failed to rename temporary file '%s'." ),
tempFile.GetFullPath() );
SetMsgPanel( wxEmptyString, msg );
}
}
@ -195,7 +199,7 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
screen->SetContentModified( false );
UpdateTitle();
msg.Printf( _( "File \"%s\" saved." ), screen->GetFileName() );
msg.Printf( _( "File '%s' saved." ), screen->GetFileName() );
SetStatusText( msg, 0 );
}
else
@ -263,7 +267,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
if( !LockFile( fullFileName ) )
{
msg.Printf( _( "Schematic file \"%s\" is already open." ), fullFileName );
msg.Printf( _( "Schematic file '%s' is already open." ), fullFileName );
DisplayError( this, msg );
return false;
}
@ -284,7 +288,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
if( is_new && !( aCtl & KICTL_CREATE ) )
{
// notify user that fullFileName does not exist, ask if user wants to create it.
msg.Printf( _( "Schematic \"%s\" does not exist. Do you wish to create it?" ),
msg.Printf( _( "Schematic '%s' does not exist. Do you wish to create it?" ),
fullFileName );
if( !IsOK( this, msg ) )
@ -419,7 +423,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
}
catch( const std::bad_alloc& )
{
msg.Printf( _( "Memory exhausted loading schematic file \"%s\"" ), fullFileName );
msg.Printf( _( "Memory exhausted loading schematic file '%s'." ), fullFileName );
DisplayErrorMessage( this, msg );
failedLoad = true;

5
eeschema/getpart.cpp
View File

@ -245,8 +245,9 @@ void SCH_EDIT_FRAME::ConvertPart( SCH_SYMBOL* aSymbol )
{
LIB_ID id = aSymbol->GetLibSymbolRef()->GetLibId();
msg.Printf( _( "No alternate body style found for symbol \"%s\" in library \"%s\"." ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
msg.Printf( _( "No alternate body style found for symbol '%s' in library '%s'." ),
id.GetLibItemName().wx_str(),
id.GetLibNickname().wx_str() );
DisplayError( this, msg );
return;
}

9
eeschema/libarch.cpp
View File

@ -98,8 +98,9 @@ bool SCH_EDIT_FRAME::CreateArchiveLibrary( const wxString& aFileName )
catch( const IO_ERROR& )
{
// Queue up error messages for later.
tmp.Printf( _( "Failed to add symbol \"%s\" to library file \"%s\"." ),
symbol->GetLibId().GetUniStringLibItemName(), aFileName );
tmp.Printf( _( "Failed to add symbol %s to library file '%s'." ),
symbol->GetLibId().GetUniStringLibItemName(),
aFileName );
// Don't bail out here. Attempt to add as many of the symbols to the library
// as possible.
@ -149,13 +150,13 @@ bool SCH_EDIT_FRAME::CreateArchiveLibrary( const wxString& aFileName )
}
catch( const IO_ERROR& ioe )
{
errorMsg.Printf( _( "Failed to save symbol library file \"%s\"" ), aFileName );
errorMsg.Printf( _( "Failed to save symbol library file '%s'." ), aFileName );
DisplayErrorMessage( this, errorMsg, ioe.What() );
return false;
}
catch( std::exception& error )
{
errorMsg.Printf( _( "Failed to save symbol library file \"%s\"" ), aFileName );
errorMsg.Printf( _( "Failed to save symbol library file '%s'." ), aFileName );
DisplayErrorMessage( this, errorMsg, error.what() );
return false;
}

2
eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
View File

@ -46,7 +46,7 @@ bool NETLIST_EXPORTER_CADSTAR::WriteNetlist( const wxString& aOutFileName,
if( ( f = wxFopen( aOutFileName, wxT( "wt" ) ) ) == NULL )
{
wxString msg;
msg.Printf( _( "Failed to create file \"%s\"" ), aOutFileName );
msg.Printf( _( "Failed to create file '%s'." ), aOutFileName );
DisplayError( NULL, msg );
return false;
}

2
eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
View File

@ -50,7 +50,7 @@ bool NETLIST_EXPORTER_ORCADPCB2::WriteNetlist( const wxString& aOutFileName,
if( ( f = wxFopen( aOutFileName, wxT( "wt" ) ) ) == NULL )
{
wxString msg;
msg.Printf( _( "Failed to create file \"%s\"" ), aOutFileName );
msg.Printf( _( "Failed to create file '%s'." ), aOutFileName );
DisplayError( NULL, msg );
return false;
}

2
eeschema/project_rescue.cpp
View File

@ -681,7 +681,7 @@ bool LEGACY_RESCUER::WriteRescueLibrary( wxWindow *aParent )
{
wxString msg;
msg.Printf( _( "Failed to create symbol library file \"%s\"" ),
msg.Printf( _( "Failed to create symbol library file '%s'." ),
m_rescue_lib->GetFullFileName() );
DisplayError( aParent, msg );
return false;

2
eeschema/sch_edit_frame.cpp
View File

@ -958,7 +958,7 @@ void SCH_EDIT_FRAME::NewProject()
if( create_me.FileExists() )
{
wxString msg;
msg.Printf( _( "Schematic file \"%s\" already exists." ), create_me.GetFullName() );
msg.Printf( _( "Schematic file '%s' already exists." ), create_me.GetFullName() );
DisplayError( this, msg );
return ;
}

13
eeschema/sheet.cpp
View File

@ -81,10 +81,11 @@ bool SCH_EDIT_FRAME::checkForNoFullyDefinedLibIds( SCH_SHEET* aSheet )
if( newScreens.HasNoFullyDefinedLibIds() )
{
msg.Printf( _( "The schematic \"%s\" has not had it's symbol library links remapped "
msg.Printf( _( "The schematic '%s' has not had it's symbol library links remapped "
"to the symbol library table. The project this schematic belongs to "
"must first be remapped before it can be imported into the current "
"project." ), aSheet->GetScreen()->GetFileName() );
"project." ),
aSheet->GetScreen()->GetFileName() );
DisplayInfoMessage( this, msg );
return true;
}
@ -158,7 +159,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error occurred loading schematic file \"%s\"." ), fullFilename );
msg.Printf( _( "Error occurred loading schematic file '%s'." ), fullFilename );
DisplayErrorMessage( this, msg, ioe.What() );
msg.Printf( _( "Failed to load '%s'." ), fullFilename );
@ -260,7 +261,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
{
if( !symLibTableFn.Exists() || !symLibTableFn.IsFileReadable() )
{
msg.Printf( _( "The project library table \"%s\" does not exist or cannot "
msg.Printf( _( "The project library table '%s' does not exist or cannot "
"be read. This may result in broken symbol links for the "
"schematic. Do you wish to continue?" ),
fileName.GetFullPath() );
@ -280,7 +281,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "An error occurred loading the symbol library table \"%s\"." ),
msg.Printf( _( "An error occurred loading the symbol library table '%s'." ),
symLibTableFn.GetFullPath() );
DisplayErrorMessage( nullptr, msg, ioe.What() );
return false;
@ -557,7 +558,7 @@ bool SCH_EDIT_FRAME::AllowCaseSensitiveFileNameClashes( const wxString& aSchemat
if( eeconfig()->m_Appearance.show_sheet_filename_case_sensitivity_dialog
&& screens.CanCauseCaseSensitivityIssue( aSchematicFileName ) )
{
msg.Printf( _( "The file name \"%s\" can cause issues with an existing file name\n"
msg.Printf( _( "The file name '%s' can cause issues with an existing file name\n"
"already defined in the schematic on systems that support case\n"
"insensitive file names. This will cause issues if you copy this\n"
"project to an operating system that supports case insensitive file\n"

19
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -283,8 +283,9 @@ bool SYMBOL_EDIT_FRAME::LoadSymbolFromCurrentLib( const wxString& aAliasName, in
{
wxString msg;
msg.Printf( _( "Error occurred loading symbol \"%s\" from library \"%s\"." ),
aAliasName, GetCurLib() );
msg.Printf( _( "Error occurred loading symbol %s from library '%s'." ),
aAliasName,
GetCurLib() );
DisplayErrorMessage( this, msg, ioe.What() );
return false;
}
@ -738,7 +739,7 @@ void SYMBOL_EDIT_FRAME::DeleteSymbolFromLibrary()
{
wxString msg;
msg.Printf( _( "The symbol \"%s\" is used to derive other symbols.\n"
msg.Printf( _( "The symbol %s is used to derive other symbols.\n"
"Deleting this symbol will delete all of the symbols derived from it.\n\n"
"Do you wish to delete this symbol and all of it's derivatives?" ),
libId.GetLibItemName().wx_str() );
@ -955,7 +956,9 @@ void SYMBOL_EDIT_FRAME::LoadSymbol( const wxString& aAlias, const wxString& aLib
{
wxString msg;
msg.Printf( _( "Symbol name \"%s\" not found in library \"%s\"" ), aAlias, aLibrary );
msg.Printf( _( "Symbol %s not found in library '%s'." ),
aAlias,
aLibrary );
DisplayError( this, msg );
return;
}
@ -1040,9 +1043,9 @@ bool SYMBOL_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
if( !m_libMgr->SaveLibrary( aLibrary, fn.GetFullPath(), fileType ) )
{
msg.Printf( _( "Failed to save changes to symbol library file \"%s\"" ),
msg.Printf( _( "Failed to save changes to symbol library file '%s'." ),
fn.GetFullPath() );
DisplayErrorMessage( this, _( "Error saving library" ), msg );
DisplayErrorMessage( this, _( "Error Saving Library" ), msg );
return false;
}
@ -1085,7 +1088,7 @@ bool SYMBOL_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
}
ClearMsgPanel();
msg.Printf( _( "Symbol library file \"%s\" saved" ), fn.GetFullPath() );
msg.Printf( _( "Symbol library file '%s' saved." ), fn.GetFullPath() );
RebuildSymbolUnitsList();
return true;
@ -1112,7 +1115,7 @@ bool SYMBOL_EDIT_FRAME::saveAllLibraries( bool aRequireConfirmation )
{
if( aRequireConfirmation && !applyToAll )
{
msg.Printf( _( "Save changes to \"%s\" before closing?" ), libNickname );
msg.Printf( _( "Save changes to '%s' before closing?" ), libNickname );
switch( UnsavedChangesDialog( this, msg, dirtyCount > 1 ? &applyToAll : nullptr ) )
{

18
eeschema/symbol_editor/symbol_editor_import_export.cpp
View File

@ -75,14 +75,14 @@ void SYMBOL_EDIT_FRAME::ImportSymbol()
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Cannot import symbol library \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Cannot import symbol library '%s'." ), fn.GetFullPath() );
DisplayErrorMessage( this, msg, ioe.What() );
return;
}
if( symbols.empty() )
{
msg.Printf( _( "Symbol library file \"%s\" is empty." ), fn.GetFullPath() );
msg.Printf( _( "Symbol library file '%s' is empty." ), fn.GetFullPath() );
DisplayError( this, msg );
return;
}
@ -92,7 +92,7 @@ void SYMBOL_EDIT_FRAME::ImportSymbol()
if( m_libMgr->SymbolExists( symbols[0], libName ) )
{
msg.Printf( _( "Symbol \"%s\" already exists in library \"%s\"." ), symbolName, libName );
msg.Printf( _( "Symbol %s already exists in library '%s'." ), symbolName, libName );
DisplayError( this, msg );
return;
}
@ -140,7 +140,7 @@ void SYMBOL_EDIT_FRAME::ExportSymbol()
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error occurred attempting to load symbol library file \"%s\"" ),
msg.Printf( _( "Error occurred attempting to load symbol library file '%s'." ),
fn.GetFullPath() );
DisplayErrorMessage( this, msg, ioe.What() );
return;
@ -148,7 +148,7 @@ void SYMBOL_EDIT_FRAME::ExportSymbol()
if( old_symbol )
{
msg.Printf( _( "Symbol \"%s\" already exists in \"%s\"." ),
msg.Printf( _( "Symbol %s already exists in library '%s'." ),
symbol->GetName(),
fn.GetFullName() );
@ -163,7 +163,7 @@ void SYMBOL_EDIT_FRAME::ExportSymbol()
if( fn.Exists() && !fn.IsDirWritable() )
{
msg.Printf( _( "Write permissions are required to save library \"%s\"." ),
msg.Printf( _( "Write permissions are required to save library '%s'." ),
fn.GetFullPath() );
DisplayError( this, msg );
return;
@ -181,16 +181,16 @@ void SYMBOL_EDIT_FRAME::ExportSymbol()
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Failed to create symbol library file \"%s\"" ), fn.GetFullPath() );
msg.Printf( _( "Failed to create symbol library file '%s'." ), fn.GetFullPath() );
DisplayErrorMessage( this, msg, ioe.What() );
msg.Printf( _( "Error creating symbol library \"%s\"" ), fn.GetFullName() );
msg.Printf( _( "Error creating symbol library '%s'." ), fn.GetFullName() );
SetStatusText( msg );
return;
}
m_mruPath = fn.GetPath();
msg.Printf( _( "Symbol \"%s\" saved in library \"%s\"" ), symbol->GetName(), fn.GetFullPath() );
msg.Printf( _( "Symbol %s saved to library '%s'." ), symbol->GetName(), fn.GetFullPath() );
SetStatusText( msg );
// See if the user wants it added to a library table (global or project)

5
eeschema/symbol_library.cpp
View File

@ -557,8 +557,9 @@ void SYMBOL_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
catch( const IO_ERROR& ioe )
{
wxString msg;
msg.Printf( _( "Symbol library \"%s\" failed to load. Error:\n %s" ),
filename, ioe.What() );
msg.Printf( _( "Symbol library '%s' failed to load. Error:\n %s" ),
filename,
ioe.What() );
wxLogError( msg );
}

Some files were not shown because too many files have changed in this diff Show More