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

Fix quotes in UI messages 

This replaces all single and angle bracket quotes in UI messages with
double quotes, for consistency.

Sorry to all translators.
pull/5/merge
Simon Richter 8 years ago
committed by Wayne Stambaugh
parent
9ed0f2184b
commit
a9ccf1161b
120 changed files with 406 additions and 406 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. 16
      common/basicframe.cpp
  3. 6
      common/common.cpp
  4. 2
      common/dialogs/dialog_env_var_config.cpp
  5. 6
      common/dialogs/dialog_page_settings.cpp
  6. 2
      common/dialogs/wx_html_report_panel.cpp
  7. 10
      common/dsnlexer.cpp
  8. 4
      common/eda_doc.cpp
  9. 2
      common/exceptions.cpp
  10. 2
      common/footprint_info.cpp
  11. 6
      common/fp_lib_table.cpp
  12. 6
      common/gestfich.cpp
  13. 6
      common/kiway.cpp
  14. 4
      common/project.cpp
  15. 6
      common/richio.cpp
  16. 2
      common/tool/tool_manager.cpp
  17. 2
      common/widgets/widget_hotkey_list.cpp
  18. 4
      cvpcb/autosel.cpp
  19. 2
      cvpcb/cfg.cpp
  20. 6
      cvpcb/class_DisplayFootprintsFrame.cpp
  21. 4
      cvpcb/cvpcb_mainframe.cpp
  22. 4
      cvpcb/dialogs/dialog_config_equfiles.cpp
  23. 6
      cvpcb/readwrite_dlgs.cpp
  24. 2
      eeschema/backanno.cpp
  25. 2
      eeschema/block.cpp
  26. 10
      eeschema/class_library.cpp
  27. 2
      eeschema/cmp_tree_model_adapter_base.cpp
  28. 2
      eeschema/dialogs/dialog_bom.cpp
  29. 10
      eeschema/dialogs/dialog_edit_component_in_lib.cpp
  30. 12
      eeschema/dialogs/dialog_edit_component_in_schematic.cpp
  31. 2
      eeschema/dialogs/dialog_edit_components_libid.cpp
  32. 8
      eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
  33. 4
      eeschema/dialogs/dialog_plot_schematic.cpp
  34. 4
      eeschema/dialogs/dialog_sym_lib_table.cpp
  35. 26
      eeschema/dialogs/dialog_symbol_remap.cpp
  36. 4
      eeschema/edit_bitmap.cpp
  37. 8
      eeschema/erc.cpp
  38. 30
      eeschema/files-io.cpp
  39. 2
      eeschema/getpart.cpp
  40. 16
      eeschema/lib_export.cpp
  41. 2
      eeschema/libarch.cpp
  42. 16
      eeschema/libedit.cpp
  43. 2
      eeschema/libedit_plot_component.cpp
  44. 6
      eeschema/libeditframe.cpp
  45. 6
      eeschema/libfield.cpp
  46. 2
      eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
  47. 2
      eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
  48. 4
      eeschema/plot_schematic_DXF.cpp
  49. 4
      eeschema/plot_schematic_HPGL.cpp
  50. 4
      eeschema/plot_schematic_PDF.cpp
  51. 4
      eeschema/plot_schematic_PS.cpp
  52. 4
      eeschema/plot_schematic_SVG.cpp
  53. 2
      eeschema/project_rescue.cpp
  54. 2
      eeschema/sch_base_frame.cpp
  55. 4
      eeschema/sch_eagle_plugin.cpp
  56. 4
      eeschema/sch_io_mgr.cpp
  57. 12
      eeschema/sch_legacy_plugin.cpp
  58. 2
      eeschema/sch_plugin.cpp
  59. 6
      eeschema/schframe.cpp
  60. 4
      eeschema/selpart.cpp
  61. 20
      eeschema/sheet.cpp
  62. 2
      eeschema/sim/spice_value.cpp
  63. 10
      eeschema/symbedit.cpp
  64. 6
      eeschema/symbol_lib_table.cpp
  65. 2
      gerbview/events_called_functions.cpp
  66. 2
      gerbview/export_to_pcbnew.cpp
  67. 6
      gerbview/files.cpp
  68. 2
      gerbview/gerbview_frame.cpp
  69. 6
      gerbview/onrightclick.cpp
  70. 2
      gerbview/readgerb.cpp
  71. 6
      gerbview/tools/selection_tool.cpp
  72. 2
      kicad/class_treeproject_item.cpp
  73. 14
      kicad/files-io.cpp
  74. 4
      kicad/prjconfig.cpp
  75. 4
      kicad/project_template.cpp
  76. 2
      kicad/tree_project_frame.cpp
  77. 2
      new/sch_lib.cpp
  78. 14
      pagelayout_editor/files.cpp
  79. 2
      pagelayout_editor/pl_editor.cpp
  80. 10
      pagelayout_editor/pl_editor_frame.cpp
  81. 2
      pcb_calculator/pcb_calculator_frame.cpp
  82. 2
      pcb_calculator/regulators_funct.cpp
  83. 2
      pcbnew/board_netlist_updater.cpp
  84. 2
      pcbnew/build_BOM_from_board.cpp
  85. 6
      pcbnew/class_board.cpp
  86. 2
      pcbnew/cross-probing.cpp
  87. 6
      pcbnew/dialogs/dialog_SVG_print.cpp
  88. 4
      pcbnew/dialogs/dialog_drc.cpp
  89. 2
      pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
  90. 12
      pcbnew/dialogs/dialog_exchange_modules.cpp
  91. 2
      pcbnew/dialogs/dialog_export_vrml.cpp
  92. 4
      pcbnew/dialogs/dialog_find.cpp
  93. 4
      pcbnew/dialogs/dialog_fp_lib_table.cpp
  94. 2
      pcbnew/dialogs/dialog_fp_plugin_options.cpp
  95. 2
      pcbnew/dialogs/dialog_gendrill.cpp
  96. 6
      pcbnew/dialogs/dialog_plot.cpp
  97. 2
      pcbnew/dialogs/wizard_add_fplib.cpp
  98. 20
      pcbnew/drc.cpp
  99. 10
      pcbnew/eagle_plugin.cpp
  100. 2
      pcbnew/exporters/export_gencad.cpp

8
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -500,7 +500,7 @@ void BM2CMP_FRAME::OnExportLogo()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -538,7 +538,7 @@ void BM2CMP_FRAME::OnExportPostScript()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -575,7 +575,7 @@ void BM2CMP_FRAME::OnExportEeschema()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -612,7 +612,7 @@ void BM2CMP_FRAME::OnExportPcbnew()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}

16
common/basicframe.cpp
View File

