Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Consistent terminology and punctuation.

6.0.7
Jeff Young 4 years ago
parent
2a3d8e22b6
commit
1722bc03b0
44 changed files with 187 additions and 175 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      bitmap2component/bitmap2cmp_gui.cpp
  2. 6
      common/common.cpp
  3. 2
      common/dialogs/dialog_page_settings.cpp
  4. 2
      common/dialogs/wx_html_report_panel.cpp
  5. 6
      common/eda_base_frame.cpp
  6. 4
      common/eda_doc.cpp
  7. 6
      common/gestfich.cpp
  8. 4
      cvpcb/auto_associate.cpp
  9. 2
      cvpcb/dialogs/dialog_config_equfiles.cpp
  10. 2
      eeschema/dialogs/dialog_edit_symbols_libid.cpp
  11. 47
      eeschema/dialogs/dialog_plot_schematic.cpp
  12. 52
      eeschema/dialogs/dialog_symbol_remap.cpp
  13. 4
      eeschema/eeschema.cpp
  14. 2
      eeschema/eeschema_config.cpp
  15. 26
      eeschema/files-io.cpp
  16. 5
      eeschema/getpart.cpp
  17. 9
      eeschema/libarch.cpp
  18. 2
      eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
  19. 2
      eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
  20. 2
      eeschema/project_rescue.cpp
  21. 2
      eeschema/sch_edit_frame.cpp
  22. 13
      eeschema/sheet.cpp
  23. 19
      eeschema/symbol_editor/symbol_editor.cpp
  24. 18
      eeschema/symbol_editor/symbol_editor_import_export.cpp
  25. 5
      eeschema/symbol_library.cpp
  26. 2
      gerbview/export_to_pcbnew.cpp
  27. 8
      gerbview/files.cpp
  28. 2
      gerbview/gerbview.cpp
  29. 6
      gerbview/tools/gerbview_inspection_tool.cpp
  30. 2
      kicad/files-io.cpp
  31. 8
      kicad/tools/kicad_manager_control.cpp
  32. 2
      pcbnew/build_BOM_from_board.cpp
  33. 4
      pcbnew/dialogs/dialog_board_statistics.cpp
  34. 2
      pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
  35. 4
      pcbnew/dialogs/dialog_gendrill.cpp
  36. 2
      pcbnew/dialogs/dialog_netlist.cpp
  37. 8
      pcbnew/dialogs/dialog_plot.cpp
  38. 30
      pcbnew/exporters/gen_footprints_placefile.cpp
  39. 4
      pcbnew/exporters/gerber_jobfile_writer.cpp
  40. 10
      pcbnew/files.cpp
  41. 4
      pcbnew/netlist_reader/legacy_netlist_reader.cpp
  42. 10
      pcbnew/netlist_reader/netlist.cpp
  43. 2
      pcbnew/netlist_reader/netlist_reader.cpp
  44. 2
      pcbnew/pcbnew.cpp

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 );
}

2
gerbview/export_to_pcbnew.cpp
View File

@ -65,7 +65,7 @@ bool GBR_TO_PCB_EXPORTER::ExportPcb( const LAYER_NUM* aLayerLookUpTable, int aCo
if( m_fp == NULL )
{
wxString msg;
msg.Printf( _( "Cannot create file \"%s\"" ), m_pcb_file_name );
msg.Printf( _( "Cannot create file '%s'." ), m_pcb_file_name );
DisplayError( m_gerbview_frame, msg );
return false;
}

8
gerbview/files.cpp
View File

@ -463,7 +463,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
{
if( aReporter )
{
msg.Printf( _( "Zip file \"%s\" cannot be opened" ), aFullFileName );
msg.Printf( _( "Zip file '%s' cannot be opened." ), aFullFileName );
aReporter->Report( msg, RPT_SEVERITY_ERROR );
}
@ -505,7 +505,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
{
if( aReporter )
{
msg.Printf( _( "Info: skip file \"%s\" (unknown type)\n" ), entry->GetName() );
msg.Printf( _( "Skipped file '%s' (unknown type).\n" ), entry->GetName() );
aReporter->Report( msg, RPT_SEVERITY_WARNING );
}
@ -517,7 +517,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
//We cannot read a gerber job file as a gerber plot file: skip it
if( aReporter )
{
msg.Printf( _( "Info: skip file \"%s\" (gerber job file)\n" ), entry->GetName() );
msg.Printf( _( "Skipped file '%s' (gerber job file).\n" ), entry->GetName() );
aReporter->Report( msg, RPT_SEVERITY_WARNING );
}
@ -558,7 +558,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
if( aReporter )
{
msg.Printf( _( "<b>Unable to create temporary file \"%s\"</b>\n"),
msg.Printf( _( "<b>Unable to create temporary file '%s'.</b>\n"),
unzipped_tempfile );
aReporter->Report( msg, RPT_SEVERITY_ERROR );
}

2
gerbview/gerbview.cpp
View File

@ -228,7 +228,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;
}
}

6
gerbview/tools/gerbview_inspection_tool.cpp
View File

@ -172,7 +172,7 @@ int GERBVIEW_INSPECTION_TOOL::ShowSource( const TOOL_EVENT& aEvent )
if( !fn.FileExists() )
{
wxString msg;
msg.Printf( _( "Source file \"%s\" is not available" ), fn.GetFullPath() );
msg.Printf( _( "Source file '%s' not found." ), fn.GetFullPath() );
wxMessageBox( msg );
}
else
@ -182,13 +182,13 @@ int GERBVIEW_INSPECTION_TOOL::ShowSource( const TOOL_EVENT& aEvent )
}
else
{
wxMessageBox( _( "No editor defined. Please select one" ) );
wxMessageBox( _( "No editor defined. Please select one." ) );
}
}
else
{
wxString msg;
msg.Printf( _( "No file loaded on the active layer %d" ), layer + 1 );
msg.Printf( _( "No file loaded on the active layer %d." ), layer + 1 );
wxMessageBox( msg );
}