@ -439,7 +439,7 @@ wxString EDA_BASE_FRAME::GetFileFromHistory( int cmdId, const wxString& type,
else
{
wxString msg = wxString::Format(
wxT( "file '%s' was not found." ),
_( "File \"%s\" was not found." ),
GetChars( fn ) );
wxMessageBox( msg );
@ -484,7 +484,7 @@ void EDA_BASE_FRAME::GetKicadHelp( wxCommandEvent& event )
if( !helpFile )
{
wxString msg = wxString::Format( _(
"Html or pdf help file \n'%s'\n or\n'%s' could not be found." ), names[0], names[1] );
"Html or pdf help file \n\"%s\"\n or\n\"%s\" could not be found." ), names[0], names[1] );
wxMessageBox( msg );
}
else
@ -501,7 +501,7 @@ void EDA_BASE_FRAME::GetKicadHelp( wxCommandEvent& event )
if( !helpFile )
{
wxString msg = wxString::Format( _(
"Help file '%s' could not be found." ),
"Help file \"%s\" could not be found." ),
GetChars( base_name )
);
wxMessageBox( msg );
@ -570,17 +570,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\"." ),
GetChars( 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\"." ),
GetChars( fn.GetFullName() ), GetChars( 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\"." ),
GetChars( fn.GetFullPath() ) );
}
@ -614,7 +614,7 @@ void EDA_BASE_FRAME::CheckForAutoSaveFile( const wxFileName& aFileName,
wxString msg = wxString::Format( _(
"Well this is potentially embarrassing!\n"
"It appears that the last time you were editing the file\n"
"'%s'\n"
"\"%s\"\n"
"it was not saved properly. Do you wish to restore the last saved edits you made?" ),
GetChars( aFileName.GetFullName() )
);
@ -640,7 +640,7 @@ void EDA_BASE_FRAME::CheckForAutoSaveFile( const wxFileName& aFileName,
// Rename the old file to the backup file name.
if( !wxRenameFile( aFileName.GetFullPath(), backupFileName.GetFullPath() ) )
{
msg.Printf( _( "Could not create backup file <%s>" ),
msg.Printf( _( "Could not create backup file \"%s\"" ),
GetChars( backupFileName.GetFullPath() ) );
wxMessageBox( msg );
}

6
common/common.cpp
View File

@ -277,7 +277,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\"." ),
GetChars( aTargetFullFileName->GetPath() ),
GetChars( baseFilePath ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
@ -295,7 +295,7 @@ bool EnsureFileDirectoryExists( wxFileName* aTargetFullFileName,
{
if( aReporter )
{
msg.Printf( _( "Output directory '%s' created.\n" ), GetChars( outputPath ) );
msg.Printf( _( "Output directory \"%s\" created.\n" ), GetChars( outputPath ) );
aReporter->Report( msg, REPORTER::RPT_INFO );
return true;
}
@ -304,7 +304,7 @@ bool EnsureFileDirectoryExists( wxFileName* aTargetFullFileName,
{
if( aReporter )
{
msg.Printf( _( "Cannot create output directory '%s'.\n" ),
msg.Printf( _( "Cannot create output directory \"%s\".\n" ),
GetChars( outputPath ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}

2
common/dialogs/dialog_env_var_config.cpp
View File

@ -248,7 +248,7 @@ void DIALOG_ENV_VAR_CONFIG::EditSelectedEntry()
if( IsEnvVarImmutable( envName ) )
{
DisplayErrorMessage( this,
wxString::Format( _( "Environment variable '%s' cannot be renamed" ),
wxString::Format( _( "Environment variable \"%s\" cannot be renamed" ),
envName.ToStdString() ),
_( "The selected environment variable name "
"is required for KiCad functionality and "

6
common/dialogs/dialog_page_settings.cpp
View File

@ -433,7 +433,7 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
if( !wxFileExists( fullFileName ) )
{
wxString msg;
msg.Printf( _("Page layout description file <%s> not found. Abort"),
msg.Printf( _("Page layout description file \"%s\" not found. Abort"),
GetChars( fullFileName ) );
wxMessageBox( msg );
return false;
@ -823,9 +823,9 @@ void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
wxString msg = wxString::Format( _(
"The page layout descr filename has changed.\n"
"Do you want to use the relative path:\n"
"'%s'\n"
"\"%s\"\n"
"instead of\n"
"'%s'" ), GetChars( shortFileName ), GetChars( fileName ) );
"\"%s\"" ), GetChars( shortFileName ), GetChars( fileName ) );
if( !IsOK( this, msg ) )
shortFileName = fileName;

2
common/dialogs/wx_html_report_panel.cpp
View File

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

10
common/dsnlexer.cpp
View File

@ -353,7 +353,7 @@ bool DSNLEXER::IsSymbol( int aTok )
void DSNLEXER::Expecting( int aTok )
{
wxString errText = wxString::Format(
_("Expecting '%s'"), GetChars( GetTokenString( aTok ) ) );
_( "Expecting \"%s\"" ), GetChars( GetTokenString( aTok ) ) );
THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
@ -361,7 +361,7 @@ void DSNLEXER::Expecting( int aTok )
void DSNLEXER::Expecting( const char* text )
{
wxString errText = wxString::Format(
_("Expecting '%s'"), GetChars( wxString::FromUTF8( text ) ) );
_( "Expecting \"%s\"" ), GetChars( wxString::FromUTF8( text ) ) );
THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
@ -369,7 +369,7 @@ void DSNLEXER::Expecting( const char* text )
void DSNLEXER::Unexpected( int aTok )
{
wxString errText = wxString::Format(
_("Unexpected '%s'"), GetChars( GetTokenString( aTok ) ) );
_( "Unexpected \"%s\"" ), GetChars( GetTokenString( aTok ) ) );
THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
@ -385,7 +385,7 @@ void DSNLEXER::Duplicate( int aTok )
void DSNLEXER::Unexpected( const char* text )
{
wxString errText = wxString::Format(
_("Unexpected '%s'"), GetChars( wxString::FromUTF8( text ) ) );
_( "Unexpected \"%s\"" ), GetChars( wxString::FromUTF8( text ) ) );
THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
@ -430,7 +430,7 @@ int DSNLEXER::NeedNUMBER( const char* aExpectation )
if( tok != DSN_NUMBER )
{
wxString errText = wxString::Format(
_("need a NUMBER for '%s'"), wxString::FromUTF8( aExpectation ).GetData() );
_( "need a NUMBER for \"%s\"" ), wxString::FromUTF8( aExpectation ).GetData() );
THROW_PARSE_ERROR( errText, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
return tok;

4
common/eda_doc.cpp
View File

@ -157,7 +157,7 @@ bool GetAssociatedDocument( wxWindow* aParent,
if( !wxFileExists( fullfilename ) )
{
msg.Printf( _( "Doc File '%s' not found" ), GetChars( aDocName ) );
msg.Printf( _( "Doc File \"%s\" not found" ), GetChars( aDocName ) );
DisplayError( aParent, msg );
return false;
}
@ -200,7 +200,7 @@ bool GetAssociatedDocument( wxWindow* aParent,
if( !success )
{
msg.Printf( _( "Unknown MIME type for doc file <%s>" ), GetChars( fullfilename ) );
msg.Printf( _( "Unknown MIME type for doc file \"%s\"" ), GetChars( fullfilename ) );
DisplayError( aParent, msg );
}

2
common/exceptions.cpp
View File

@ -27,7 +27,7 @@
#define THROWERS_WHERE _( "from %s : %s() line:%d" )
#define PARSE_PROBLEM _( "%s in input/source\n'%s'\nline %d, offset %d" )
#define PARSE_PROBLEM _( "%s in input/source\n\"%s\"\nline %d, offset %d" )
const wxString IO_ERROR::What() const

2
common/footprint_info.cpp
View File

@ -61,7 +61,7 @@ FOOTPRINT_INFO* FOOTPRINT_LIST::GetModuleInfo( const wxString& aFootprintName )
wxCHECK_MSG( fpid.Parse( aFootprintName ) < 0, NULL,
wxString::Format(
wxT( "'%s' is not a valid LIB_ID." ), GetChars( aFootprintName ) ) );
wxT( "\"%s\" is not a valid LIB_ID." ), GetChars( aFootprintName ) ) );
wxString libNickname = fpid.GetLibNickname();
wxString footprintName = fpid.GetLibItemName();

6
common/fp_lib_table.cpp
View File

@ -192,7 +192,7 @@ void FP_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
delete tmp; // The table did not take ownership of the row.
wxString msg = wxString::Format(
_( "Duplicate library nickname '%s' found in footprint library "
_( "Duplicate library nickname \"%s\" found in footprint library "
"table file line %d" ), GetChars( nickname ), lineNum );
if( !errMsg.IsEmpty() )
@ -259,7 +259,7 @@ const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname )
if( !row )
{
wxString msg = wxString::Format(
_( "fp-lib-table files contain no library with nickname '%s'" ),
_( "fp-lib-table files contain no library with nickname \"%s\"" ),
GetChars( aNickname ) );
THROW_IO_ERROR( msg );
@ -413,7 +413,7 @@ bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable )
if( !fn.DirExists() && !fn.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
{
THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path '%s'." ),
THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path \"%s\"." ),
GetChars( fn.GetPath() ) ) );
}

6
common/gestfich.cpp
View File

@ -230,7 +230,7 @@ int ExecuteFile( wxWindow* frame, const wxString& ExecFile, const wxString& para
#endif
wxString msg;
msg.Printf( _( "Command <%s> could not found" ), GetChars( fullFileName ) );
msg.Printf( _( "Command \"%s\" could not found" ), GetChars( fullFileName ) );
DisplayError( frame, msg, 20 );
return -1;
}
@ -374,14 +374,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 );
}

6
common/kiway.cpp
View File

@ -183,7 +183,7 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
// here and catching it in the KiCad launcher resolves the crash issue. See bug
// report https://bugs.launchpad.net/kicad/+bug/1577786.
msg.Printf( _( "Failed to load kiface library '%s'." ), GetChars( dname ) );
msg.Printf( _( "Failed to load kiface library \"%s\"." ), GetChars( dname ) );
THROW_IO_ERROR( msg );
}
else if( ( addr = dso.GetSymbol( wxT( KIFACE_INSTANCE_NAME_AND_VERSION ) ) ) == NULL )
@ -192,7 +192,7 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
// No further reporting required here. Assume the same thing applies here as
// above with the Load() call. This has not been tested.
msg.Printf(
_( "Could not read instance name and version symbol form kiface library '%s'." ),
_( "Could not read instance name and version symbol form kiface library \"%s\"." ),
GetChars( dname ) );
THROW_IO_ERROR( msg );
}
@ -227,7 +227,7 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
msg = wxString::Format( _(
"Fatal Installation Bug. File:\n"
"'%s'\ncould not be loaded\n" ), GetChars( dname ) );
"\"%s\"\ncould not be loaded\n" ), GetChars( dname ) );
if( ! wxFileExists( dname ) )
msg << _( "It is missing.\n" );

4
common/project.cpp
View File

@ -256,7 +256,7 @@ static bool copy_pro_file_template( const SEARCH_STACK& aSearchS, const wxString
if( !templ.IsFileReadable() )
{
wxString msg = wxString::Format( _(
"Unable to find '%s' template config file." ),
"Unable to find \"%s\" template config file." ),
GetChars( templateFile ) );
DisplayErrorMessage( nullptr, _( "Error copying project file template" ), msg );
@ -279,7 +279,7 @@ static bool copy_pro_file_template( const SEARCH_STACK& aSearchS, const wxString
success = wxCopyFile( kicad_pro_template, aDestination );
else
{
wxLogMessage( _( "Cannot create prj file '%s' (Directory not writable)" ),
wxLogMessage( _( "Cannot create prj file \"%s\" (Directory not writable)" ),
GetChars( aDestination) );
success = false;
}

6
common/richio.cpp
View File

@ -164,7 +164,7 @@ FILE_LINE_READER::FILE_LINE_READER( const wxString& aFileName,
if( !m_fp )
{
wxString msg = wxString::Format(
_( "Unable to open filename '%s' for reading" ), aFileName.GetData() );
_( "Unable to open filename \"%s\" for reading" ), aFileName.GetData() );
THROW_IO_ERROR( msg );
}
@ -524,7 +524,7 @@ FILE_OUTPUTFORMATTER::FILE_OUTPUTFORMATTER( const wxString& aFileName,
if( !m_fp )
{
wxString msg = wxString::Format(
_( "cannot open or save file '%s'" ),
_( "cannot open or save file \"%s\"" ),
m_filename.GetData() );
THROW_IO_ERROR( msg );
}
@ -543,7 +543,7 @@ void FILE_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount )
if( 1 != fwrite( aOutBuf, aCount, 1, m_fp ) )
{
wxString msg = wxString::Format(
_( "error writing to file '%s'" ),
_( "error writing to file \"%s\"" ),
m_filename.GetData() );
THROW_IO_ERROR( msg );
}

2
common/tool/tool_manager.cpp
View File

@ -434,7 +434,7 @@ void TOOL_MANAGER::InitTools()
if( !tool->Init() )
{
wxMessageBox(
wxString::Format( "Initialization of tool '%s' failed", tool->GetName() ) );
wxString::Format( "Initialization of tool \"%s\" failed", tool->GetName() ) );
// Unregister the tool
m_toolState.erase( tool );

2
common/widgets/widget_hotkey_list.cpp
View File

@ -481,7 +481,7 @@ bool WIDGET_HOTKEY_LIST::ResolveKeyConflicts( long aKey, const wxString& aSectio
{
wxString info = wxGetTranslation( conflicting_key->m_InfoMsg );
wxString msg = wxString::Format(
_( "<%s> is already assigned to \"%s\" in section \"%s\". Are you sure you want "
_( "\"%s\" is already assigned to \"%s\" in section \"%s\". Are you sure you want "
"to change its assignment?" ),
KeyNameFromKeyCode( aKey ), GetChars( info ),
*(conflicting_section->m_Title) );

4
cvpcb/autosel.cpp
View File

@ -104,7 +104,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList, wx
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." ),
GetChars( fn.GetFullName() ) );
@ -125,7 +125,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList, wx
if( aErrorMessages )
{
error_msg.Printf( _( "Error opening equivalence file '%s'." ), GetChars( tmp ) );
error_msg.Printf( _( "Error opening equivalence file \"%s\"." ), GetChars( tmp ) );
if( ! aErrorMessages->IsEmpty() )
*aErrorMessages << wxT("\n\n");

2
cvpcb/cfg.cpp
View File

@ -74,7 +74,7 @@ void CVPCB_MAINFRAME::SaveProjectFile()
if( !IsWritable( fn ) )
{
wxMessageBox( _( "Project file '%s' is not writable" ), fn.GetFullPath() );
wxMessageBox( _( "Project file \"%s\" is not writable" ), fn.GetFullPath() );
return;
}

6
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -450,7 +450,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
if( fpid.Parse( aFootprintName ) >= 0 )
{
DisplayInfoMessage( this, wxString::Format( wxT( "Footprint ID <%s> is not valid." ),
DisplayInfoMessage( this, wxString::Format( wxT( "Footprint ID \"%s\" is not valid." ),
GetChars( aFootprintName ) ) );
return NULL;
}
@ -458,7 +458,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
std::string nickname = fpid.GetLibNickname();
std::string fpname = fpid.GetLibItemName();
wxLogDebug( wxT( "Load footprint <%s> from library <%s>." ),
wxLogDebug( wxT( "Load footprint \"%s\" from library \"%s\"." ),
fpname.c_str(), nickname.c_str() );
footprint = Prj().PcbFootprintLibs( Kiway() )->FootprintLoad(
@ -477,7 +477,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
return footprint;
}
wxString msg = wxString::Format( _( "Footprint '%s' not found" ), aFootprintName.GetData() );
wxString msg = wxString::Format( _( "Footprint \"%s\" not found" ), aFootprintName.GetData() );
DisplayError( this, msg );
return NULL;
}

4
cvpcb/cvpcb_mainframe.cpp
View File

@ -424,7 +424,7 @@ void CVPCB_MAINFRAME::OnEditFootprintLibraryTable( wxCommandEvent& aEvent )
catch( const IO_ERROR& ioe )
{
wxString msg = wxString::Format(
_( "Error occurred saving the global footprint library table:\n'%s'\n%s" ),
_( "Error occurred saving the global footprint library table:\n\"%s\"\n%s" ),
GetChars( fileName ),
GetChars( ioe.What() )
);
@ -444,7 +444,7 @@ void CVPCB_MAINFRAME::OnEditFootprintLibraryTable( wxCommandEvent& aEvent )
catch( const IO_ERROR& ioe )
{
wxString msg = wxString::Format(
_( "Error occurred saving the project footprint library table:\n'%s'\n%s" ),
_( "Error occurred saving the project footprint library table:\n\"%s\"\n%s" ),
GetChars( fileName ),
GetChars( ioe.What() )
);

4
cvpcb/dialogs/dialog_config_equfiles.cpp
View File

@ -49,7 +49,7 @@ DIALOG_CONFIG_EQUFILES::DIALOG_CONFIG_EQUFILES( CVPCB_MAINFRAME* aParent ) :
m_Config = Pgm().CommonSettings();
PROJECT& prj = Prj();
SetTitle( wxString::Format( _( "Project file: '%s'" ), GetChars( prj.GetProjectFullName() ) ) );
SetTitle( wxString::Format( _( "Project file: \"%s\"" ), GetChars( prj.GetProjectFullName() ) ) );
Init( );
@ -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 );
}
}

6
cvpcb/readwrite_dlgs.cpp
View File

@ -105,7 +105,7 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName, int aIndex )
if( !aFootprintName.IsEmpty() )
{
wxCHECK_RET( fpid.Parse( aFootprintName ) < 0,
wxString::Format( wxT( "<%s> is not a valid LIB_ID." ),
wxString::Format( wxT( "\"%s\" is not a valid LIB_ID." ),
GetChars( aFootprintName ) ) );
}
@ -246,7 +246,7 @@ bool CVPCB_MAINFRAME::ReadNetListAndFpFiles( const std::string& aNetlist )
case 1:
msg += wxString::Format( _(
"Component '%s' footprint '%s' was <b>not found</b> in any library.\n" ),
"Component \"%s\" footprint \"%s\" was <b>not found</b> in any library.\n" ),
GetChars( component->GetReference() ),
GetChars( component->GetFPID().GetLibItemName() )
);
@ -254,7 +254,7 @@ bool CVPCB_MAINFRAME::ReadNetListAndFpFiles( const std::string& aNetlist )
case 2:
msg += wxString::Format( _(
"Component '%s' footprint '%s' was found in <b>multiple</b> libraries.\n" ),
"Component \"%s\" footprint \"%s\" was found in <b>multiple</b> libraries.\n" ),
GetChars( component->GetReference() ),
GetChars( component->GetFPID().GetLibItemName() )
);

2
eeschema/backanno.cpp
View File

@ -245,7 +245,7 @@ bool SCH_EDIT_FRAME::LoadCmpToFootprintLinkFile()
if( !ProcessCmpToFootprintLinkFile( filename, forceVisibility, visibilityState ) )
{
wxString msg = wxString::Format( _( "Failed to open component-footprint link file '%s'" ),
wxString msg = wxString::Format( _( "Failed to open component-footprint link file \"%s\"" ),
filename.GetData() );
DisplayError( this, msg );

2
eeschema/block.cpp
View File

@ -493,7 +493,7 @@ void SCH_EDIT_FRAME::PasteListOfItems( wxDC* DC )
wxString msg;
msg.Printf( _( "The sheet changes cannot be made because the destination "
"sheet already has the sheet <%s> or one of it's subsheets "
"sheet already has the sheet \"%s\" or one of it's subsheets "
"as a parent somewhere in the schematic hierarchy." ),
GetChars( sheet->GetFileName() ) );
DisplayError( this, msg );

10
eeschema/class_library.cpp
View File

@ -51,7 +51,7 @@
#include <wx/regex.h>
#define DUPLICATE_NAME_MSG \
_( "Library '%s' has duplicate entry name '%s'.\n" \
_( "Library \"%s\" has duplicate entry name \"%s\".\n" \
"This may cause some unexpected behavior when loading components into a schematic." )
@ -522,7 +522,7 @@ void PART_LIBS::LibNamesAndPaths( PROJECT* aProject, bool doSave,
/*
{
wxString msg = wxString::Format( _(
"Unable save project's '%s' file" ),
"Unable save project's \"%s\" file" ),
GetChars( pro )
);
THROW_IO_ERROR( msg );
@ -534,7 +534,7 @@ void PART_LIBS::LibNamesAndPaths( PROJECT* aProject, bool doSave,
if( !aProject->ConfigLoad( Kiface().KifaceSearch(), GROUP_SCH, ca ) )
{
wxString msg = wxString::Format( _(
"Unable to load project's '%s' file" ),
"Unable to load project's \"%s\" file" ),
GetChars( pro )
);
THROW_IO_ERROR( msg );
@ -649,7 +649,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
catch( const IO_ERROR& ioe )
{
wxString msg;
msg.Printf( _( "Part library '%s' failed to load. Error:\n %s" ),
msg.Printf( _( "Part library \"%s\" failed to load. Error:\n %s" ),
GetChars( filename ), GetChars( ioe.What() ) );
wxLogError( msg );
@ -673,7 +673,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
catch( const IO_ERROR& ioe )
{
wxString msg = wxString::Format( _(
"Part library '%s' failed to load.\nError: %s" ),
"Part library \"%s\" failed to load.\nError: %s" ),
GetChars( cache_name ),
GetChars( ioe.What() )
);

2
eeschema/cmp_tree_model_adapter_base.cpp
View File

@ -119,7 +119,7 @@ void CMP_TREE_MODEL_ADAPTER_BASE::AddLibrariesWithProgress(
for( auto nickname : aNicknames )
{
prg->Update( ii++, wxString::Format( _( "Loading library '%s'" ), nickname ) );
prg->Update( ii++, wxString::Format( _( "Loading library \"%s\"" ), nickname ) );
AddLibrary( nickname );
}

2
eeschema/dialogs/dialog_bom.cpp
View File

@ -353,7 +353,7 @@ void DIALOG_BOM::pluginInit()
if( pluginFile == NULL )
{
wxString msg;
msg.Printf( _( "Failed to open file '%s'" ), GetChars( pluginName ) );
msg.Printf( _( "Failed to open file \"%s\"" ), GetChars( pluginName ) );
DisplayError( this, msg );
return;
}

10
eeschema/dialogs/dialog_edit_component_in_lib.cpp
View File

@ -297,7 +297,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::DeleteAllAliasOfPart( wxCommandEvent& eve
if( m_PartAliasListCtrl->FindString( m_Parent->GetAliasName() ) != wxNOT_FOUND )
{
wxString msg;
msg.Printf( _( "Alias <%s> cannot be removed while it is being edited!" ),
msg.Printf( _( "Alias \"%s\" cannot be removed while it is being edited!" ),
GetChars( m_Parent->GetAliasName() ) );
DisplayError( this, msg );
return;
@ -339,7 +339,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::AddAliasOfPart( wxCommandEvent& event )
if( m_PartAliasListCtrl->FindString( aliasname ) != wxNOT_FOUND )
{
wxString msg;
msg.Printf( _( "Alias or component name <%s> already in use." ),
msg.Printf( _( "Alias or component name \"%s\" already in use." ),
GetChars( aliasname ) );
DisplayError( this, msg );
return;
@ -348,7 +348,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::AddAliasOfPart( wxCommandEvent& event )
if( !library.empty() && Prj().SchSymbolLibTable()->LoadSymbol( library, aliasname ) != NULL )
{
wxString msg;
msg.Printf( _( "Symbol name '%s' already exists in library '%s'." ), aliasname, library );
msg.Printf( _( "Symbol name \"%s\" already exists in library \"%s\"." ), aliasname, library );
DisplayError( this, msg );
return;
}
@ -372,7 +372,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::DeleteAliasOfPart( wxCommandEvent& event
if( aliasname.CmpNoCase( m_Parent->GetAliasName() ) == 0 )
{
wxString msg;
msg.Printf( _( "Alias <%s> cannot be removed while it is being edited!" ),
msg.Printf( _( "Alias \"%s\" cannot be removed while it is being edited!" ),
GetChars( aliasname ) );
DisplayError( this, msg );
return;
@ -527,7 +527,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::AddFootprintFilter( wxCommandEvent& event
{
wxString msg;
msg.Printf( _( "Foot print filter <%s> is already defined." ), GetChars( Line ) );
msg.Printf( _( "Foot print filter \"%s\" is already defined." ), GetChars( Line ) );
DisplayError( this, msg );
return;
}

12
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View File

@ -255,7 +255,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnTestChipName( wxCommandEvent& event )
if( id.Parse( partname ) != -1 || !id.IsValid() )
{
msg.Printf( _( "'%s' is not a valid library symbol indentifier." ), partname );
msg.Printf( _( "\"%s\" is not a valid library symbol indentifier." ), partname );
DisplayError( this, msg );
return;
}
@ -272,13 +272,13 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnTestChipName( wxCommandEvent& event )
if( !alias )
{
msg.Printf( _( "Symbol '%s' not found in library '%s'" ),
msg.Printf( _( "Symbol \"%s\" not found in library \"%s\"" ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
DisplayError( this, msg );
return;
}
msg.Printf( _( "Symbol '%s' found in library '%s'" ),
msg.Printf( _( "Symbol \"%s\" found in library \"%s\"" ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
DisplayInfoMessage( this, msg );
@ -352,7 +352,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyPanelToOptions()
if( !id.IsValid() )
{
msg.Printf( _( "Symbol library identifier '%s' is not valid!" ), tmp );
msg.Printf( _( "Symbol library identifier \"%s\" is not valid!" ), tmp );
DisplayError( this, msg );
}
else if( id != m_cmp->GetLibId() )
@ -369,7 +369,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyPanelToOptions()
if( !alias )
{
msg.Printf( _( "Symbol '%s' not found in library '%s'!" ),
msg.Printf( _( "Symbol \"%s\" not found in library \"%s\"!" ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
DisplayError( this, msg );
}
@ -470,7 +470,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
&& !removeRemainingFields )
{
wxString msg = wxString::Format(
_( "The field name <%s> does not have a value and is not defined in "
_( "The field name \"%s\" does not have a value and is not defined in "
"the field template list. Empty field values are invalid an will "
"be removed from the component. Do you wish to remove this and "
"all remaining undefined fields?" ),

2
eeschema/dialogs/dialog_edit_components_libid.cpp
View File

@ -360,7 +360,7 @@ bool DIALOG_EDIT_COMPONENTS_LIBID::validateLibIds()
if( !id.IsValid() )
{
wxString msg;
msg.Printf( _( "Symbol library identifier '%s' is not valid at row %d!" ), new_libid, row+1 );
msg.Printf( _( "Symbol library identifier \"%s\" is not valid at row %d!" ), new_libid, row+1 );
wxMessageBox( msg );
return false;
}

8
eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
View File

@ -107,7 +107,7 @@ bool DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG::TransferDataFromWindow()
if( !fn.FileExists() )
{
DisplayError( this,
wxString::Format( _( "File '%s' not found." ), fn.GetFullPath() ) );
wxString::Format( _( "File \"%s\" not found." ), fn.GetFullPath() ) );
return false;
}
@ -121,7 +121,7 @@ bool DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG::TransferDataFromWindow()
catch( const IO_ERROR& ioe )
{
DisplayError( this,
wxString::Format( _( "File '%s' is not a valid symbol library table "
wxString::Format( _( "File \"%s\" is not a valid symbol library table "
"file.\n\n%s" ), fn.GetFullPath(), ioe.What() ) );
return false;
}
@ -132,7 +132,7 @@ bool DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG::TransferDataFromWindow()
if( !symTableFileName.DirExists() && !symTableFileName.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
{
DisplayError( this,
wxString::Format( _( "Cannot create global library table path '%s'." ),
wxString::Format( _( "Cannot create global library table path \"%s\"." ),
symTableFileName.GetPath() ) );
return false;
}
@ -142,7 +142,7 @@ bool DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG::TransferDataFromWindow()
{
DisplayError( this,
wxString::Format( _( "Cannot copy global symbol library table "
"file:\n\n '%s'\n\n:to:\n\n%s." ),
"file:\n\n \"%s\"\n\n:to:\n\n\"%s\"." ),
fn.GetFullPath(), symTableFileName.GetFullPath() ) );
return false;
}

4
eeschema/dialogs/dialog_plot_schematic.cpp
View File

@ -179,7 +179,7 @@ void DIALOG_PLOT_SCHEMATIC::OnOutputDirectoryBrowseClicked( wxCommandEvent& even
fn = Prj().AbsolutePath( g_RootSheet->GetFileName() );
wxString defaultPath = fn.GetPathWithSep();
wxString msg;
msg.Printf( _( "Do you want to use a path relative to\n'%s'" ),
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ),
GetChars( defaultPath ) );
wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
@ -346,7 +346,7 @@ wxFileName DIALOG_PLOT_SCHEMATIC::createPlotFileName( wxTextCtrl* aOutputDirecto
if( !EnsureFileDirectoryExists( &outputDir, plotFileName, aReporter ) )
{
wxString msg;
msg.Printf( _( "Could not write plot files to folder '%s'." ),
msg.Printf( _( "Could not write plot files to folder \"%s\"." ),
GetChars( outputDir.GetPath() ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}

4
eeschema/dialogs/dialog_sym_lib_table.cpp
View File

@ -267,7 +267,7 @@ bool DIALOG_SYMBOL_LIB_TABLE::verifyTables()
else if( nick.find( ':' ) != size_t( -1 ) )
{
wxString msg = wxString::Format(
_( "Illegal character '%s' found in Nickname: '%s' in row %d" ),
_( "Illegal character \"%s\" found in Nickname: \"%s\" in row %d" ),
":", GetChars( nick ), r );
// show the tabbed panel holding the grid we have flunked:
@ -311,7 +311,7 @@ bool DIALOG_SYMBOL_LIB_TABLE::verifyTables()
if( nick1 == nick2 )
{
wxString msg = wxString::Format(
_( "Duplicate Nickname: '%s' in rows %d and %d" ),
_( "Duplicate Nickname: \"%s\" in rows %d and %d" ),
GetChars( nick1 ), r1+1, r2+1
);

26
eeschema/dialogs/dialog_symbol_remap.cpp
View File

@ -155,7 +155,7 @@ 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." ),
msg.Printf( _( "Adding library \"%s\", file \"%s\" to project symbol library table." ),
libName, fullFileName );
aReporter.Report( msg, REPORTER::RPT_INFO );
@ -164,7 +164,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, REPORTER::RPT_WARNING );
}
}
@ -214,13 +214,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, REPORTER::RPT_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, REPORTER::RPT_ACTION );
@ -300,7 +300,7 @@ void DIALOG_SYMBOL_REMAP::backupProject()
if( wxFileName::Exists( screen->GetFileName() )
&& !wxCopyFile( screen->GetFileName(), destFileName.GetFullPath() ) )
{
errorMsg += wxPrintf( _( "Failed to back up file '%s'.\n" ), screen->GetFileName() );
errorMsg += wxPrintf( _( "Failed to back up file \"%s\".\n" ), screen->GetFileName() );
}
}
@ -309,13 +309,13 @@ void DIALOG_SYMBOL_REMAP::backupProject()
destFileName.SetName( destFileName.GetFullName() );
destFileName.SetExt( ext );
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file '%s' to file '%s'.",
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file \"%s\" to file \"%s\".",
Prj().GetProjectFullName(), destFileName.GetFullPath() );
if( wxFileName::Exists( Prj().GetProjectFullName() )
&& !wxCopyFile( Prj().GetProjectFullName(), destFileName.GetFullPath() ) )
{
errorMsg += wxPrintf( _( "Failed to back up file '%s'.\n" ), Prj().GetProjectFullName() );
errorMsg += wxPrintf( _( "Failed to back up file \"%s\".\n" ), Prj().GetProjectFullName() );
}
wxFileName srcFileName;
@ -329,26 +329,26 @@ void DIALOG_SYMBOL_REMAP::backupProject()
destFileName.SetName( destFileName.GetFullName() );
destFileName.SetExt( ext );
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file '%s' to file '%s'.",
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file \"%s\" to file \"%s\".",
srcFileName.GetFullPath(), destFileName.GetFullPath() );
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
errorMsg += wxPrintf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += wxPrintf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
}
// Back up the rescue library if it exists.
srcFileName.SetName( Prj().GetProjectName() + "-rescue" );
destFileName.SetName( srcFileName.GetFullName() );
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file '%s' to file '%s'.",
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file \"%s\" to file \"%s\".",
srcFileName.GetFullPath(), destFileName.GetFullPath() );
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
errorMsg += wxPrintf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += wxPrintf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
}
// Back up the rescue library document file if it exists.
@ -356,13 +356,13 @@ void DIALOG_SYMBOL_REMAP::backupProject()
srcFileName.SetExt( "dcm" );
destFileName.SetName( srcFileName.GetFullName() );
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file '%s' to file '%s'.",
wxLogTrace( "KICAD_TRACE_PATHS", "Backing up file \"%s\" to file \"%s\".",
srcFileName.GetFullPath(), destFileName.GetFullPath() );
if( srcFileName.Exists()
&& !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
{
errorMsg += wxPrintf( _( "Failed to back up file '%s'.\n" ), srcFileName.GetFullPath() );
errorMsg += wxPrintf( _( "Failed to back up file \"%s\".\n" ), srcFileName.GetFullPath() );
}
if( !errorMsg.IsEmpty() )

4
eeschema/edit_bitmap.cpp
View File

@ -112,7 +112,7 @@ SCH_BITMAP* SCH_EDIT_FRAME::CreateNewImage( wxDC* aDC )
if( !wxFileExists( fullFilename ) )
{
wxMessageBox( _( "Couldn't load image from <%s>" ), GetChars( fullFilename ) );
wxMessageBox( _( "Couldn't load image from \"%s\"" ), GetChars( fullFilename ) );
return NULL;
}
@ -122,7 +122,7 @@ SCH_BITMAP* SCH_EDIT_FRAME::CreateNewImage( wxDC* aDC )
if( !image->ReadImageFile( fullFilename ) )
{
wxMessageBox( _( "Couldn't load image from <%s>" ), GetChars( fullFilename ) );
wxMessageBox( _( "Couldn't load image from \"%s\"" ), GetChars( fullFilename ) );
delete image;
return NULL;
}

8
eeschema/erc.cpp
View File

@ -814,8 +814,8 @@ static void SimilarLabelsDiagnose( NETLIST_OBJECT* aItemA, NETLIST_OBJECT* aItem
screen->Append( marker );
wxString fmt = aItemA->IsLabelGlobal() ?
_( "Global label '%s' (sheet '%s') looks like:" ) :
_( "Local label '%s' (sheet '%s') looks like:" );
_( "Global label \"%s\" (sheet \"%s\") looks like:" ) :
_( "Local label \"%s\" (sheet \"%s\") looks like:" );
wxString msg;
msg.Printf( fmt, GetChars( aItemA->m_Label ), GetChars( aItemA->m_SheetPath.PathHumanReadable() ) );
@ -823,8 +823,8 @@ static void SimilarLabelsDiagnose( NETLIST_OBJECT* aItemA, NETLIST_OBJECT* aItem
ERCE_SIMILAR_GLBL_LABELS : ERCE_SIMILAR_LABELS,
aItemA->m_Start, msg, aItemA->m_Start );
fmt = aItemB->IsLabelGlobal() ? _( "Global label '%s' (sheet '%s')" ) :
_( "Local label '%s' (sheet '%s')" );
fmt = aItemB->IsLabelGlobal() ? _( "Global label \"%s\" (sheet \"%s\")" ) :
_( "Local label \"%s\" (sheet \"%s\")" );
msg.Printf( fmt, GetChars( aItemB->m_Label ), GetChars( aItemB->m_SheetPath.PathHumanReadable() ) );
marker->SetAuxiliaryData( msg, aItemB->m_Start );
}

30
eeschema/files-io.cpp
View File

@ -101,7 +101,7 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, bool aSaveUnderNewName,
if( !wxRenameFile( schematicFileName.GetFullPath(), backupFileName.GetFullPath() ) )
{
msg.Printf( _( "Could not save backup of file '%s'" ),
msg.Printf( _( "Could not save backup of file \"%s\"" ),
GetChars( schematicFileName.GetFullPath() ) );
DisplayError( this, msg );
}
@ -120,11 +120,11 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, bool aSaveUnderNewName,
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error saving schematic file '%s'.\n%s" ),
msg.Printf( _( "Error saving schematic file \"%s\".\n%s" ),
GetChars( schematicFileName.GetFullPath() ), GetChars( ioe.What() ) );
DisplayError( this, msg );
msg.Printf( _( "Failed to save '%s'" ), GetChars( schematicFileName.GetFullPath() ) );
msg.Printf( _( "Failed to save \"%s\"" ), GetChars( schematicFileName.GetFullPath() ) );
AppendMsgPanel( wxEmptyString, msg, CYAN );
success = false;
@ -207,7 +207,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
if( !LockFile( fullFileName ) )
{
wxString msg = wxString::Format( _(
"Schematic file '%s' is already open." ),
"Schematic file \"%s\" is already open." ),
GetChars( fullFileName )
);
DisplayError( this, msg );
@ -227,7 +227,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
{
// notify user that fullFileName does not exist, ask if user wants to create it.
wxString ask = wxString::Format( _(
"Schematic '%s' does not exist. Do you wish to create it?" ),
"Schematic \"%s\" does not exist. Do you wish to create it?" ),
GetChars( fullFileName )
);
if( !IsOK( this, ask ) )
@ -311,11 +311,11 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
Zoom_Automatique( false );
wxString msg;
msg.Printf( _( "Error loading schematic file '%s'.\n%s" ),
msg.Printf( _( "Error loading schematic file \"%s\".\n%s" ),
GetChars( fullFileName ), GetChars( ioe.What() ) );
DisplayError( this, msg );
msg.Printf( _( "Failed to load '%s'" ), GetChars( fullFileName ) );
msg.Printf( _( "Failed to load \"%s\"" ), GetChars( fullFileName ) );
AppendMsgPanel( wxEmptyString, msg, CYAN );
return false;
@ -455,10 +455,10 @@ bool SCH_EDIT_FRAME::AppendSchematic()
}
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 schematic '%s'" ), fullFileName );
msg.Printf( _( "Failed to load schematic \"%s\"" ), fullFileName );
AppendMsgPanel( wxEmptyString, msg, CYAN );
return false;
@ -476,7 +476,7 @@ bool SCH_EDIT_FRAME::AppendSchematic()
if( hierarchy.TestForRecursion( sheetHierarchy, destFile.GetFullPath( wxPATH_UNIX ) ) )
{
msg.Printf( _( "The sheet changes cannot be made because the destination sheet already "
"has the sheet <%s> or one of it's subsheets as a parent somewhere in "
"has the sheet \"%s\" or one of it's subsheets as a parent somewhere in "
"the schematic hierarchy." ),
destFile.GetFullPath() );
DisplayError( this, msg );
@ -523,7 +523,7 @@ bool SCH_EDIT_FRAME::AppendSchematic()
}
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( NULL, msg, ioe.What() );
}
@ -687,7 +687,7 @@ void SCH_EDIT_FRAME::OnSaveProject( wxCommandEvent& aEvent )
if( !fn.IsDirWritable() )
{
wxString msg = wxString::Format( _( "Directory '%s' is not writable." ), fn.GetPath() );
wxString msg = wxString::Format( _( "Directory \"%s\" is not writable." ), fn.GetPath() );
DisplayError( this, msg );
return;
@ -766,7 +766,7 @@ bool SCH_EDIT_FRAME::ImportFile( const wxString& aFileName, int aFileType )
if( !LockFile( fullFileName ) )
{
wxString msg = wxString::Format( _( "Schematic file '%s' is already open." ),
wxString msg = wxString::Format( _( "Schematic file \"%s\" is already open." ),
GetChars( fullFileName ) );
DisplayError( this, msg );
return false;
@ -812,11 +812,11 @@ bool SCH_EDIT_FRAME::ImportFile( const wxString& aFileName, int aFileType )
Zoom_Automatique( false );
wxString msg;
msg.Printf( _( "Error loading schematic file '%s'.\n%s" ),
msg.Printf( _( "Error loading schematic file \"%s\".\n%s" ),
fullFileName, ioe.What() );
DisplayError( this, msg );
msg.Printf( _( "Failed to load '%s'" ), fullFileName );
msg.Printf( _( "Failed to load \"%s\"" ), fullFileName );
AppendMsgPanel( wxEmptyString, msg, CYAN );
return false;

2
eeschema/getpart.cpp
View File

@ -392,7 +392,7 @@ void SCH_EDIT_FRAME::ConvertPart( SCH_COMPONENT* aComponent, wxDC* DC )
if( !part->HasConversion() )
{
msg.Printf( _( "No alternate body style found for symbol '%s' in library '%s'." ),
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;

16
eeschema/lib_export.cpp
View File

@ -77,14 +77,14 @@ void LIB_EDIT_FRAME::OnImportPart( wxCommandEvent& event )
}
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;
}
@ -94,7 +94,7 @@ void LIB_EDIT_FRAME::OnImportPart( wxCommandEvent& event )
if( m_libMgr->PartExists( 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;
}
@ -144,7 +144,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
}
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;
@ -152,7 +152,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
if( old_part )
{
msg.Printf( _( "Symbol '%s' already exists. Overwrite it?" ), part->GetName() );
msg.Printf( _( "Symbol \"%s\" already exists. Overwrite it?" ), part->GetName() );
if( !IsOK( this, msg ) )
return;
@ -161,7 +161,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
if( fn.Exists() && !fn.IsDirWritable() )
{
msg.Printf( _( "Write permissions are required to save library '%s'." ), fn.GetFullPath() );
msg.Printf( _( "Write permissions are required to save library \"%s\"." ), fn.GetFullPath() );
DisplayError( this, msg );
return;
}
@ -177,7 +177,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
{
msg = _( "Failed to create symbol library file " ) + 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;
}
@ -185,6 +185,6 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
m_mruPath = fn.GetPath();
m_drawItem = m_lastDrawItem = NULL;
msg.Printf( _( "Symbol '%s' saved in library '%s'" ), part->GetName(), fn.GetFullPath() );
msg.Printf( _( "Symbol \"%s\" saved in library \"%s\"" ), part->GetName(), fn.GetFullPath() );
SetStatusText( msg );
}

2
eeschema/libarch.cpp
View File

@ -152,7 +152,7 @@ bool SCH_EDIT_FRAME::CreateArchiveLibrary( const wxString& aFileName )
}
catch( ... /* IO_ERROR ioe */ )
{
errorMsg.Printf( _( "Failed to save symbol library file '%s'" ), aFileName );
errorMsg.Printf( _( "Failed to save symbol library file \"%s\"" ), aFileName );
DisplayError( this, errorMsg );
return false;
}

16
eeschema/libedit.cpp
View File

@ -115,7 +115,7 @@ bool LIB_EDIT_FRAME::LoadComponentFromCurrentLib( const wxString& aAliasName, in
{
wxString msg;
msg.Printf( _( "Error occurred loading symbol '%s' from library '%s'." ),
msg.Printf( _( "Error occurred loading symbol \"%s\" from library \"%s\"." ),
aAliasName, GetCurLib() );
DisplayErrorMessage( this, msg, ioe.What() );
return false;
@ -152,7 +152,7 @@ bool LIB_EDIT_FRAME::LoadOneLibraryPartAux( LIB_ALIAS* aEntry, const wxString& a
if( aEntry->GetName().IsEmpty() )
{
wxLogWarning( "Symbol in library '%s' has empty name field.", aLibrary );
wxLogWarning( "Symbol in library \"%s\" has empty name field.", aLibrary );
return false;
}
@ -299,7 +299,7 @@ void LIB_EDIT_FRAME::OnCreateNewPart( wxCommandEvent& event )
// Test if there is a component with this name already.
if( !lib.empty() && m_libMgr->PartExists( name, lib ) )
{
wxString msg = wxString::Format( _( "Symbol '%s' already exists in library '%s'" ),
wxString msg = wxString::Format( _( "Symbol \"%s\" already exists in library \"%s\"" ),
name, lib );
DisplayError( this, msg );
return;
@ -477,7 +477,7 @@ void LIB_EDIT_FRAME::loadPart( const wxString& aAlias, const wxString& aLibrary,
if( !alias )
{
wxString msg = wxString::Format( _( "Part name '%s' not found in library '%s'" ),
wxString msg = wxString::Format( _( "Part name \"%s\" not found in library \"%s\"" ),
GetChars( aAlias ), GetChars( aLibrary ) );
DisplayError( this, msg );
return;
@ -518,7 +518,7 @@ bool LIB_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
fn.SetName( aLibrary );
fn.SetExt( SchematicLibraryFileExtension );
wxFileDialog dlg( this, wxString::Format( _( "Save Library '%s' As..." ), aLibrary ),
wxFileDialog dlg( this, wxString::Format( _( "Save Library \"%s\" As..." ), aLibrary ),
default_path, fn.GetFullName(), SchematicLibraryFileWildcard(),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@ -556,7 +556,7 @@ bool LIB_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
if( !m_libMgr->SaveLibrary( aLibrary, fn.GetFullPath() ) )
{
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 );
return false;
@ -565,9 +565,9 @@ bool LIB_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
if( !aNewFile )
m_libMgr->ClearLibraryModified( aLibrary );
msg.Printf( _( "Symbol library file '%s' saved" ), fn.GetFullPath() );
msg.Printf( _( "Symbol library file \"%s\" saved" ), fn.GetFullPath() );
wxString msg1;
msg1.Printf( _( "Symbol library documentation file '%s' saved" ), docFileName.GetFullPath() );
msg1.Printf( _( "Symbol library documentation file \"%s\" saved" ), docFileName.GetFullPath() );
AppendMsgPanel( msg, msg1, BLUE );
UpdateAliasSelectList();
UpdatePartSelectList();

2
eeschema/libedit_plot_component.cpp
View File

@ -134,7 +134,7 @@ void LIB_EDIT_FRAME::CreatePNGorJPEGFile( const wxString& aFileName, bool aFmt_j
if( !image.SaveFile( aFileName, aFmt_jpeg ? wxBITMAP_TYPE_JPEG : wxBITMAP_TYPE_PNG ) )
{
wxString msg;
msg.Printf( _( "Can't save file <%s>" ), GetChars( aFileName ) );
msg.Printf( _( "Can't save file \"%s\"" ), GetChars( aFileName ) );
wxMessageBox( msg );
}

6
eeschema/libeditframe.cpp
View File

@ -602,7 +602,7 @@ void LIB_EDIT_FRAME::OnUpdateViewDoc( wxUpdateUIEvent& event )
LIB_ALIAS* alias = part->GetAlias( m_aliasName );
wxCHECK_RET( alias != NULL,
wxString::Format( "Alias '%s' not found in symbol '%s'.",
wxString::Format( "Alias \"%s\" not found in symbol \"%s\".",
m_aliasName, part->GetName() ) );
enable = !alias->GetDocFileName().IsEmpty();
@ -1518,7 +1518,7 @@ bool LIB_EDIT_FRAME::addLibraryFile( bool aCreateNew )
if( m_libMgr->LibraryExists( libName ) )
{
DisplayError( this,
wxString::Format( _( "Library '%s' already exists" ), GetChars( libName ) ) );
wxString::Format( _( "Library \"%s\" already exists" ), GetChars( libName ) ) );
return false;
}
@ -1622,7 +1622,7 @@ void LIB_EDIT_FRAME::SyncLibraries( bool aProgress )
wxEmptyString, m_libMgr->GetAdapter()->GetLibrariesCount(), this );
m_libMgr->Sync( true, [&]( int progress, int max, const wxString& libName ) {
progressDlg.Update( progress, wxString::Format( _( "Loading library '%s'" ), libName ) );
progressDlg.Update( progress, wxString::Format( _( "Loading library \"%s\"" ), libName ) );
} );
}
else

6
eeschema/libfield.cpp
View File

@ -89,7 +89,7 @@ void LIB_EDIT_FRAME::EditField( LIB_FIELD* aField )
if( !lib.empty() && m_libMgr->PartExists( newFieldValue, lib ) )
{
msg.Printf( _(
"The name '%s' conflicts with an existing entry in the component library '%s'.\n\n"
"The name \"%s\" conflicts with an existing entry in the component library \"%s\".\n\n"
"Do you wish to replace the current component in the library with this one?" ),
newFieldValue,
lib
@ -105,7 +105,7 @@ void LIB_EDIT_FRAME::EditField( LIB_FIELD* aField )
// Test the current component for name conflicts.
if( parent->HasAlias( newFieldValue ) )
{
msg.Printf( _( "The current component already has an alias named '%s'.\n\n"
msg.Printf( _( "The current component already has an alias named \"%s\".\n\n"
"Do you wish to remove this alias from the component?" ),
GetChars( newFieldValue ) );
@ -140,7 +140,7 @@ void LIB_EDIT_FRAME::EditField( LIB_FIELD* aField )
if( conflicts )
{
msg.Printf( _( "The new symbol contains alias names that conflict with "
"entries in the library '%s'.\n\n"
"entries in the library \"%s\".\n\n"
"Do you wish to remove all of the conflicting aliases from "
"this symbol?" ),
lib );

2
eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
View File

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

2
eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
View File

@ -51,7 +51,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'" ),
msg.Printf( _( "Failed to create file \"%s\"" ),
GetChars( aOutFileName ) );
DisplayError( NULL, msg );
return false;

4
eeschema/plot_schematic_DXF.cpp
View File

@ -77,12 +77,12 @@ void DIALOG_PLOT_SCHEMATIC::CreateDXFFile( bool aPlotAll, bool aPlotFrameRef )
if( PlotOneSheetDXF( plotFileName.GetFullPath(), screen, plot_offset, 1.0,
aPlotFrameRef ) )
{
msg.Printf( _( "Plot: '%s' OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
msg.Printf( _( "Plot: \"%s\" OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
}
else // Error
{
msg.Printf( _( "Unable to create file '%s'.\n" ),
msg.Printf( _( "Unable to create file \"%s\".\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}

4
eeschema/plot_schematic_HPGL.cpp
View File

@ -174,12 +174,12 @@ void DIALOG_PLOT_SCHEMATIC::createHPGLFile( bool aPlotAll, bool aPlotFrameRef )
if( Plot_1_Page_HPGL( plotFileName.GetFullPath(), screen, plotPage, plotOffset,
plot_scale, aPlotFrameRef ) )
{
msg.Printf( _( "Plot: '%s' OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
msg.Printf( _( "Plot: \"%s\" OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
}
else
{
msg.Printf( _( "Unable to create file '%s'.\n" ),
msg.Printf( _( "Unable to create file \"%s\".\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}

4
eeschema/plot_schematic_PDF.cpp
View File

@ -88,7 +88,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotFrameRef )
if( !plotter->OpenFile( plotFileName.GetFullPath() ) )
{
msg.Printf( _( "Unable to create file '%s'.\n" ),
msg.Printf( _( "Unable to create file \"%s\".\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
delete plotter;
@ -123,7 +123,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotFrameRef )
}
// Everything done, close the plot and restore the environment
msg.Printf( _( "Plot: '%s' OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
msg.Printf( _( "Plot: \"%s\" OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
restoreEnvironment( plotter, oldsheetpath );

4
eeschema/plot_schematic_PS.cpp
View File

@ -104,13 +104,13 @@ void DIALOG_PLOT_SCHEMATIC::createPSFile( bool aPlotAll, bool aPlotFrameRef )
if( plotOneSheetPS( plotFileName.GetFullPath(), screen, plotPage, plot_offset,
scale, aPlotFrameRef ) )
{
msg.Printf( _( "Plot: '%s' OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
msg.Printf( _( "Plot: \"%s\" OK.\n" ), GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
}
else
{
// Error
msg.Printf( _( "Unable to create file '%s'.\n" ),
msg.Printf( _( "Unable to create file \"%s\".\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}

4
eeschema/plot_schematic_SVG.cpp
View File

@ -74,13 +74,13 @@ void DIALOG_PLOT_SCHEMATIC::createSVGFile( bool aPrintAll, bool aPrintFrameRef )
if( !success )
{
msg.Printf( _( "Cannot create file '%s'.\n" ),
msg.Printf( _( "Cannot create file \"%s\".\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}
else
{
msg.Printf( _( "Plot: '%s' OK.\n" ),
msg.Printf( _( "Plot: \"%s\" OK.\n" ),
GetChars( plotFileName.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
}

2
eeschema/project_rescue.cpp
View File

@ -651,7 +651,7 @@ bool LEGACY_RESCUER::WriteRescueLibrary( SCH_EDIT_FRAME *aEditFrame )
{
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( aEditFrame, msg );
return false;

2
eeschema/sch_base_frame.cpp
View File

@ -58,7 +58,7 @@ LIB_ALIAS* SchGetLibAlias( const LIB_ID& aLibId, SYMBOL_LIB_TABLE* aLibTable, PA
{
wxString msg;
msg.Printf( _( "Could not load symbol '%s' from library '%s'." ),
msg.Printf( _( "Could not load symbol \"%s\" from library \"%s\"." ),
aLibId.GetLibItemName().wx_str(), aLibId.GetLibNickname().wx_str() );
DisplayErrorMessage( aParent, msg, ioe.What() );
}

4
eeschema/sch_eagle_plugin.cpp
View File

@ -336,7 +336,7 @@ SCH_SHEET* SCH_EAGLE_PLUGIN::Load( const wxString& aFileName, KIWAY* aKiway,
m_kiway = aKiway;
if( !xmlDocument.Load( m_filename.GetFullPath() ) )
THROW_IO_ERROR( wxString::Format( _( "Unable to read file '%s'" ),
THROW_IO_ERROR( wxString::Format( _( "Unable to read file \"%s\"" ),
m_filename.GetFullPath() ) );
// Delete on exception, if I own m_rootSheet, according to aAppendToMe
@ -778,7 +778,7 @@ void SCH_EAGLE_PLUGIN::loadSegments( wxXmlNode* aSegmentsNode, const wxString& n
}
else // DEFAULT
{
// THROW_IO_ERROR( wxString::Format( _( "XML node '%s' unknown" ), nodeName ) );
// THROW_IO_ERROR( wxString::Format( _( "XML node \"%s\" unknown" ), nodeName ) );
}
// Get next segment attribute

4
eeschema/sch_io_mgr.cpp
View File

@ -29,8 +29,8 @@
#include <wildcards_and_files_ext.h>
#define FMT_UNIMPLEMENTED _( "Plugin '%s' does not implement the '%s' function." )
#define FMT_NOTFOUND _( "Plugin type '%s' is not found." )
#define FMT_UNIMPLEMENTED _( "Plugin \"%s\" does not implement the \"%s\" function." )
#define FMT_NOTFOUND _( "Plugin type \"%s\" is not found." )

12
eeschema/sch_legacy_plugin.cpp
View File

@ -746,7 +746,7 @@ void SCH_LEGACY_PLUGIN::loadHeader( FILE_LINE_READER& aReader, SCH_SCREEN* aScre
if( !strCompare( "Eeschema Schematic File Version", line, &line ) )
{
m_error.Printf( _( "'%s' does not appear to be an Eeschema file" ),
m_error.Printf( _( "\"%s\" does not appear to be an Eeschema file" ),
GetChars( aScreen->GetFileName() ) );
THROW_IO_ERROR( m_error );
}
@ -2268,9 +2268,9 @@ void SCH_LEGACY_PLUGIN_CACHE::Load()
{
wxCHECK_RET( m_libFileName.IsAbsolute(),
wxString::Format( "Cannot use relative file paths in legacy plugin to "
"open library '%s'.", m_libFileName.GetFullPath() ) );
"open library \"%s\".", m_libFileName.GetFullPath() ) );
wxLogTrace( traceSchLegacyPlugin, "Loading legacy symbol file '%s'",
wxLogTrace( traceSchLegacyPlugin, "Loading legacy symbol file \"%s\"",
m_libFileName.GetFullPath() );
FILE_LINE_READER reader( m_libFileName.GetFullPath() );
@ -2361,7 +2361,7 @@ void SCH_LEGACY_PLUGIN_CACHE::loadDocs()
if( !fn.IsFileReadable() )
THROW_IO_ERROR( wxString::Format( _( "user does not have permission to read library "
"document file '%s'" ), fn.GetFullPath() ) );
"document file \"%s\"" ), fn.GetFullPath() ) );
FILE_LINE_READER reader( fn.GetFullPath() );
@ -4143,7 +4143,7 @@ void SCH_LEGACY_PLUGIN::CreateSymbolLib( const wxString& aLibraryPath,
if( wxFileExists( aLibraryPath ) )
{
THROW_IO_ERROR( wxString::Format(
_( "symbol library '%s' already exists, cannot create a new library" ),
_( "symbol library \"%s\" already exists, cannot create a new library" ),
aLibraryPath.GetData() ) );
}
@ -4171,7 +4171,7 @@ bool SCH_LEGACY_PLUGIN::DeleteSymbolLib( const wxString& aLibraryPath,
// we don't want that. we want bare metal portability with no UI here.
if( wxRemove( aLibraryPath ) )
{
THROW_IO_ERROR( wxString::Format( _( "library '%s' cannot be deleted" ),
THROW_IO_ERROR( wxString::Format( _( "library \"%s\" cannot be deleted" ),
aLibraryPath.GetData() ) );
}

2
eeschema/sch_plugin.cpp
View File

@ -24,7 +24,7 @@
#include <sch_io_mgr.h>
#define FMT_UNIMPLEMENTED _( "Plugin '%s' does not implement the '%s' function." )
#define FMT_UNIMPLEMENTED _( "Plugin \"%s\" does not implement the \"%s\" function." )
/**
* Function not_implemented

6
eeschema/schframe.cpp
View File

@ -649,7 +649,7 @@ void SCH_EDIT_FRAME::OnCloseWindow( wxCloseEvent& aEvent )
{
wxString fileName = Prj().AbsolutePath( g_RootSheet->GetScreen()->GetFileName() );
wxString msg = wxString::Format( _(
"Save the changes in\n'%s'\nbefore closing?"),
"Save the changes in\n\"%s\"\nbefore closing?"),
GetChars( fileName )
);
@ -1044,7 +1044,7 @@ void SCH_EDIT_FRAME::OnNewProject( wxCommandEvent& event )
if( create_me.FileExists() )
{
wxString msg = wxString::Format( _(
"Schematic file '%s' already exists, use Open instead" ),
"Schematic file \"%s\" already exists, use Open instead" ),
GetChars( create_me.GetFullName() )
);
DisplayError( this, msg );
@ -1237,7 +1237,7 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event )
{
wxString msg;
msg.Printf( _( "Error occurred loading symbol '%s' from library '%s'." ),
msg.Printf( _( "Error occurred loading symbol \"%s\" from library \"%s\"." ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
DisplayErrorMessage( this, msg, ioe.What() );
return;

4
eeschema/selpart.cpp
View File

@ -60,7 +60,7 @@ static void DisplayCmpDocAndKeywords( wxString& aSelection, void* aData )
}
catch( const IO_ERROR& ioe )
{
aSelection.Printf( _( "Error occurred loading symbol '%s' from library '%s'." ),
aSelection.Printf( _( "Error occurred loading symbol \"%s\" from library \"%s\"." ),
id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str() );
return;
}
@ -141,7 +141,7 @@ bool SCH_BASE_FRAME::DisplayListComponentsInLib( wxString& aLibrary, wxString& a
{
wxString msg;
msg.Printf( _( "Error occurred loading symbol library '%s'." ), aLibrary );
msg.Printf( _( "Error occurred loading symbol library \"%s\"." ), aLibrary );
DisplayErrorMessage( this, msg, ioe.What() );
return false;
}

20
eeschema/sheet.cpp
View File

@ -125,12 +125,12 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
{
if( useScreen != NULL )
{
msg.Printf( _( "A file named '%s' already exists in the current schematic "
msg.Printf( _( "A file named \"%s\" already exists in the current schematic "
"hierarchy." ), newFilename );
}
else
{
msg.Printf( _( "A file named '%s' already exists." ), newFilename );
msg.Printf( _( "A file named \"%s\" already exists." ), newFilename );
}
msg += _( "\n\nDo you want to create a sheet with the contents of this file?" );
@ -169,12 +169,12 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
if( useScreen != NULL )
{
tmp.Printf( _( "A file named <%s> already exists in the current schematic "
tmp.Printf( _( "A file named \"%s\" already exists in the current schematic "
"hierarchy." ), newFilename );
}
else
{
tmp.Printf( _( "A file named <%s> already exists." ), newFilename );
tmp.Printf( _( "A file named \"%s\" already exists." ), newFilename );
}
msg += tmp;
@ -216,10 +216,10 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error occurred saving schematic file '%s'." ), newFilename );
msg.Printf( _( "Error occurred saving schematic file \"%s\"." ), newFilename );
DisplayErrorMessage( this, msg, ioe.What() );
msg.Printf( _( "Failed to save schematic '%s'" ), newFilename );
msg.Printf( _( "Failed to save schematic \"%s\"" ), newFilename );
AppendMsgPanel( wxEmptyString, msg, CYAN );
return false;
@ -259,10 +259,10 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Error occurred loading schematic file '%s'." ), newFilename );
msg.Printf( _( "Error occurred loading schematic file \"%s\"." ), newFilename );
DisplayErrorMessage( this, msg, ioe.What() );
msg.Printf( _( "Failed to load schematic '%s'" ), newFilename );
msg.Printf( _( "Failed to load schematic \"%s\"" ), newFilename );
AppendMsgPanel( wxEmptyString, msg, CYAN );
return false;
@ -289,7 +289,7 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
if( hierarchy.TestForRecursion( sheetHierarchy, destFn.GetFullPath( wxPATH_UNIX ) ) )
{
msg.Printf( _( "The sheet changes cannot be made because the destination sheet already "
"has the sheet <%s> or one of it's subsheets as a parent somewhere in "
"has the sheet \"%s\" or one of it's subsheets as a parent somewhere in "
"the schematic hierarchy." ),
newFilename );
DisplayError( this, msg );
@ -301,7 +301,7 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy )
if( newScreens.HasNoFullyDefinedLibIds() )
{
msg.Printf(_( "The schematic '%s' has not been remapped to the symbol library table. "
msg.Printf(_( "The schematic \"%s\" has not been remapped to the symbol library table. "
"Most if not all of the symbol library links will be broken. Do you "
"want to continue?" ), fileName.GetFullName() );

2
eeschema/sim/spice_value.cpp
View File

@ -267,7 +267,7 @@ bool SPICE_VALIDATOR::Validate( wxWindow* aParent )
catch( ... )
{
DisplayError( aParent,
wxString::Format( _( "'%s' is not a valid Spice value" ), text->GetValue() ) );
wxString::Format( _( "\"%s\" is not a valid Spice value" ), text->GetValue() ) );
return false;
}

10
eeschema/symbedit.cpp
View File

@ -89,21 +89,21 @@ void LIB_EDIT_FRAME::LoadOneSymbol()
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "Cannot import symbol library '%s'." ), filename );
msg.Printf( _( "Cannot import symbol library \"%s\"." ), filename );
DisplayErrorMessage( this, msg, ioe.What() );
return;
}
if( symbols.empty() )
{
msg.Printf( _( "Symbol library file '%s' is empty." ), filename );
msg.Printf( _( "Symbol library file \"%s\" is empty." ), filename );
DisplayError( this, msg );
return;
}
if( symbols.GetCount() > 1 )
{
msg.Printf( _( "More than one symbol found in symbol file '%s'." ), filename );
msg.Printf( _( "More than one symbol found in symbol file \"%s\"." ), filename );
wxMessageBox( msg, _( "Warning" ), wxOK | wxICON_EXCLAMATION, this );
}
@ -191,7 +191,7 @@ void LIB_EDIT_FRAME::SaveOneSymbol()
}
wxString msg;
msg.Printf( _( "Saving symbol in '%s'" ), fn.GetPath() );
msg.Printf( _( "Saving symbol in \"%s\"" ), fn.GetPath() );
SetStatusText( msg );
SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) );
@ -208,7 +208,7 @@ void LIB_EDIT_FRAME::SaveOneSymbol()
}
catch( const IO_ERROR& ioe )
{
msg.Printf( _( "An error occurred attempting to save symbol file '%s'" ),
msg.Printf( _( "An error occurred attempting to save symbol file \"%s\"" ),
fn.GetFullPath() );
DisplayErrorMessage( this, msg, ioe.What() );
}

6
eeschema/symbol_lib_table.cpp
View File

@ -207,7 +207,7 @@ void SYMBOL_LIB_TABLE::Parse( LIB_TABLE_LEXER* in )
delete tmp; // The table did not take ownership of the row.
wxString msg = wxString::Format(
_( "Duplicate library nickname '%s' found in symbol library "
_( "Duplicate library nickname \"%s\" found in symbol library "
"table file line %d" ), GetChars( nickname ), lineNum );
if( !errMsg.IsEmpty() )
@ -294,7 +294,7 @@ SYMBOL_LIB_TABLE_ROW* SYMBOL_LIB_TABLE::FindRow( const wxString& aNickname )
if( !row )
{
wxString msg = wxString::Format(
_( "sym-lib-table files contain no library with nickname '%s'" ),
_( "sym-lib-table files contain no library with nickname \"%s\"" ),
GetChars( aNickname ) );
THROW_IO_ERROR( msg );
@ -452,7 +452,7 @@ bool SYMBOL_LIB_TABLE::LoadGlobalTable( SYMBOL_LIB_TABLE& aTable )
if( !fn.DirExists() && !fn.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
{
THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path '%s'." ),
THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path \"%s\"." ),
GetChars( fn.GetPath() ) ) );
}

2
gerbview/events_called_functions.cpp
View File

@ -381,7 +381,7 @@ void GERBVIEW_FRAME::OnShowGerberSourceFile( wxCommandEvent& event )
if( !fn.FileExists() )
{
wxString msg;
msg.Printf( _( "Source file '%s' is not available" ),
msg.Printf( _( "Source file \"%s\" is not available" ),
GetChars( fn.GetFullPath() ) );
wxMessageBox( msg );
}

2
gerbview/export_to_pcbnew.cpp
View File

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

6
gerbview/files.cpp
View File

@ -408,7 +408,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
{
if( aReporter )
{
msg.Printf( _( "Zip file '%s' cannot be opened" ), GetChars( aFullFileName ) );
msg.Printf( _( "Zip file \"%s\" cannot be opened" ), GetChars( aFullFileName ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
@ -450,7 +450,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
{
if( aReporter )
{
msg.Printf( _( "Info: skip file <i>'%s'</i> (unknown type)\n" ),
msg.Printf( _( "Info: skip file <i>\"%s\"</i> (unknown type)\n" ),
GetChars( entry->GetName() ) );
aReporter->Report( msg, REPORTER::RPT_WARNING );
}
@ -492,7 +492,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"),
GetChars( unzipped_tempfile ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}

2
gerbview/gerbview_frame.cpp
View File

@ -626,7 +626,7 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo()
// Display Image Name and Layer Name (from the current gerber data):
wxString status;
status.Printf( _( "Image name: '%s' Layer name: '%s'" ),
status.Printf( _( "Image name: \"%s\" Layer name: \"%s\"" ),
GetChars( gerber->m_ImageName ),
GetChars( gerber->GetLayerParams().m_LayerName ) );
SetStatusText( status, 0 );

6
gerbview/onrightclick.cpp
View File

@ -103,7 +103,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu )
( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_CMP ) )
{
AddMenuItem( aPopMenu, ID_HIGHLIGHT_CMP_ITEMS,
wxString::Format( _( "Highlight items of component '%s'" ),
wxString::Format( _( "Highlight items of component \"%s\"" ),
GetChars( net_attr.m_Cmpref ) ),
KiBitmap( file_footprint_xpm ) );
add_separator = true;
@ -112,7 +112,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu )
if( ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_NET ) )
{
AddMenuItem( aPopMenu, ID_HIGHLIGHT_NET_ITEMS,
wxString::Format( _( "Highlight items of net '%s'" ),
wxString::Format( _( "Highlight items of net \"%s\"" ),
GetChars( net_attr.m_Netname ) ),
KiBitmap( general_ratsnest_xpm ) );
add_separator = true;
@ -123,7 +123,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu )
if( apertDescr && !apertDescr->m_AperFunction.IsEmpty() )
{
AddMenuItem( aPopMenu, ID_HIGHLIGHT_APER_ATTRIBUTE_ITEMS,
wxString::Format( _( "Highlight aperture type '%s'" ),
wxString::Format( _( "Highlight aperture type \"%s\"" ),
GetChars( apertDescr->m_AperFunction ) ),
KiBitmap( flag_xpm ) );
add_separator = true;

2
gerbview/readgerb.cpp
View File

@ -56,7 +56,7 @@ bool GERBVIEW_FRAME::Read_GERBER_File( const wxString& GERBER_FullFileName )
if( !success )
{
msg.Printf( _( "File <%s> not found" ), GetChars( GERBER_FullFileName ) );
msg.Printf( _( "File \"%s\" not found" ), GetChars( GERBER_FullFileName ) );
DisplayError( this, msg, 10 );
return false;
}

6
gerbview/tools/selection_tool.cpp
View File

@ -101,7 +101,7 @@ private:
( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_CMP ) )
{
auto menuEntry = Add( GERBVIEW_ACTIONS::highlightComponent );
menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of component '%s'" ),
menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of component \"%s\"" ),
GetChars( net_attr.m_Cmpref ) ) );
addSeparator = true;
}
@ -109,7 +109,7 @@ private:
if( ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_NET ) )
{
auto menuEntry = Add( GERBVIEW_ACTIONS::highlightNet );
menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of net '%s'" ),
menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of net \"%s\"" ),
GetChars( net_attr.m_Netname ) ) );
addSeparator = true;
}
@ -119,7 +119,7 @@ private:
if( apertDescr && !apertDescr->m_AperFunction.IsEmpty() )
{
auto menuEntry = Add( GERBVIEW_ACTIONS::highlightAttribute );
menuEntry->SetItemLabel( wxString::Format( _( "Highlight aperture type '%s'" ),
menuEntry->SetItemLabel( wxString::Format( _( "Highlight aperture type \"%s\"" ),
GetChars( apertDescr->m_AperFunction ) ) );
addSeparator = true;
}

2
kicad/class_treeproject_item.cpp
View File

@ -129,7 +129,7 @@ bool TREEPROJECT_ITEM::Rename( const wxString& name, bool check )
bool TREEPROJECT_ITEM::Delete( bool check )
{
wxString msg = wxString::Format( _(
"Do you really want to delete '%s'" ),
"Do you really want to delete \"%s\"" ),
GetChars( GetFileName() )
);

14
kicad/files-io.cpp
View File

@ -67,7 +67,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
if( zipfiledlg.ShowModal() == wxID_CANCEL )
return;
wxString msg = wxString::Format( _( "\nOpen '%s'\n" ), GetChars( zipfiledlg.GetPath() ) );
wxString msg = wxString::Format( _( "\nOpen \"%s\"\n" ), GetChars( zipfiledlg.GetPath() ) );
PrintMsg( msg );
wxDirDialog dirDlg( this, _( "Target Directory" ), fn.GetPath(),
@ -77,7 +77,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
return;
wxString unzipDir = dirDlg.GetPath() + wxT( "/" );
msg.Printf( _( "Unzipping project in '%s'\n" ), GetChars( unzipDir ) );
msg.Printf( _( "Unzipping project in \"%s\"\n" ), GetChars( unzipDir ) );
PrintMsg( msg );
wxFileSystem zipfilesys;
@ -101,7 +101,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
uzfn.MakeAbsolute( unzipDir );
wxString unzipfilename = uzfn.GetFullPath();
msg.Printf( _( "Extract file '%s'" ), GetChars( unzipfilename ) );
msg.Printf( _( "Extract file \"%s\"" ), GetChars( unzipfilename ) );
PrintMsg( msg );
wxInputStream* stream = zipfile->GetStream();
@ -165,7 +165,7 @@ void KICAD_MANAGER_FRAME::OnArchiveFiles( wxCommandEvent& event )
if( !ostream.IsOk() ) // issue to create the file. Perhaps not writable dir
{
wxMessageBox( wxString::Format( _( "Unable to create zip archive file '%s'" ),
wxMessageBox( wxString::Format( _( "Unable to create zip archive file \"%s\"" ),
zipfilename ) );
return;
}
@ -192,7 +192,7 @@ void KICAD_MANAGER_FRAME::OnArchiveFiles( wxCommandEvent& event )
curr_fn.MakeRelativeTo( currdirname );
currFilename = curr_fn.GetFullPath();
msg.Printf( _( "Archive file <%s>" ), GetChars( currFilename ) );
msg.Printf( _( "Archive file \"%s\"" ), GetChars( currFilename ) );
PrintMsg( msg );
// Read input file and add it to the zip file:
@ -219,14 +219,14 @@ void KICAD_MANAGER_FRAME::OnArchiveFiles( wxCommandEvent& event )
if( zipstream.Close() )
{
msg.Printf( _( "\nZip archive <%s> created (%d bytes)" ),
msg.Printf( _( "\nZip archive \"%s\" created (%d bytes)" ),
GetChars( zipfilename ), zipBytesCnt );
PrintMsg( msg );
PrintMsg( wxT( "\n** end **\n" ) );
}
else
{
msg.Printf( wxT( "Unable to create archive <%s>, abort\n" ),
msg.Printf( wxT( "Unable to create archive \"%s\", abort\n" ),
GetChars( zipfilename ) );
PrintMsg( msg );
}

4
kicad/prjconfig.cpp
View File

@ -210,7 +210,7 @@ void KICAD_MANAGER_FRAME::OnNewProject( wxCommandEvent& aEvent )
if( !pro.Mkdir() )
{
wxString msg;
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." ),
pro.GetPath() );
DisplayErrorMessage( this, msg );
@ -336,7 +336,7 @@ void KICAD_MANAGER_FRAME::OnCreateProjectFromTemplate( wxCommandEvent& event )
{
wxString msg;
msg.Printf( _( "Cannot write to folder '%s'." ), prjPath.GetPath() );
msg.Printf( _( "Cannot write to folder \"%s\"." ), prjPath.GetPath() );
wxMessageDialog msgDlg( this, msg, _( "Error!" ), wxICON_ERROR | wxOK | wxCENTER );
msgDlg.SetExtendedMessage( _( "Plese check your access permissions to this folder "
"and try again." ) );

4
kicad/project_template.cpp
View File

@ -202,7 +202,7 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr
wxString msg;
msg.Printf( _( "Cannot create folder '%s'." ), destpath );
msg.Printf( _( "Cannot create folder \"%s\"." ), destpath );
*aErrorMsg += msg;
}
@ -224,7 +224,7 @@ bool PROJECT_TEMPLATE::CreateProject( wxFileName& aNewProjectPath, wxString* aEr
wxString msg;
msg.Printf( _( "Cannot copy file '%s'." ), dstFile );
msg.Printf( _( "Cannot copy file \"%s\"." ), dstFile );
*aErrorMsg += msg;
}

2
kicad/tree_project_frame.cpp
View File

@ -755,7 +755,7 @@ void TREE_PROJECT_FRAME::OnRenameFile( wxCommandEvent& )
wxString buffer = m_TreeProject->GetItemText( curr_item );
wxString msg = wxString::Format(
_( "Change filename: '%s'" ),
_( "Change filename: \"%s\"" ),
GetChars( tree_data->GetFileName() ) );
wxTextEntryDialog dlg( this, msg, _( "Change filename" ), buffer );

2
new/sch_lib.cpp
View File

@ -234,7 +234,7 @@ PART* LIB::LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable )
if( !part ) // part does not exist in this lib
{
wxString msg = wxString::Format( _("part '%s' not found in lib %s" ),
wxString msg = wxString::Format( _("part \"%s\" not found in lib %s" ),
wxString::FromUTF8( aLPID.GetPartNameAndRev().c_str() ).GetData(),
wxString::FromUTF8( logicalName.c_str() ).GetData() );
THROW_IO_ERROR( msg );

14
pagelayout_editor/files.cpp
View File

@ -60,7 +60,7 @@ void PL_EDITOR_FRAME::OnFileHistory( wxCommandEvent& event )
if( LoadPageLayoutDescrFile( filename ) )
{
wxString msg;
msg.Printf( _( "File <%s> loaded"), GetChars( filename ) );
msg.Printf( _( "File \"%s\" loaded"), GetChars( filename ) );
SetStatusText( msg );
}
@ -124,7 +124,7 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event )
GetScreen()->SetModify();
RebuildDesignTree();
m_canvas->Refresh();
msg.Printf( _( "File <%s> inserted" ), GetChars( filename ) );
msg.Printf( _( "File \"%s\" inserted" ), GetChars( filename ) );
SetStatusText( msg );
}
}
@ -148,7 +148,7 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event )
else
{
OnNewPageLayout();
msg.Printf( _( "File <%s> loaded" ), GetChars( filename ) );
msg.Printf( _( "File \"%s\" loaded" ), GetChars( filename ) );
SetStatusText( msg );
}
}
@ -157,12 +157,12 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event )
case wxID_SAVE:
if( !SavePageLayoutDescrFile( filename ) )
{
msg.Printf( _( "Unable to write <%s>" ), GetChars( filename ) );
msg.Printf( _( "Unable to write \"%s\"" ), GetChars( filename ) );
wxMessageBox( msg );
}
else
{
msg.Printf( _("File <%s> written"), GetChars( filename ) );
msg.Printf( _("File \"%s\" written"), GetChars( filename ) );
SetStatusText( msg );
}
break;
@ -187,13 +187,13 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event )
if( !SavePageLayoutDescrFile( filename ) )
{
msg.Printf( _("Unable to create <%s>"), GetChars( filename ) );
msg.Printf( _("Unable to create \"%s\""), GetChars( filename ) );
wxMessageBox( msg );
}
else
{
msg.Printf( _("File <%s> written"), GetChars( filename ) );
msg.Printf( _("File \"%s\" written"), GetChars( filename ) );
SetStatusText( msg );
if( GetCurrFileName().IsEmpty() )

2
pagelayout_editor/pl_editor.cpp
View File

@ -183,7 +183,7 @@ bool MYFACE::OnKifaceStart( PGM_BASE* aProgram )
if( !success )
{
wxString msg;
msg.Printf( _("Error when loading file <%s>"),
msg.Printf( _("Error when loading file \"%s\""),
fn.GetFullPath().GetData() );
wxMessageBox( msg );
}

10
pagelayout_editor/pl_editor_frame.cpp
View File

@ -199,7 +199,7 @@ bool PL_EDITOR_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, i
if( !LoadPageLayoutDescrFile( fn ) )
{
wxString msg = wxString::Format(
_( "Error when loading file '%s'" ),
_( "Error when loading file \"%s\"" ),
GetChars( fn )
);
@ -224,7 +224,7 @@ void PL_EDITOR_FRAME::OnCloseWindow( wxCloseEvent& Event )
if( filename.IsEmpty() )
msg = _( "Save changes in a new file before closing?" );
else
msg.Printf( _( "Save the changes in\n<%s>\nbefore closing?" ),
msg.Printf( _( "Save the changes in\n\"%s\"\nbefore closing?" ),
GetChars( filename ) );
int ii = DisplayExitDialog( this, msg );
@ -254,7 +254,7 @@ void PL_EDITOR_FRAME::OnCloseWindow( wxCloseEvent& Event )
if( !SavePageLayoutDescrFile( filename ) )
{
msg.Printf( _( "Unable to create <%s>" ), GetChars( filename ) );
msg.Printf( _( "Unable to create \"%s\"" ), GetChars( filename ) );
wxMessageBox( msg );
}
}
@ -642,7 +642,7 @@ WORKSHEET_DATAITEM * PL_EDITOR_FRAME::AddPageLayoutItem( int aType, int aIdx )
if( !wxFileExists( fullFilename ) )
{
wxMessageBox( _( "Couldn't load image from <%s>" ), GetChars( fullFilename ) );
wxMessageBox( _( "Couldn't load image from \"%s\"" ), GetChars( fullFilename ) );
break;
}
@ -650,7 +650,7 @@ WORKSHEET_DATAITEM * PL_EDITOR_FRAME::AddPageLayoutItem( int aType, int aIdx )
if( !image->ReadImageFile( fullFilename ) )
{
wxMessageBox( _( "Couldn't load image from <%s>" ),
wxMessageBox( _( "Couldn't load image from \"%s\"" ),
GetChars( fullFilename ) );
delete image;
break;

2
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -154,7 +154,7 @@ void PCB_CALCULATOR_FRAME::OnClosePcbCalc( wxCloseEvent& event )
if( !WriteDataFile() )
{
wxString msg;
msg.Printf( _("Unable to write file<%s>\n"\
msg.Printf( _("Unable to write file\"%s\"\n"\
"Do you want to exit and abandon your change?"),
GetDataFilename().c_str() );

2
pcb_calculator/regulators_funct.cpp
View File

@ -260,7 +260,7 @@ void PCB_CALCULATOR_FRAME::OnDataFileSelection( wxCommandEvent& event )
else
{
wxString msg;
msg.Printf( _("Unable to read data file <%s>"), GetChars( fullfilename ) );
msg.Printf( _("Unable to read data file \"%s\""), GetChars( fullfilename ) );
wxMessageBox( msg );
}
}

2
pcbnew/board_netlist_updater.cpp
View File

@ -518,7 +518,7 @@ bool BOARD_NETLIST_UPDATER::deleteSinglePadNets()
GetChars( previouspad->GetNetname() ) );
m_reporter->Report( msg, REPORTER::RPT_ACTION );
msg.Printf( _( "Remove single pad net \"%s\" on \"%s\" pad '%s'\n" ),
msg.Printf( _( "Remove single pad net \"%s\" on \"%s\" pad \"%s\"\n" ),
GetChars( previouspad->GetNetname() ),
GetChars( previouspad->GetParent()->GetReference() ),
GetChars( previouspad->GetName() ) );

2
pcbnew/build_BOM_from_board.cpp
View File

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

6
pcbnew/class_board.cpp
View File

@ -2737,7 +2737,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
msg.Printf( _( "Remove single pad net \"%s\" on \"%s\" pad '%s'\n" ),
msg.Printf( _( "Remove single pad net \"%s\" on \"%s\" pad \"%s\"\n" ),
GetChars( pad->GetNetname() ),
GetChars( pad->GetParent()->GetReference() ),
GetChars( pad->GetName() ) );
@ -2781,7 +2781,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
continue; // OK, pad found
// not found: bad footprint, report error
msg.Printf( _( "Component '%s' pad '%s' not found in footprint '%s'\n" ),
msg.Printf( _( "Component \"%s\" pad \"%s\" not found in footprint \"%s\"\n" ),
GetChars( component->GetReference() ),
GetChars( padname ),
GetChars( footprint->GetFPID().Format() ) );
@ -2799,7 +2799,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
if( m_connectivity->GetPadCount( zone->GetNetCode() ) == 0 )
{
msg.Printf( _( "Copper zone (net name '%s'): net has no pads connected." ),
msg.Printf( _( "Copper zone (net name \"%s\"): net has no pads connected." ),
GetChars( zone->GetNet()->GetNetname() ) );
aReporter->Report( msg, REPORTER::RPT_WARNING );
}

2
pcbnew/cross-probing.cpp
View File

@ -79,7 +79,7 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
}
else if( strcmp( idcmd, "$SHEET:" ) == 0 )
{
msg.Printf( _( "Selecting all from sheet '%s'" ), FROM_UTF8( text ) );
msg.Printf( _( "Selecting all from sheet \"%s\"" ), FROM_UTF8( text ) );
wxString sheetStamp( FROM_UTF8( text ) );
SetStatusText( msg );
GetToolManager()->RunAction( PCB_ACTIONS::selectOnSheetFromEeschema, true,

6
pcbnew/dialogs/dialog_SVG_print.cpp
View File

@ -271,7 +271,7 @@ void DIALOG_SVG_PRINT::ExportSVGFile( bool aOnlyOneFile )
if( !EnsureFileDirectoryExists( &outputDir, boardFilename, &reporter ) )
{
wxString msg = wxString::Format(
_( "Could not write plot files to folder '%s'." ),
_( "Could not write plot files to folder \"%s\"." ),
GetChars( outputDir.GetPath() )
);
DisplayError( this, msg );
@ -302,13 +302,13 @@ void DIALOG_SVG_PRINT::ExportSVGFile( bool aOnlyOneFile )
if( CreateSVGFile( fn.GetFullPath(), aOnlyOneFile ) )
{
reporter.Report (
wxString::Format( _( "Plot: '%s' OK." ), GetChars( fn.GetFullPath() ) ),
wxString::Format( _( "Plot: \"%s\" OK." ), GetChars( fn.GetFullPath() ) ),
REPORTER::RPT_ACTION );
}
else // Error
{
reporter.Report (
wxString::Format( _( "Unable to create file '%s'." ), GetChars( fn.GetFullPath() ) ),
wxString::Format( _( "Unable to create file \"%s\"." ), GetChars( fn.GetFullPath() ) ),
REPORTER::RPT_ERROR );
}

4
pcbnew/dialogs/dialog_drc.cpp
View File

@ -221,7 +221,7 @@ void DIALOG_DRC_CONTROL::OnStartdrcClick( wxCommandEvent& event )
popupWindow.ShowModal();
}
else
DisplayError( this, wxString::Format( _( "Unable to create report file '%s' "),
DisplayError( this, wxString::Format( _( "Unable to create report file \"%s\" "),
GetChars( reportName ) ) );
}
@ -290,7 +290,7 @@ void DIALOG_DRC_CONTROL::OnListUnconnectedClick( wxCommandEvent& event )
popupWindow.ShowModal();
}
else
DisplayError( this, wxString::Format( _( "Unable to create report file '%s'"),
DisplayError( this, wxString::Format( _( "Unable to create report file \"%s\""),
GetChars( reportName ) ) );
}

2
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
View File

@ -449,7 +449,7 @@ bool DIALOG_MODULE_MODULE_EDITOR::TransferDataFromWindow()
if( ! MODULE::IsLibNameValid( footprintName ) )
{
msg.Printf( _( "Error:\n"
"one of invalid chars <%s> found\nin <%s>" ),
"one of invalid chars \"%s\" found\nin \"%s\"" ),
MODULE::StringLibNameInvalidChars( true ),
GetChars( footprintName ) );

12
pcbnew/dialogs/dialog_exchange_modules.cpp
View File

@ -79,7 +79,7 @@ void DIALOG_EXCHANGE_MODULE::init()
m_CmpValue->AppendText( m_currentModule->GetValue() );
m_CmpReference->AppendText( m_currentModule->GetReference() );
m_Selection->SetString( 0, wxString::Format(
_( "Change footprint of '%s'" ),
_( "Change footprint of \"%s\"" ),
GetChars( m_currentModule->GetReference() ) ) );
wxString fpname = m_CurrentFootprintFPID->GetValue().AfterLast( ':' );
@ -87,7 +87,7 @@ void DIALOG_EXCHANGE_MODULE::init()
fpname = m_CurrentFootprintFPID->GetValue();
m_Selection->SetString( 1, wxString::Format(
_( "Change footprints '%s'" ),
_( "Change footprints \"%s\"" ),
GetChars( fpname.Left( 12 ) ) ) );
m_Selection->SetSelection( m_selectionMode );
@ -171,12 +171,12 @@ void DIALOG_EXCHANGE_MODULE::RebuildCmpList( wxCommandEvent& event )
if( RecreateCmpFile( m_parent->GetBoard(), fn.GetFullPath() ) )
{
msg.Printf( _( "File '%s' created\n" ), GetChars( fn.GetFullPath() ) );
msg.Printf( _( "File \"%s\" created\n" ), GetChars( fn.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_INFO );
}
else
{
msg.Printf( _( "** Could not create file '%s' ***\n" ),
msg.Printf( _( "** Could not create file \"%s\" ***\n" ),
GetChars( fn.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}
@ -315,7 +315,7 @@ bool DIALOG_EXCHANGE_MODULE::change_1_Module( MODULE* aModule,
LIB_ID oldFootprintFPID = aModule->GetFPID();
// Load module.
msg.Printf( _( "Change footprint '%s' (from '%s') to '%s'" ),
msg.Printf( _( "Change footprint \"%s\" (from \"%s\") to \"%s\"" ),
GetChars( aModule->GetReference() ),
oldFootprintFPID.Format().c_str(),
aNewFootprintFPID.Format().c_str() );
@ -441,7 +441,7 @@ void PCB_EDIT_FRAME::RecreateCmpFileFromBoard( wxCommandEvent& aEvent )
if( ! RecreateCmpFile( GetBoard(), fn.GetFullPath() ) )
{
msg.Printf( _( "Could not create file '%s'" ), GetChars(fn.GetFullPath() ) );
msg.Printf( _( "Could not create file \"%s\"" ), GetChars(fn.GetFullPath() ) );
DisplayError( this, msg );
return;
}

2
pcbnew/dialogs/dialog_export_vrml.cpp
View File

@ -250,7 +250,7 @@ void PCB_EDIT_FRAME::OnExportVRML( wxCommandEvent& event )
usePlainPCB, modelPath.GetPath(), aXRef, aYRef ) )
{
wxString msg;
msg.Printf( _( "Unable to create file '%s'" ), GetChars( last_vrmlName ) );
msg.Printf( _( "Unable to create file \"%s\"" ), GetChars( last_vrmlName ) );
wxMessageBox( msg );
return;
}

4
pcbnew/dialogs/dialog_find.cpp
View File

@ -128,7 +128,7 @@ void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
if( foundItem )
{
parent->SetCurItem( foundItem );
msg.Printf( _( "<%s> found" ), GetChars( searchString ) );
msg.Printf( _( "\"%s\" found" ), GetChars( searchString ) );
parent->SetStatusText( msg );
parent->CursorGoto( pos, !m_NoMouseWarpCheckBox->IsChecked() );
@ -136,7 +136,7 @@ void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
else
{
parent->SetStatusText( wxEmptyString );
msg.Printf( _( "<%s> not found" ), GetChars( searchString ) );
msg.Printf( _( "\"%s\" not found" ), GetChars( searchString ) );
DisplayError( this, msg, 10 );
itemCount = 0;
}

4
pcbnew/dialogs/dialog_fp_lib_table.cpp
View File

@ -300,7 +300,7 @@ private:
else if( nick.find( ':' ) != size_t( -1 ) )
{
wxString msg = wxString::Format(
_( "Illegal character '%s' found in Nickname: '%s' in row %d" ),
_( "Illegal character \"%s\" found in Nickname: \"%s\" in row %d" ),
":", GetChars( nick ), r );
// show the tabbed panel holding the grid we have flunked:
@ -344,7 +344,7 @@ private:
if( nick1 == nick2 )
{
wxString msg = wxString::Format(
_( "Duplicate Nickname: '%s' in rows %d and %d" ),
_( "Duplicate Nickname: \"%s\" in rows %d and %d" ),
GetChars( nick1 ), r1+1, r2+1
);

2
pcbnew/dialogs/dialog_fp_plugin_options.cpp
View File

@ -61,7 +61,7 @@ public:
m_initial_help( INITIAL_HELP )
{
wxString title = wxString::Format(
_( "Options for Library '%s'" ), GetChars( aNickname ) );
_( "Options for Library \"%s\"" ), GetChars( aNickname ) );
SetTitle( title );

2
pcbnew/dialogs/dialog_gendrill.cpp
View File

@ -331,7 +331,7 @@ void DIALOG_GENDRILL::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
fn = Prj().AbsolutePath( m_parent->GetBoard()->GetFileName() );
wxString defaultPath = fn.GetPathWithSep();
wxString msg;
msg.Printf( _( "Do you want to use a path relative to\n'%s'" ), GetChars( defaultPath ) );
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ), GetChars( defaultPath ) );
wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );

6
pcbnew/dialogs/dialog_plot.cpp
View File

@ -359,7 +359,7 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
fn = Prj().AbsolutePath( m_parent->GetBoard()->GetFileName() );
wxString defaultPath = fn.GetPathWithSep();
wxString msg;
msg.Printf( _( "Do you want to use a path relative to\n'%s'" ),
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ),
GetChars( defaultPath ) );
wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
@ -868,12 +868,12 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
plotter->EndPlot();
delete plotter;
msg.Printf( _( "Plot file '%s' created." ), GetChars( fn.GetFullPath() ) );
msg.Printf( _( "Plot file \"%s\" created." ), GetChars( fn.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ACTION );
}
else
{
msg.Printf( _( "Unable to create file '%s'." ), GetChars( fn.GetFullPath() ) );
msg.Printf( _( "Unable to create file \"%s\"." ), GetChars( fn.GetFullPath() ) );
reporter.Report( msg, REPORTER::RPT_ERROR );
}
}

2
pcbnew/dialogs/wizard_add_fplib.cpp
View File

@ -670,7 +670,7 @@ bool WIZARD_FPLIB_TABLE::downloadGithubLibsFromList( wxArrayString& aUrlList,
catch( const IO_ERROR& ioe )
{
if( aErrorMessage )
aErrorMessage->Printf( _( "Error:\n'%s'\nwhile downloading library:\n'%s'" ),
aErrorMessage->Printf( _( "Error:\n\"%s\"\nwhile downloading library:\n\"%s\"" ),
GetChars( ioe.What() ), GetChars( libsrc_name ) );
return false;
}

20
pcbnew/drc.cpp
View File

@ -512,7 +512,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
#if 0 // set to 1 when (if...) BOARD_DESIGN_SETTINGS has a m_MinClearance value
if( nc->GetClearance() < g.m_MinClearance )
{
msg.Printf( _( "NETCLASS: '%s' has Clearance:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has Clearance:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetClearance() ),
FmtVal( g.m_TrackClearance )
@ -526,7 +526,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
if( nc->GetTrackWidth() < g.m_TrackMinWidth )
{
msg.Printf( _( "NETCLASS: '%s' has TrackWidth:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has TrackWidth:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetTrackWidth() ),
FmtVal( g.m_TrackMinWidth )
@ -539,7 +539,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
if( nc->GetViaDiameter() < g.m_ViasMinSize )
{
msg.Printf( _( "NETCLASS: '%s' has Via Dia:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has Via Dia:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetViaDiameter() ),
FmtVal( g.m_ViasMinSize )
@ -552,7 +552,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
if( nc->GetViaDrill() < g.m_ViasMinDrill )
{
msg.Printf( _( "NETCLASS: '%s' has Via Drill:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has Via Drill:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetViaDrill() ),
FmtVal( g.m_ViasMinDrill )
@ -565,7 +565,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
if( nc->GetuViaDiameter() < g.m_MicroViasMinSize )
{
msg.Printf( _( "NETCLASS: '%s' has uVia Dia:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has uVia Dia:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetuViaDiameter() ),
FmtVal( g.m_MicroViasMinSize )
@ -578,7 +578,7 @@ bool DRC::doNetClass( NETCLASSPTR nc, wxString& msg )
if( nc->GetuViaDrill() < g.m_MicroViasMinDrill )
{
msg.Printf( _( "NETCLASS: '%s' has uVia Drill:%s which is less than global:%s" ),
msg.Printf( _( "NETCLASS: \"%s\" has uVia Drill:%s which is less than global:%s" ),
GetChars( nc->GetName() ),
FmtVal( nc->GetuViaDrill() ),
FmtVal( g.m_MicroViasMinDrill )
@ -1153,7 +1153,7 @@ bool DRC::doFootprintOverlappingDrc()
if( !is_ok && m_doFootprintOverlapping )
{
msg.Printf( _( "footprint '%s' has malformed courtyard" ),
msg.Printf( _( "footprint \"%s\" has malformed courtyard" ),
footprint->GetReference().GetData() );
m_currentMarker = fillMarker( footprint->GetPosition(),
DRCE_MALFORMED_COURTYARD_IN_FOOTPRINT,
@ -1170,7 +1170,7 @@ bool DRC::doFootprintOverlappingDrc()
footprint->GetPolyCourtyardBack().OutlineCount() == 0 &&
is_ok )
{
msg.Printf( _( "footprint '%s' has no courtyard defined" ),
msg.Printf( _( "footprint \"%s\" has no courtyard defined" ),
footprint->GetReference().GetData() );
m_currentMarker = fillMarker( footprint->GetPosition(),
DRCE_MISSING_COURTYARD_IN_FOOTPRINT,
@ -1208,7 +1208,7 @@ bool DRC::doFootprintOverlappingDrc()
if( courtyard.OutlineCount() )
{
//Overlap between footprint and candidate
msg.Printf( _( "footprints '%s' and '%s' overlap on front (top) layer" ),
msg.Printf( _( "footprints \"%s\" and \"%s\" overlap on front (top) layer" ),
footprint->GetReference().GetData(),
candidate->GetReference().GetData() );
VECTOR2I& pos = courtyard.Vertex( 0, 0, -1 );
@ -1243,7 +1243,7 @@ bool DRC::doFootprintOverlappingDrc()
if( courtyard.OutlineCount() )
{
//Overlap between footprint and candidate
msg.Printf( _( "footprints '%s' and '%s' overlap on back (bottom) layer" ),
msg.Printf( _( "footprints \"%s\" and \"%s\" overlap on back (bottom) layer" ),
footprint->GetReference().GetData(),
candidate->GetReference().GetData() );
VECTOR2I& pos = courtyard.Vertex( 0, 0, -1 );

10
pcbnew/eagle_plugin.cpp
View File

@ -200,7 +200,7 @@ BOARD* EAGLE_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, const
wxFileName fn = aFileName;
if( !xmlDocument.Load( fn.GetFullPath() ) )
THROW_IO_ERROR( wxString::Format( _( "Unable to read file '%s'" ),
THROW_IO_ERROR( wxString::Format( _( "Unable to read file \"%s\"" ),
fn.GetFullPath() ) );
doc = xmlDocument.GetRoot();
@ -788,7 +788,7 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const string* aLibName )
wxString pkg = FROM_UTF8( pack_name.c_str() );
wxString emsg = wxString::Format(
_( "<package> name: '%s' duplicated in eagle <library>: '%s'" ),
_( "<package> name: \"%s\" duplicated in eagle <library>: \"%s\"" ),
GetChars( pkg ),
GetChars( lib )
);
@ -862,7 +862,7 @@ void EAGLE_PLUGIN::loadElements( wxXmlNode* aElements )
if( mi == m_templates.end() )
{
wxString emsg = wxString::Format( _( "No '%s' package in library '%s'" ),
wxString emsg = wxString::Format( _( "No \"%s\" package in library \"%s\"" ),
GetChars( FROM_UTF8( e.package.c_str() ) ),
GetChars( FROM_UTF8( e.library.c_str() ) ) );
THROW_IO_ERROR( emsg );
@ -2075,7 +2075,7 @@ wxDateTime EAGLE_PLUGIN::getModificationTime( const wxString& aPath )
if( !fn.IsFileReadable() )
{
wxString msg = wxString::Format(
_( "File '%s' is not readable." ),
_( "File \"%s\" is not readable." ),
GetChars( aPath ) );
THROW_IO_ERROR( msg );
@ -2130,7 +2130,7 @@ void EAGLE_PLUGIN::cacheLib( const wxString& aLibPath )
wxFileName fn( filename );
if( !xmlDocument.Load( fn.GetFullPath() ) )
THROW_IO_ERROR( wxString::Format( _( "Unable to read file '%s'" ),
THROW_IO_ERROR( wxString::Format( _( "Unable to read file \"%s\"" ),
fn.GetFullPath() ) );
doc = xmlDocument.GetRoot();

2
pcbnew/exporters/export_gencad.cpp
View File

@ -284,7 +284,7 @@ void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent )
if( !file )
{
DisplayError( this, wxString::Format( _( "Unable to create <%s>" ),
DisplayError( this, wxString::Format( _( "Unable to create \"%s\"" ),
GetChars( optionsDialog.GetFileName() ) ) );
return;
}

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

Write Preview
Loading…
Cancel
Save