2
kicad/files-io.cpp
View File

@ -79,7 +79,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
return;
wxString unzipDir = dirDlg.GetPath() + wxT( "/" );
msg.Printf( _( "Unzipping project in \"%s\"\n" ), unzipDir );
msg.Printf( _( "Unzipping project in '%s'.\n" ), unzipDir );
PrintMsg( msg );
if( unzipDir == Prj().GetProjectPath() )

8
kicad/tools/kicad_manager_control.cpp
View File

@ -473,7 +473,7 @@ public:
if( !m_errors.empty() )
m_errors += "\n";
msg.Printf( _( "Cannot copy folder \"%s\"." ), destDir.GetFullPath() );
msg.Printf( _( "Cannot copy folder '%s'." ), destDir.GetFullPath() );
m_errors += msg;
}
@ -529,14 +529,14 @@ int KICAD_MANAGER_CONTROL::SaveProjectAs( const TOOL_EVENT& aEvent )
if( wxDirExists( newProjectDir.GetFullPath() ) )
{
msg.Printf( _( "\"%s\" already exists." ), newProjectDir.GetFullPath() );
msg.Printf( _( "'%s' already exists." ), newProjectDir.GetFullPath() );
DisplayErrorMessage( m_frame, msg );
return -1;
}
if( !wxMkdir( newProjectDir.GetFullPath() ) )
{
msg.Printf( _( "Directory \"%s\" could not be created.\n\n"
msg.Printf( _( "Directory '%s' could not be created.\n\n"
"Please make sure you have write permissions and try again." ),
newProjectDir.GetPath() );
DisplayErrorMessage( m_frame, msg );
@ -545,7 +545,7 @@ int KICAD_MANAGER_CONTROL::SaveProjectAs( const TOOL_EVENT& aEvent )
if( !newProjectDir.IsDirWritable() )
{
msg.Printf( _( "Cannot write to folder \"%s\"." ), newProjectDir.GetFullPath() );
msg.Printf( _( "Cannot write to folder '%s'." ), newProjectDir.GetFullPath() );
wxMessageDialog msgDlg( m_frame, msg, _( "Error!" ), wxICON_ERROR | wxOK | wxCENTER );
msgDlg.SetExtendedMessage( _( "Please check your access permissions to this folder "
"and try again." ) );

2
pcbnew/build_BOM_from_board.cpp
View File

@ -99,7 +99,7 @@ void PCB_EDIT_FRAME::RecreateBOMFileFromBoard( wxCommandEvent& aEvent )
if( fp_bom == NULL )
{
msg.Printf( _( "Unable to create file \"%s\"" ), fn.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'." ), fn.GetFullPath() );
DisplayError( this, msg );
return;
}

4
pcbnew/dialogs/dialog_board_statistics.cpp
View File

@ -642,7 +642,7 @@ void DIALOG_BOARD_STATISTICS::saveReportClicked( wxCommandEvent& aEvent )
if( outFile == NULL )
{
msg.Printf( _( "Unable to create file \"%s\"" ), saveFileDialog.GetPath() );
msg.Printf( _( "Unable to create file '%s'." ), saveFileDialog.GetPath() );
DisplayErrorMessage( this, msg );
return;
}
@ -725,7 +725,7 @@ void DIALOG_BOARD_STATISTICS::saveReportClicked( wxCommandEvent& aEvent )
if( fprintf( outFile, "%s", TO_UTF8( msg ) ) < 0 )
{
msg.Printf( _( "Error writing to file \"%s\"" ), saveFileDialog.GetPath() );
msg.Printf( _( "Error writing file '%s'." ), saveFileDialog.GetPath() );
DisplayErrorMessage( this, msg );
}

2
pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
View File

@ -534,7 +534,7 @@ bool DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR::checkFootprintName( const wxString&
}
else if( !FOOTPRINT::IsLibNameValid( aFootprintName ) )
{
m_delayedErrorMessage.Printf( _( "Footprint name may not contain \"%s\"." ),
m_delayedErrorMessage.Printf( _( "Footprint name may not contain '%s'." ),
FOOTPRINT::StringLibNameInvalidChars( true ) );
return false;
}

4
pcbnew/dialogs/dialog_gendrill.cpp
View File

@ -302,7 +302,7 @@ void DIALOG_GENDRILL::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
wxFileName fn( Prj().AbsolutePath( m_board->GetFileName() ) );
wxString defaultPath = fn.GetPathWithSep();
wxString msg;
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 );
@ -384,7 +384,7 @@ void DIALOG_GENDRILL::GenDrillAndMapFiles( bool aGenDrill, bool aGenMap )
if( !EnsureFileDirectoryExists( &outputDir, boardFilename, &reporter ) )
{
wxString msg;
msg.Printf( _( "Could not write drill and/or map files to folder \"%s\"." ),
msg.Printf( _( "Could not write drill and/or map files to folder '%s'." ),
outputDir.GetPath() );
DisplayError( this, msg );
return;

2
pcbnew/dialogs/dialog_netlist.cpp
View File

@ -223,7 +223,7 @@ void DIALOG_NETLIST::loadNetlist( bool aDryRun )
wxBusyCursor busy;
wxString msg;
msg.Printf( _( "Reading netlist file \"%s\".\n" ), netlistFileName );
msg.Printf( _( "Reading netlist file '%s'.\n" ), netlistFileName );
reporter.ReportHead( msg, RPT_SEVERITY_INFO );
if( m_matchByTimestamp->GetSelection() == 1 )

8
pcbnew/dialogs/dialog_plot.cpp
View File

@ -395,7 +395,7 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
// 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 );
@ -807,7 +807,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
if( !EnsureFileDirectoryExists( &outputDir, boardFilename, &reporter ) )
{
wxString msg;
msg.Printf( _( "Could not write plot files to folder \"%s\"." ), outputDir.GetPath() );
msg.Printf( _( "Could not write plot files to folder '%s'." ), outputDir.GetPath() );
DisplayError( this, msg );
return;
}
@ -899,12 +899,12 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
delete plotter->RenderSettings();
delete plotter;
msg.Printf( _( "Plot file \"%s\" created." ), fn.GetFullPath() );
msg.Printf( _( "Plotted to '%s'." ), fn.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ACTION );
}
else
{
msg.Printf( _( "Unable to create file \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'." ), fn.GetFullPath() );
reporter.Report( msg, RPT_SEVERITY_ERROR );
}

30
pcbnew/exporters/gen_footprints_placefile.cpp
View File

@ -250,7 +250,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
if( !EnsureFileDirectoryExists( &outputDir, boardFilename, m_reporter ) )
{
msg.Printf( _( "Could not write plot files to folder \"%s\"." ),
msg.Printf( _( "Could not write plot files to folder '%s'." ),
outputDir.GetPath() );
DisplayError( this, msg );
return false;
@ -268,13 +268,13 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
if( fpcount < 0 )
{
msg.Printf( _( "Unable to create \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Unable to create '%s'." ), fn.GetFullPath() );
wxMessageBox( msg );
m_reporter->Report( msg, RPT_SEVERITY_ERROR );
return false;
}
msg.Printf( _( "Front (top side) placement file: \"%s\"." ), filename );
msg.Printf( _( "Front (top side) placement file: '%s'." ), filename );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount );
@ -289,14 +289,14 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
if( fpcount < 0 )
{
msg.Printf( _( "Unable to create file \"%s\"." ), filename );
msg.Printf( _( "Unable to create file '%s'." ), filename );
m_reporter->Report( msg, RPT_SEVERITY_ERROR );
wxMessageBox( msg );
return false;
}
// Display results
msg.Printf( _( "Back (bottom side) placement file: \"%s\"." ), filename );
msg.Printf( _( "Back (bottom side) placement file: '%s'." ), filename );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount );
@ -304,7 +304,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateGerberFiles()
m_reporter->Report( msg, RPT_SEVERITY_INFO );
fullcount += fpcount;
msg.Printf( _( "Full component count: %d\n" ), fullcount );
msg.Printf( _( "Full component count: %d.\n" ), fullcount );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
m_reporter->Report( _( "File generation successful." ), RPT_SEVERITY_ACTION );
@ -348,7 +348,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
if( !EnsureFileDirectoryExists( &outputDir, boardFilename, m_reporter ) )
{
msg.Printf( _( "Could not write plot files to folder \"%s\"." ), outputDir.GetPath() );
msg.Printf( _( "Could not write plot files to folder '%s'." ), outputDir.GetPath() );
DisplayError( this, msg );
return false;
}
@ -382,16 +382,16 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
useCSVfmt );
if( fpcount < 0 )
{
msg.Printf( _( "Unable to create \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Unable to create '%s'." ), fn.GetFullPath() );
wxMessageBox( msg );
m_reporter->Report( msg, RPT_SEVERITY_ERROR );
return false;
}
if( singleFile )
msg.Printf( _( "Placement file: \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Placement file: '%s'." ), fn.GetFullPath() );
else
msg.Printf( _( "Front (top side) placement file: \"%s\"." ),
msg.Printf( _( "Front (top side) placement file: '%s'." ),
fn.GetFullPath() );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
@ -425,7 +425,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
if( fpcount < 0 )
{
msg.Printf( _( "Unable to create file \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Unable to create file '%s'." ), fn.GetFullPath() );
m_reporter->Report( msg, RPT_SEVERITY_ERROR );
wxMessageBox( msg );
return false;
@ -434,7 +434,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
// Display results
if( !singleFile )
{
msg.Printf( _( "Back (bottom side) placement file: \"%s\"." ), fn.GetFullPath() );
msg.Printf( _( "Back (bottom side) placement file: '%s'." ), fn.GetFullPath() );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
msg.Printf( _( "Component count: %d." ), fpcount );
@ -445,7 +445,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::CreateAsciiFiles()
if( !singleFile )
{
fullcount += fpcount;
msg.Printf( _( "Full component count: %d\n" ), fullcount );
msg.Printf( _( "Full component count: %d.\n" ), fullcount );
m_reporter->Report( msg, RPT_SEVERITY_INFO );
}
@ -520,13 +520,13 @@ void PCB_EDIT_FRAME::GenFootprintsReport( wxCommandEvent& event )
wxString msg;
if( success )
{
msg.Printf( _( "Footprint report file created:\n\"%s\"" ), fn.GetFullPath() );
msg.Printf( _( "Footprint report file created:\n'%s'." ), fn.GetFullPath() );
wxMessageBox( msg, _( "Footprint Report" ), wxICON_INFORMATION );
}
else
{
msg.Printf( _( "Unable to create \"%s\"" ), fn.GetFullPath() );
msg.Printf( _( "Unable to create '%s'." ), fn.GetFullPath() );
DisplayError( this, msg );
}
}

4
pcbnew/exporters/gerber_jobfile_writer.cpp
View File

@ -149,13 +149,13 @@ bool GERBER_JOBFILE_WRITER::CreateJobFile( const wxString& aFullFilename )
{
if( m_reporter )
{
msg.Printf( _( "Unable to create job file \"%s\"" ), aFullFilename );
msg.Printf( _( "Unable to create job file '%s'." ), aFullFilename );
m_reporter->Report( msg, RPT_SEVERITY_ERROR );
}
}
else if( m_reporter )
{
msg.Printf( _( "Create Gerber job file \"%s\"" ), aFullFilename );
msg.Printf( _( "Create Gerber job file '%s'." ), aFullFilename );
m_reporter->Report( msg, RPT_SEVERITY_ACTION );
}

10
pcbnew/files.cpp
View File

@ -344,12 +344,12 @@ bool PCB_EDIT_FRAME::Files_io_from_id( int id )
if( !fn.FileExists() )
{
msg.Printf( _( "Recovery file \"%s\" not found." ), fn.GetFullPath() );
msg.Printf( _( "Recovery file '%s' not found." ), fn.GetFullPath() );
DisplayInfoMessage( this, msg );
return false;
}
msg.Printf( _( "OK to load recovery file \"%s\"" ), fn.GetFullPath() );
msg.Printf( _( "OK to load recovery file '%s'?" ), fn.GetFullPath() );
if( !IsOK( this, msg ) )
return false;
@ -1024,12 +1024,12 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool addToHistory,
// If save succeeded, replace the original with what we just wrote
if( !wxRenameFile( tempFile.GetFullPath(), pcbFileName.GetFullPath() ) )
{
DisplayError( this, wxString::Format( _( "Error saving board file \"%s\".\n"
"Failed to rename temporary file \"%s\"" ),
DisplayError( this, wxString::Format( _( "Error saving board file '%s'.\n"
"Failed to rename temporary file '%s." ),
pcbFileName.GetFullPath(),
tempFile.GetFullPath() ) );
lowerTxt.Printf( _( "Failed to rename temporary file \"%s\"" ),
lowerTxt.Printf( _( "Failed to rename temporary file '%s'." ),
tempFile.GetFullPath() );
SetMsgPanel( upperTxt, lowerTxt );

4
pcbnew/netlist_reader/legacy_netlist_reader.cpp
View File

@ -243,8 +243,8 @@ void LEGACY_NETLIST_READER::loadFootprintFilters()
if( component == NULL )
{
wxString msg;
msg.Printf( _( "Cannot find symbol \"%s\" in footprint filter section "
"of netlist." ), cmpRef );
msg.Printf( _( "Cannot find symbol %s in footprint filter section of netlist." ),
cmpRef );
THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), line, m_lineReader->LineNumber(),
m_lineReader->Length() );
}

10
pcbnew/netlist_reader/netlist.cpp
View File

@ -64,7 +64,7 @@ bool PCB_EDIT_FRAME::ReadNetlistFromFile( const wxString &aFilename, NETLIST& aN
if( !netlistReader.get() )
{
msg.Printf( _( "Cannot open netlist file \"%s\"." ), aFilename );
msg.Printf( _( "Cannot open netlist file '%s'." ), aFilename );
wxMessageBox( msg, _( "Netlist Load Error." ), wxOK | wxICON_ERROR, this );
return false;
}
@ -152,7 +152,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER& aReporter )
// The FPID is ok as long as there is a footprint portion coming from eeschema.
if( !component->GetFPID().GetLibItemName().size() )
{
msg.Printf( _( "No footprint defined for symbol \"%s\".\n" ),
msg.Printf( _( "No footprint defined for symbol %s.\n" ),
component->GetReference() );
aReporter.Report( msg, RPT_SEVERITY_ERROR );
@ -179,7 +179,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER& aReporter )
if( footprintMisMatch && !aNetlist.GetReplaceFootprints() )
{
msg.Printf( _( "Footprint of %s changed: board footprint \"%s\", netlist footprint \"%s\"." ),
msg.Printf( _( "Footprint of %s changed: board footprint '%s', netlist footprint '%s'." ),
component->GetReference(),
fpOnBoard->GetFPID().Format().wx_str(),
component->GetFPID().Format().wx_str() );
@ -202,7 +202,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER& aReporter )
// it's needed. Nickname can be blank.
if( !component->GetFPID().GetLibItemName().size() )
{
msg.Printf( _( "%s footprint ID \"%s\" is not valid." ),
msg.Printf( _( "%s footprint ID '%s' is not valid." ),
component->GetReference(),
component->GetFPID().Format().wx_str() );
aReporter.Report( msg, RPT_SEVERITY_ERROR );
@ -219,7 +219,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER& aReporter )
}
else
{
msg.Printf( _( "%s footprint \"%s\" not found in any libraries in the footprint "
msg.Printf( _( "%s footprint '%s' not found in any libraries in the footprint "
"library table.\n" ),
component->GetReference(),
component->GetFPID().GetLibItemName().wx_str() );

2
pcbnew/netlist_reader/netlist_reader.cpp
View File

@ -178,7 +178,7 @@ bool CMP_READER::Load( NETLIST* aNetlist )
if( !footprint.IsEmpty() && fpid.Parse( footprint, true ) >= 0 )
{
wxString error;
error.Printf( _( "Invalid footprint ID in\nfile: \"%s\"\nline: %d" ),
error.Printf( _( "Invalid footprint ID in\nfile: '%s'\nline: %d" ),
m_lineReader->GetSource(), m_lineReader->LineNumber() );
THROW_IO_ERROR( error );

2
pcbnew/pcbnew.cpp
View File

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

Write Preview
Loading…
Cancel
Save