kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #32109
[PATCH] 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.
---
bitmap2component/bitmap2cmp_gui.cpp | 8 ++---
common/basicframe.cpp | 16 +++++-----
common/common.cpp | 6 ++--
common/dialogs/dialog_env_var_config.cpp | 2 +-
common/dialogs/dialog_page_settings.cpp | 6 ++--
common/dialogs/wx_html_report_panel.cpp | 2 +-
common/dsnlexer.cpp | 10 +++---
common/eda_doc.cpp | 4 +--
common/exceptions.cpp | 2 +-
common/footprint_info.cpp | 2 +-
common/fp_lib_table.cpp | 6 ++--
common/gestfich.cpp | 6 ++--
common/kiway.cpp | 6 ++--
common/project.cpp | 4 +--
common/richio.cpp | 6 ++--
common/tool/tool_manager.cpp | 2 +-
common/widgets/widget_hotkey_list.cpp | 2 +-
cvpcb/autosel.cpp | 4 +--
cvpcb/cfg.cpp | 2 +-
cvpcb/class_DisplayFootprintsFrame.cpp | 6 ++--
cvpcb/cvpcb_mainframe.cpp | 4 +--
cvpcb/dialogs/dialog_config_equfiles.cpp | 4 +--
cvpcb/readwrite_dlgs.cpp | 6 ++--
eeschema/backanno.cpp | 2 +-
eeschema/block.cpp | 2 +-
eeschema/class_library.cpp | 10 +++---
eeschema/cmp_tree_model_adapter_base.cpp | 2 +-
eeschema/dialogs/dialog_bom.cpp | 2 +-
eeschema/dialogs/dialog_edit_component_in_lib.cpp | 10 +++---
.../dialogs/dialog_edit_component_in_schematic.cpp | 12 ++++----
eeschema/dialogs/dialog_edit_components_libid.cpp | 2 +-
.../dialogs/dialog_global_sym_lib_table_config.cpp | 8 ++---
eeschema/dialogs/dialog_plot_schematic.cpp | 4 +--
eeschema/dialogs/dialog_sym_lib_table.cpp | 4 +--
eeschema/dialogs/dialog_symbol_remap.cpp | 26 ++++++++--------
eeschema/edit_bitmap.cpp | 4 +--
eeschema/edit_component_in_schematic.cpp | 2 +-
eeschema/erc.cpp | 8 ++---
eeschema/files-io.cpp | 30 +++++++++---------
eeschema/getpart.cpp | 2 +-
eeschema/lib_export.cpp | 16 +++++-----
eeschema/libarch.cpp | 2 +-
eeschema/libedit.cpp | 16 +++++-----
eeschema/libedit_plot_component.cpp | 2 +-
eeschema/libeditframe.cpp | 6 ++--
eeschema/libfield.cpp | 6 ++--
.../netlist_exporters/netlist_exporter_cadstar.cpp | 2 +-
.../netlist_exporter_orcadpcb2.cpp | 2 +-
eeschema/plot_schematic_DXF.cpp | 4 +--
eeschema/plot_schematic_HPGL.cpp | 4 +--
eeschema/plot_schematic_PDF.cpp | 4 +--
eeschema/plot_schematic_PS.cpp | 4 +--
eeschema/plot_schematic_SVG.cpp | 4 +--
eeschema/project_rescue.cpp | 2 +-
eeschema/sch_base_frame.cpp | 2 +-
eeschema/sch_eagle_plugin.cpp | 4 +--
eeschema/sch_io_mgr.cpp | 4 +--
eeschema/sch_legacy_plugin.cpp | 12 ++++----
eeschema/sch_plugin.cpp | 2 +-
eeschema/schframe.cpp | 6 ++--
eeschema/selpart.cpp | 4 +--
eeschema/sheet.cpp | 20 ++++++------
eeschema/sim/spice_value.cpp | 2 +-
eeschema/symbedit.cpp | 10 +++---
eeschema/symbol_lib_table.cpp | 6 ++--
gerbview/events_called_functions.cpp | 2 +-
gerbview/export_to_pcbnew.cpp | 2 +-
gerbview/files.cpp | 6 ++--
gerbview/gerbview_frame.cpp | 2 +-
gerbview/onrightclick.cpp | 6 ++--
gerbview/readgerb.cpp | 2 +-
gerbview/tools/selection_tool.cpp | 6 ++--
kicad/class_treeproject_item.cpp | 2 +-
kicad/files-io.cpp | 14 ++++-----
kicad/prjconfig.cpp | 4 +--
kicad/project_template.cpp | 4 +--
kicad/tree_project_frame.cpp | 2 +-
new/sch_lib.cpp | 2 +-
pagelayout_editor/files.cpp | 14 ++++-----
pagelayout_editor/pl_editor.cpp | 2 +-
pagelayout_editor/pl_editor_frame.cpp | 10 +++---
pcb_calculator/pcb_calculator_frame.cpp | 2 +-
pcb_calculator/regulators_funct.cpp | 2 +-
pcbnew/board_netlist_updater.cpp | 2 +-
pcbnew/build_BOM_from_board.cpp | 2 +-
pcbnew/class_board.cpp | 6 ++--
pcbnew/cross-probing.cpp | 2 +-
pcbnew/dialogs/dialog_SVG_print.cpp | 6 ++--
pcbnew/dialogs/dialog_drc.cpp | 4 +--
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp | 2 +-
pcbnew/dialogs/dialog_exchange_modules.cpp | 12 ++++----
pcbnew/dialogs/dialog_export_vrml.cpp | 2 +-
pcbnew/dialogs/dialog_find.cpp | 4 +--
pcbnew/dialogs/dialog_fp_lib_table.cpp | 4 +--
pcbnew/dialogs/dialog_fp_plugin_options.cpp | 2 +-
pcbnew/dialogs/dialog_gendrill.cpp | 2 +-
pcbnew/dialogs/dialog_plot.cpp | 6 ++--
pcbnew/dialogs/wizard_add_fplib.cpp | 2 +-
pcbnew/drc.cpp | 20 ++++++------
pcbnew/eagle_plugin.cpp | 10 +++---
pcbnew/exporters/export_gencad.cpp | 2 +-
pcbnew/exporters/gen_modules_placefile.cpp | 14 ++++-----
pcbnew/exporters/gerber_jobfile_writer.cpp | 4 +--
pcbnew/files.cpp | 26 ++++++++--------
pcbnew/github/github_getliblist.cpp | 4 +--
pcbnew/github/github_plugin.cpp | 18 +++++------
pcbnew/gpcb_plugin.cpp | 20 ++++++------
pcbnew/io_mgr.cpp | 4 +--
pcbnew/kicad_netlist_reader.cpp | 2 +-
pcbnew/kicad_plugin.cpp | 32 +++++++++----------
pcbnew/legacy_plugin.cpp | 36 +++++++++++-----------
pcbnew/librairi.cpp | 32 +++++++++----------
pcbnew/loadcmp.cpp | 8 ++---
pcbnew/netlist.cpp | 8 ++---
pcbnew/netlist_reader.cpp | 2 +-
pcbnew/pcb_parser.cpp | 24 +++++++--------
pcbnew/pcbframe.cpp | 4 +--
pcbnew/plugin.cpp | 2 +-
pcbnew/specctra_export.cpp | 4 +--
tools/io_benchmark/stdstream_line_reader.cpp | 2 +-
tools/property_tree.cpp | 2 +-
121 files changed, 407 insertions(+), 407 deletions(-)
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 650192c35..852434e99 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -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;
}
diff --git a/common/basicframe.cpp b/common/basicframe.cpp
index 5b329783c..2634169ff 100644
--- a/common/basicframe.cpp
+++ b/common/basicframe.cpp
@@ -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 );
}
diff --git a/common/common.cpp b/common/common.cpp
index b101fa26c..0c5e40abf 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -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 );
}
diff --git a/common/dialogs/dialog_env_var_config.cpp b/common/dialogs/dialog_env_var_config.cpp
index fedca94b0..5b4eb39b6 100644
--- a/common/dialogs/dialog_env_var_config.cpp
+++ b/common/dialogs/dialog_env_var_config.cpp
@@ -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 "
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index e45e58c10..eb66860a2 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -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;
diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index 0a057c4c8..57937b6db 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -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;
diff --git a/common/dsnlexer.cpp b/common/dsnlexer.cpp
index 696ebcced..4a563bf80 100644
--- a/common/dsnlexer.cpp
+++ b/common/dsnlexer.cpp
@@ -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;
diff --git a/common/eda_doc.cpp b/common/eda_doc.cpp
index 608a6b3e4..45d84f20c 100644
--- a/common/eda_doc.cpp
+++ b/common/eda_doc.cpp
@@ -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 );
}
diff --git a/common/exceptions.cpp b/common/exceptions.cpp
index 12d49f475..127f52eca 100644
--- a/common/exceptions.cpp
+++ b/common/exceptions.cpp
@@ -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
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index dd6be254b..a39de4fe3 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -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();
diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 8eff009ef..a51a1c94f 100644
--- a/common/fp_lib_table.cpp
+++ b/common/fp_lib_table.cpp
@@ -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() ) ) );
}
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index 4e6fea79a..b95892fd4 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -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 );
}
diff --git a/common/kiway.cpp b/common/kiway.cpp
index b8ca1357b..7802b88e3 100644
--- a/common/kiway.cpp
+++ b/common/kiway.cpp
@@ -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" );
diff --git a/common/project.cpp b/common/project.cpp
index bb727c3b7..f5799615c 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -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;
}
diff --git a/common/richio.cpp b/common/richio.cpp
index 72ae9391c..2f32a245a 100644
--- a/common/richio.cpp
+++ b/common/richio.cpp
@@ -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 );
}
diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 4bf9cb448..03cfd9499 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -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 );
diff --git a/common/widgets/widget_hotkey_list.cpp b/common/widgets/widget_hotkey_list.cpp
index 97e9bb87a..66b38ad04 100644
--- a/common/widgets/widget_hotkey_list.cpp
+++ b/common/widgets/widget_hotkey_list.cpp
@@ -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) );
diff --git a/cvpcb/autosel.cpp b/cvpcb/autosel.cpp
index 47f3dc031..21a173bfc 100644
--- a/cvpcb/autosel.cpp
+++ b/cvpcb/autosel.cpp
@@ -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");
diff --git a/cvpcb/cfg.cpp b/cvpcb/cfg.cpp
index fe8006400..740776b2d 100644
--- a/cvpcb/cfg.cpp
+++ b/cvpcb/cfg.cpp
@@ -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;
}
diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/class_DisplayFootprintsFrame.cpp
index fa61b768c..352d43912 100644
--- a/cvpcb/class_DisplayFootprintsFrame.cpp
+++ b/cvpcb/class_DisplayFootprintsFrame.cpp
@@ -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;
}
diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index 8afec3b56..60eb48731 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -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() )
);
diff --git a/cvpcb/dialogs/dialog_config_equfiles.cpp b/cvpcb/dialogs/dialog_config_equfiles.cpp
index 6d41a5bc4..2f9c78127 100644
--- a/cvpcb/dialogs/dialog_config_equfiles.cpp
+++ b/cvpcb/dialogs/dialog_config_equfiles.cpp
@@ -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 );
}
}
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index 4afc7befb..c0449c0a5 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -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() )
);
diff --git a/eeschema/backanno.cpp b/eeschema/backanno.cpp
index e194c7110..f7ee7d35c 100644
--- a/eeschema/backanno.cpp
+++ b/eeschema/backanno.cpp
@@ -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 );
diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index b092d523d..c088022a3 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -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 );
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 8bf99133a..df08eda81 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -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." )
@@ -510,7 +510,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 );
@@ -522,7 +522,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 );
@@ -637,7 +637,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 );
@@ -661,7 +661,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() )
);
diff --git a/eeschema/cmp_tree_model_adapter_base.cpp b/eeschema/cmp_tree_model_adapter_base.cpp
index 9aef10ec7..60ecf2630 100644
--- a/eeschema/cmp_tree_model_adapter_base.cpp
+++ b/eeschema/cmp_tree_model_adapter_base.cpp
@@ -118,7 +118,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 );
}
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 934e4bf49..7bf956e05 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -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;
}
diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
index ca3639e8e..f9645a9b8 100644
--- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
@@ -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;
}
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 2cf68e072..aa7627cf5 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -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?" ),
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index d440fc734..e7db4586f 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -359,7 +359,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;
}
diff --git a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp b/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
index e30d264bc..d1d439324 100644
--- a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
+++ b/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
@@ -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;
}
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 138dc4a75..42fed470a 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -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 );
}
diff --git a/eeschema/dialogs/dialog_sym_lib_table.cpp b/eeschema/dialogs/dialog_sym_lib_table.cpp
index 835231038..f3a794c67 100644
--- a/eeschema/dialogs/dialog_sym_lib_table.cpp
+++ b/eeschema/dialogs/dialog_sym_lib_table.cpp
@@ -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
);
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index 41c1cdaaf..15fabc5db 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap.cpp
@@ -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() )
diff --git a/eeschema/edit_bitmap.cpp b/eeschema/edit_bitmap.cpp
index d49efcda8..058e51580 100644
--- a/eeschema/edit_bitmap.cpp
+++ b/eeschema/edit_bitmap.cpp
@@ -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;
}
diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp
index 32f53cd63..bcb0bb33f 100644
--- a/eeschema/edit_component_in_schematic.cpp
+++ b/eeschema/edit_component_in_schematic.cpp
@@ -66,7 +66,7 @@ void SCH_EDIT_FRAME::EditComponentFieldText( SCH_FIELD* aField )
LIB_PART* part = ( alias ) ? alias->GetPart() : NULL;
- wxCHECK_RET( part, wxString::Format( "Symbol '%s' not found in library '%s'",
+ wxCHECK_RET( part, wxString::Format( "Symbol \"%s\" not found in library \"%s\"",
id.GetLibItemName().wx_str(),
id.GetLibNickname().wx_str() ) );
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 733c507b2..260bc0fa7 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -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 );
}
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 94b0daeee..51fa0873d 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -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 ) )
@@ -302,11 +302,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;
@@ -437,10 +437,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;
@@ -458,7 +458,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 );
@@ -505,7 +505,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() );
}
@@ -669,7 +669,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;
@@ -748,7 +748,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;
@@ -794,11 +794,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;
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 099b8ce13..d591f8c25 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -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;
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index d1939e1a5..04f1eb827 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -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 );
}
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 3935c4dc7..df3f4ed1b 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -147,7 +147,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;
}
diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp
index e438c4412..00cb6e741 100644
--- a/eeschema/libedit.cpp
+++ b/eeschema/libedit.cpp
@@ -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();
diff --git a/eeschema/libedit_plot_component.cpp b/eeschema/libedit_plot_component.cpp
index 11536865b..aa3c4c4e8 100644
--- a/eeschema/libedit_plot_component.cpp
+++ b/eeschema/libedit_plot_component.cpp
@@ -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 );
}
diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp
index 809e5eb5b..80f16819f 100644
--- a/eeschema/libeditframe.cpp
+++ b/eeschema/libeditframe.cpp
@@ -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;
}
@@ -1626,7 +1626,7 @@ void LIB_EDIT_FRAME::SyncLibraries()
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 ) );
} );
if( tree )
diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp
index 5e11226aa..852158d64 100644
--- a/eeschema/libfield.cpp
+++ b/eeschema/libfield.cpp
@@ -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 );
diff --git a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
index 8b3bf6594..181901b1b 100644
--- a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
@@ -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;
diff --git a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
index 8532a9815..76e668e0a 100644
--- a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
@@ -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;
diff --git a/eeschema/plot_schematic_DXF.cpp b/eeschema/plot_schematic_DXF.cpp
index 567e6edfe..967e1b250 100644
--- a/eeschema/plot_schematic_DXF.cpp
+++ b/eeschema/plot_schematic_DXF.cpp
@@ -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 );
}
diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp
index 224c89fad..2844c109b 100644
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@@ -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 );
}
diff --git a/eeschema/plot_schematic_PDF.cpp b/eeschema/plot_schematic_PDF.cpp
index 11479672c..6ca854a92 100644
--- a/eeschema/plot_schematic_PDF.cpp
+++ b/eeschema/plot_schematic_PDF.cpp
@@ -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 );
diff --git a/eeschema/plot_schematic_PS.cpp b/eeschema/plot_schematic_PS.cpp
index a87d9e364..e34a57bcc 100644
--- a/eeschema/plot_schematic_PS.cpp
+++ b/eeschema/plot_schematic_PS.cpp
@@ -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 );
}
diff --git a/eeschema/plot_schematic_SVG.cpp b/eeschema/plot_schematic_SVG.cpp
index e326b3d31..dea617d96 100644
--- a/eeschema/plot_schematic_SVG.cpp
+++ b/eeschema/plot_schematic_SVG.cpp
@@ -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 );
}
diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp
index 61a096ac0..840721527 100644
--- a/eeschema/project_rescue.cpp
+++ b/eeschema/project_rescue.cpp
@@ -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;
diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp
index 028731b20..0b2879c4b 100644
--- a/eeschema/sch_base_frame.cpp
+++ b/eeschema/sch_base_frame.cpp
@@ -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() );
}
diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_eagle_plugin.cpp
index f24e3e033..e9253b442 100644
--- a/eeschema/sch_eagle_plugin.cpp
+++ b/eeschema/sch_eagle_plugin.cpp
@@ -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
diff --git a/eeschema/sch_io_mgr.cpp b/eeschema/sch_io_mgr.cpp
index f17791f50..32327e2b8 100644
--- a/eeschema/sch_io_mgr.cpp
+++ b/eeschema/sch_io_mgr.cpp
@@ -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." )
diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_legacy_plugin.cpp
index 86b7ddc33..f61646b9b 100644
--- a/eeschema/sch_legacy_plugin.cpp
+++ b/eeschema/sch_legacy_plugin.cpp
@@ -729,7 +729,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 );
}
@@ -2251,9 +2251,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() );
@@ -2344,7 +2344,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() );
@@ -3641,7 +3641,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() ) );
}
@@ -3669,7 +3669,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() ) );
}
diff --git a/eeschema/sch_plugin.cpp b/eeschema/sch_plugin.cpp
index 1b5d40823..9a0ecca59 100644
--- a/eeschema/sch_plugin.cpp
+++ b/eeschema/sch_plugin.cpp
@@ -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
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index f2f28d51b..6965602fc 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -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;
diff --git a/eeschema/selpart.cpp b/eeschema/selpart.cpp
index cab12a391..d4d6bf88d 100644
--- a/eeschema/selpart.cpp
+++ b/eeschema/selpart.cpp
@@ -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;
}
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 650df56d0..d8af1d9ae 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -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?" );
@@ -168,12 +168,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;
@@ -215,10 +215,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;
@@ -249,10 +249,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;
@@ -279,7 +279,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 );
@@ -291,7 +291,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() );
diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index 348653744..18017cc5b 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -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;
}
diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp
index 7f57e7819..e8d94e45d 100644
--- a/eeschema/symbedit.cpp
+++ b/eeschema/symbedit.cpp
@@ -84,14 +84,14 @@ void LIB_EDIT_FRAME::LoadOneSymbol()
{
if( lib->IsEmpty() )
{
- msg.Printf( _( "No parts found in part file '%s'." ), GetChars( filename ) );
+ msg.Printf( _( "No parts found in part file \"%s\"." ), GetChars( filename ) );
DisplayError( this, msg );
return;
}
}
catch( const IO_ERROR& exc )
{
- msg.Printf( _( "Error '%s' occurred loading part file '%s'." ),
+ msg.Printf( _( "Error \"%s\" occurred loading part file \"%s\"." ),
GetChars( exc.Problem() ), GetChars( filename ) );
DisplayError( this, msg );
return;
@@ -99,7 +99,7 @@ void LIB_EDIT_FRAME::LoadOneSymbol()
if( lib->GetCount() > 1 )
{
- msg.Printf( _( "More than one part in part file '%s'." ), GetChars( filename ) );
+ msg.Printf( _( "More than one part in part file \"%s\"." ), GetChars( filename ) );
wxMessageBox( msg, _( "Warning" ), wxOK | wxICON_EXCLAMATION, this );
}
@@ -171,7 +171,7 @@ void LIB_EDIT_FRAME::SaveOneSymbol()
prj.SetRString( PROJECT::SCH_LIB_PATH, fn.GetPath() );
- msg.Printf( _( "Saving symbol in '%s'" ), GetChars( fn.GetPath() ) );
+ msg.Printf( _( "Saving symbol in \"%s\"" ), GetChars( fn.GetPath() ) );
SetStatusText( msg );
wxString line;
@@ -237,7 +237,7 @@ void LIB_EDIT_FRAME::SaveOneSymbol()
}
catch( const IO_ERROR& )
{
- msg.Printf( _( "An error occurred attempting to save symbol file '%s'" ),
+ msg.Printf( _( "An error occurred attempting to save symbol file \"%s\"" ),
GetChars( fn.GetFullPath() ) );
DisplayError( this, msg );
}
diff --git a/eeschema/symbol_lib_table.cpp b/eeschema/symbol_lib_table.cpp
index 07ef7c327..642a98967 100644
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@@ -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() ) ) );
}
diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp
index f7a9cb21b..05d611aac 100644
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@@ -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 );
}
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 1ba608d0c..3f6032702 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -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;
}
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 0c6bd8ff6..969a92904 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -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 );
}
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index a6abcc558..45ea60476 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -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 );
diff --git a/gerbview/onrightclick.cpp b/gerbview/onrightclick.cpp
index 1d676bd56..42480ed43 100644
--- a/gerbview/onrightclick.cpp
+++ b/gerbview/onrightclick.cpp
@@ -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;
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index 031711efa..ee97816e0 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -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;
}
diff --git a/gerbview/tools/selection_tool.cpp b/gerbview/tools/selection_tool.cpp
index a2cba93aa..09b45d630 100644
--- a/gerbview/tools/selection_tool.cpp
+++ b/gerbview/tools/selection_tool.cpp
@@ -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;
}
diff --git a/kicad/class_treeproject_item.cpp b/kicad/class_treeproject_item.cpp
index b5c4fc9e6..4d8d1939f 100644
--- a/kicad/class_treeproject_item.cpp
+++ b/kicad/class_treeproject_item.cpp
@@ -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() )
);
diff --git a/kicad/files-io.cpp b/kicad/files-io.cpp
index f7f2ea23d..1de0ba094 100644
--- a/kicad/files-io.cpp
+++ b/kicad/files-io.cpp
@@ -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 );
}
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index dbc41f328..ee0f01cd2 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -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." ) );
diff --git a/kicad/project_template.cpp b/kicad/project_template.cpp
index a791b5657..f541ccf07 100644
--- a/kicad/project_template.cpp
+++ b/kicad/project_template.cpp
@@ -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;
}
diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp
index 07f1d991c..c2d361dba 100644
--- a/kicad/tree_project_frame.cpp
+++ b/kicad/tree_project_frame.cpp
@@ -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 );
diff --git a/new/sch_lib.cpp b/new/sch_lib.cpp
index 5595a34e9..f9df194fb 100644
--- a/new/sch_lib.cpp
+++ b/new/sch_lib.cpp
@@ -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 );
diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp
index 8b03ecc18..f373ff103 100644
--- a/pagelayout_editor/files.cpp
+++ b/pagelayout_editor/files.cpp
@@ -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() )
diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp
index 4171714bc..9d1a6b300 100644
--- a/pagelayout_editor/pl_editor.cpp
+++ b/pagelayout_editor/pl_editor.cpp
@@ -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 );
}
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index a14b2480f..c2185bfbe 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -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;
diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp
index 476dee9a9..3621d1dc2 100644
--- a/pcb_calculator/pcb_calculator_frame.cpp
+++ b/pcb_calculator/pcb_calculator_frame.cpp
@@ -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() );
diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp
index 15df02a57..d82bd2d6b 100644
--- a/pcb_calculator/regulators_funct.cpp
+++ b/pcb_calculator/regulators_funct.cpp
@@ -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 );
}
}
diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp
index 996302571..2e40bf6e1 100644
--- a/pcbnew/board_netlist_updater.cpp
+++ b/pcbnew/board_netlist_updater.cpp
@@ -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() ) );
diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp
index 5b76e2129..dc7ccea9b 100644
--- a/pcbnew/build_BOM_from_board.cpp
+++ b/pcbnew/build_BOM_from_board.cpp
@@ -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;
}
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 281f54c2a..b83e5e8fe 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -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 );
}
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index 4c5170629..e552482ae 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -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,
diff --git a/pcbnew/dialogs/dialog_SVG_print.cpp b/pcbnew/dialogs/dialog_SVG_print.cpp
index 66d166894..1c55366fe 100644
--- a/pcbnew/dialogs/dialog_SVG_print.cpp
+++ b/pcbnew/dialogs/dialog_SVG_print.cpp
@@ -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 );
}
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index a24922902..2cbaf1aee 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -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 ) ) );
}
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index cf1f0da7a..a467dc188 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -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 ) );
diff --git a/pcbnew/dialogs/dialog_exchange_modules.cpp b/pcbnew/dialogs/dialog_exchange_modules.cpp
index 00d53effa..712fac233 100644
--- a/pcbnew/dialogs/dialog_exchange_modules.cpp
+++ b/pcbnew/dialogs/dialog_exchange_modules.cpp
@@ -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;
}
diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp
index 7e9801467..e853252ed 100644
--- a/pcbnew/dialogs/dialog_export_vrml.cpp
+++ b/pcbnew/dialogs/dialog_export_vrml.cpp
@@ -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;
}
diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index c053a6f59..8ff6f4bf9 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -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;
}
diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp
index ee80d9c88..ea7de6e9d 100644
--- a/pcbnew/dialogs/dialog_fp_lib_table.cpp
+++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp
@@ -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
);
diff --git a/pcbnew/dialogs/dialog_fp_plugin_options.cpp b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
index c823c8be7..865195dae 100644
--- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp
+++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
@@ -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 );
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 6cc40746a..3cfaa8ad1 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -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 );
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 8e6340c1f..f628582e5 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -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 );
}
}
diff --git a/pcbnew/dialogs/wizard_add_fplib.cpp b/pcbnew/dialogs/wizard_add_fplib.cpp
index 3b0adc481..259157f74 100644
--- a/pcbnew/dialogs/wizard_add_fplib.cpp
+++ b/pcbnew/dialogs/wizard_add_fplib.cpp
@@ -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;
}
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 461581afb..dba98534e 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -347,7 +347,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 )
@@ -361,7 +361,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 )
@@ -374,7 +374,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 )
@@ -387,7 +387,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 )
@@ -400,7 +400,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 )
@@ -413,7 +413,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 )
@@ -988,7 +988,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,
@@ -1005,7 +1005,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,
@@ -1043,7 +1043,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 );
@@ -1078,7 +1078,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 );
diff --git a/pcbnew/eagle_plugin.cpp b/pcbnew/eagle_plugin.cpp
index a942ed824..fca9dc5c3 100644
--- a/pcbnew/eagle_plugin.cpp
+++ b/pcbnew/eagle_plugin.cpp
@@ -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();
diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
index d9c582b8b..64844c80a 100644
--- a/pcbnew/exporters/export_gencad.cpp
+++ b/pcbnew/exporters/export_gencad.cpp
@@ -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;
}
diff --git a/pcbnew/exporters/gen_modules_placefile.cpp b/pcbnew/exporters/gen_modules_placefile.cpp
index a2e3fd733..0c195e9a2 100644
--- a/pcbnew/exporters/gen_modules_placefile.cpp
+++ b/pcbnew/exporters/gen_modules_placefile.cpp
@@ -288,16 +288,16 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles()
ForceAllSmd(), side, useCSVfmt );
if( fpcount < 0 )
{
- msg.Printf( _( "Unable to create '%s'." ), GetChars( fn.GetFullPath() ) );
+ msg.Printf( _( "Unable to create \"%s\"." ), GetChars( fn.GetFullPath() ) );
wxMessageBox( msg );
m_reporter->Report( msg, REPORTER::RPT_ERROR );
return false;
}
if( singleFile )
- msg.Printf( _( "Place file: '%s'." ), GetChars( fn.GetFullPath() ) );
+ msg.Printf( _( "Place file: \"%s\"." ), GetChars( fn.GetFullPath() ) );
else
- msg.Printf( _( "Front side (top side) place file: '%s'." ),
+ msg.Printf( _( "Front side (top side) place file: \"%s\"." ),
GetChars( fn.GetFullPath() ) );
m_reporter->Report( msg, REPORTER::RPT_INFO );
@@ -330,7 +330,7 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles()
if( fpcount < 0 )
{
- msg.Printf( _( "Unable to create file '%s'." ), GetChars( fn.GetFullPath() ) );
+ msg.Printf( _( "Unable to create file \"%s\"." ), GetChars( fn.GetFullPath() ) );
m_reporter->Report( msg, REPORTER::RPT_ERROR );
wxMessageBox( msg );
return false;
@@ -339,7 +339,7 @@ bool DIALOG_GEN_MODULE_POSITION::CreateFiles()
// Display results
if( !singleFile )
{
- msg.Printf( _( "Back side (bottom side) place file: '%s'." ), GetChars( fn.GetFullPath() ) );
+ msg.Printf( _( "Back side (bottom side) place file: \"%s\"." ), GetChars( fn.GetFullPath() ) );
m_reporter->Report( msg, REPORTER::RPT_INFO );
msg.Printf( _( "Component count: %d." ), fpcount );
@@ -622,14 +622,14 @@ void PCB_EDIT_FRAME::GenFootprintsReport( wxCommandEvent& event )
wxString msg;
if( success )
{
- msg.Printf( _( "Footprint report file created:\n'%s'" ),
+ msg.Printf( _( "Footprint report file created:\n\"%s\"" ),
GetChars( fn.GetFullPath() ) );
wxMessageBox( msg, _( "Footprint Report" ), wxICON_INFORMATION );
}
else
{
- msg.Printf( _( "Unable to create '%s'" ), GetChars( fn.GetFullPath() ) );
+ msg.Printf( _( "Unable to create \"%s\"" ), GetChars( fn.GetFullPath() ) );
DisplayError( this, msg );
}
}
diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp
index 07d7e77fb..42d336f02 100644
--- a/pcbnew/exporters/gerber_jobfile_writer.cpp
+++ b/pcbnew/exporters/gerber_jobfile_writer.cpp
@@ -127,7 +127,7 @@ bool GERBER_JOBFILE_WRITER::CreateJobFile( const wxString& aFullFilename )
{
if( m_reporter )
{
- msg.Printf( _( "Unable to create job file '%s'" ), aFullFilename );
+ msg.Printf( _( "Unable to create job file \"%s\"" ), aFullFilename );
m_reporter->Report( msg, REPORTER::RPT_ERROR );
}
return false;
@@ -380,7 +380,7 @@ bool GERBER_JOBFILE_WRITER::CreateJobFile( const wxString& aFullFilename )
if( m_reporter )
{
- msg.Printf( _( "Create Gerber job file '%s'" ), aFullFilename );
+ msg.Printf( _( "Create Gerber job file \"%s\"" ), aFullFilename );
m_reporter->Report( msg, REPORTER::RPT_ACTION );
}
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 50e7ea7f0..cb719cb44 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -281,13 +281,13 @@ void PCB_EDIT_FRAME::Files_io_from_id( int id )
if( !fn.FileExists() )
{
- msg.Printf( _( "Recovery file '%s' not found." ),
+ msg.Printf( _( "Recovery file \"%s\" not found." ),
GetChars( fn.GetFullPath() ) );
DisplayInfoMessage( this, msg );
break;
}
- msg.Printf( _( "OK to load recovery or backup file '%s'" ),
+ msg.Printf( _( "OK to load recovery or backup file \"%s\"" ),
GetChars(fn.GetFullPath() ) );
if( !IsOK( this, msg ) )
@@ -422,7 +422,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
if( !LockFile( fullFileName ) )
{
wxString msg = wxString::Format( _(
- "PCB file '%s' is already open." ),
+ "PCB file \"%s\" is already open." ),
GetChars( fullFileName )
);
DisplayError( this, msg );
@@ -458,7 +458,7 @@ bool PCB_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( _(
- "Board '%s' does not exist. Do you wish to create it?" ),
+ "Board \"%s\" does not exist. Do you wish to create it?" ),
GetChars( fullFileName )
);
if( !IsOK( this, ask ) )
@@ -654,7 +654,7 @@ static wxString create_backup_file( const wxString& aFileName )
if( !wxRenameFile( fn.GetFullPath(), backupFileName.GetFullPath() ) )
{
wxString msg = wxString::Format( _(
- "Warning: unable to create backup file '%s'" ),
+ "Warning: unable to create backup file \"%s\"" ),
GetChars( backupFileName.GetFullPath() )
);
DisplayError( NULL, msg );
@@ -681,7 +681,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF
if( !IsWritable( pcbFileName ) )
{
wxString msg = wxString::Format( _(
- "No access rights to write to file '%s'" ),
+ "No access rights to write to file \"%s\"" ),
GetChars( pcbFileName.GetFullPath() )
);
@@ -720,13 +720,13 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF
catch( const IO_ERROR& ioe )
{
wxString msg = wxString::Format( _(
- "Error saving board file '%s'.\n%s" ),
+ "Error saving board file \"%s\".\n%s" ),
GetChars( pcbFileName.GetFullPath() ),
GetChars( ioe.What() )
);
DisplayError( this, msg );
- lowerTxt.Printf( _( "Failed to create '%s'" ), GetChars( pcbFileName.GetFullPath() ) );
+ lowerTxt.Printf( _( "Failed to create \"%s\"" ), GetChars( pcbFileName.GetFullPath() ) );
AppendMsgPanel( upperTxt, lowerTxt, CYAN );
@@ -752,9 +752,9 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF
wxRemoveFile( autoSaveFileName.GetFullPath() );
if( !!backupFileName )
- upperTxt.Printf( _( "Backup file: '%s'" ), GetChars( backupFileName ) );
+ upperTxt.Printf( _( "Backup file: \"%s\"" ), GetChars( backupFileName ) );
- lowerTxt.Printf( _( "Wrote board file: '%s'" ), GetChars( pcbFileName.GetFullPath() ) );
+ lowerTxt.Printf( _( "Wrote board file: \"%s\"" ), GetChars( pcbFileName.GetFullPath() ) );
AppendMsgPanel( upperTxt, lowerTxt, CYAN );
@@ -774,7 +774,7 @@ bool PCB_EDIT_FRAME::SavePcbCopy( const wxString& aFileName )
if( !IsWritable( pcbFileName ) )
{
wxString msg = wxString::Format( _(
- "No access rights to write to file '%s'" ),
+ "No access rights to write to file \"%s\"" ),
GetChars( pcbFileName.GetFullPath() )
);
@@ -799,7 +799,7 @@ bool PCB_EDIT_FRAME::SavePcbCopy( const wxString& aFileName )
catch( const IO_ERROR& ioe )
{
wxString msg = wxString::Format( _(
- "Error saving board file '%s'.\n%s" ),
+ "Error saving board file \"%s\".\n%s" ),
GetChars( pcbFileName.GetFullPath() ),
GetChars( ioe.What() )
);
@@ -808,7 +808,7 @@ bool PCB_EDIT_FRAME::SavePcbCopy( const wxString& aFileName )
return false;
}
- DisplayInfoMessage( this, wxString::Format( _( "Board copied to:\n'%s'" ),
+ DisplayInfoMessage( this, wxString::Format( _( "Board copied to:\n\"%s\"" ),
GetChars( pcbFileName.GetFullPath() ) ) );
return true;
diff --git a/pcbnew/github/github_getliblist.cpp b/pcbnew/github/github_getliblist.cpp
index 9893aba5c..25dcaf174 100644
--- a/pcbnew/github/github_getliblist.cpp
+++ b/pcbnew/github/github_getliblist.cpp
@@ -102,7 +102,7 @@ bool GITHUB_GETLIBLIST::GetFootprintLibraryList( wxArrayString& aList )
if( !repoURL2listURL( m_repoURL, &fullURLCommand, itemCountMax, page ) )
{
- wxString msg = wxString::Format( _( "malformed URL:\n'%s'" ), GetChars( m_repoURL ) );
+ wxString msg = wxString::Format( _( "malformed URL:\n\"%s\"" ), GetChars( m_repoURL ) );
wxMessageBox( msg );
return false;
}
@@ -231,7 +231,7 @@ bool GITHUB_GETLIBLIST::remoteGetJSON( const std::string& aFullURLCommand, wxStr
{
if( aMsgError )
{
- UTF8 fmt( _( "Error fetching JSON data from URL '%s'.\nReason: '%s'" ) );
+ UTF8 fmt( _( "Error fetching JSON data from URL \"%s\".\nReason: \"%s\"" ) );
std::string msg = StrPrintf( fmt.c_str(),
aFullURLCommand.c_str(),
diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index 29fca902e..f3e7b5a51 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -141,7 +141,7 @@ const wxString GITHUB_PLUGIN::GetFileExtension() const
void GITHUB_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames,
const wxString& aLibraryPath, const PROPERTIES* aProperties )
{
- //D(printf("%s: this:%p aLibraryPath:'%s'\n", __func__, this, TO_UTF8(aLibraryPath) );)
+ //D(printf("%s: this:%p aLibraryPath:\"%s\"\n", __func__, this, TO_UTF8(aLibraryPath) );)
cacheLib( aLibraryPath, aProperties );
typedef std::set<wxString> MYSET;
@@ -185,7 +185,7 @@ void GITHUB_PLUGIN::PrefetchLib(
MODULE* GITHUB_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
const wxString& aFootprintName, const PROPERTIES* aProperties )
{
- // D(printf("%s: this:%p aLibraryPath:'%s'\n", __func__, this, TO_UTF8(aLibraryPath) );)
+ // D(printf("%s: this:%p aLibraryPath:\"%s\"\n", __func__, this, TO_UTF8(aLibraryPath) );)
// clear or set to valid the variable m_pretty_dir
cacheLib( aLibraryPath, aProperties );
@@ -267,7 +267,7 @@ void GITHUB_PLUGIN::FootprintSave( const wxString& aLibraryPath,
// IsFootprintLibWritable() to determine if calling FootprintSave() is
// even legal, so I spend no time on internationalization here:
- string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
+ string msg = StrPrintf( "Github library\n\"%s\"\nis only writable if you set option \"%s\" in Library Tables dialog.",
TO_UTF8( aLibraryPath ), PRETTY_DIR );
THROW_IO_ERROR( msg );
@@ -297,7 +297,7 @@ void GITHUB_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxStrin
else
{
wxString msg = wxString::Format(
- _( "Footprint\n'%s'\nis not in the writable portion of this Github library\n'%s'" ),
+ _( "Footprint\n\"%s\"\nis not in the writable portion of this Github library\n\"%s\"" ),
GetChars( aFootprintName ),
GetChars( aLibraryPath )
);
@@ -311,7 +311,7 @@ void GITHUB_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxStrin
// IsFootprintLibWritable() to determine if calling FootprintSave() is
// even legal, so I spend no time on internationalization here:
- string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
+ string msg = StrPrintf( "Github library\n\"%s\"\nis only writable if you set option \"%s\" in Library Tables dialog.",
TO_UTF8( aLibraryPath ), PRETTY_DIR );
THROW_IO_ERROR( msg );
@@ -413,7 +413,7 @@ void GITHUB_PLUGIN::cacheLib( const wxString& aLibraryPath, const PROPERTIES* aP
)
{
wxString msg = wxString::Format(
- _( "option '%s' for Github library '%s' must point to a writable directory ending with '.pretty'." ),
+ _( "option \"%s\" for Github library \"%s\" must point to a writable directory ending with '.pretty'." ),
GetChars( FROM_UTF8( PRETTY_DIR ) ),
GetChars( aLibraryPath )
);
@@ -546,7 +546,7 @@ void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL )
if( !repoURL_zipURL( aRepoURL, &zip_url ) )
{
- wxString msg = wxString::Format( _( "Unable to parse URL:\n'%s'" ), GetChars( aRepoURL ) );
+ wxString msg = wxString::Format( _( "Unable to parse URL:\n\"%s\"" ), GetChars( aRepoURL ) );
THROW_IO_ERROR( msg );
}
@@ -570,7 +570,7 @@ void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL )
// Note: kcurl.Perform() does not return an error if the file to download is not found
static const char errorcmd[] = "http GET command failed"; // Do not translate this message
- UTF8 fmt( _( "%s\nCannot get/download Zip archive: '%s'\nfor library path: '%s'.\nReason: '%s'" ) );
+ UTF8 fmt( _( "%s\nCannot get/download Zip archive: \"%s\"\nfor library path: \"%s\".\nReason: \"%s\"" ) );
std::string msg = StrPrintf( fmt.c_str(),
errorcmd,
@@ -587,7 +587,7 @@ void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL )
if( ( m_zip_image.compare( 0, 9, "Not Found", 9 ) == 0 ) ||
( m_zip_image.compare( 0, 14, "404: Not Found", 14 ) == 0 ) )
{
- UTF8 fmt( _( "Cannot download library '%s'.\nThe library does not exist on the server" ) );
+ UTF8 fmt( _( "Cannot download library \"%s\".\nThe library does not exist on the server" ) );
std::string msg = StrPrintf( fmt.c_str(), TO_UTF8( aRepoURL ) );
THROW_IO_ERROR( msg );
diff --git a/pcbnew/gpcb_plugin.cpp b/pcbnew/gpcb_plugin.cpp
index 2c123bf59..ccc75d24b 100644
--- a/pcbnew/gpcb_plugin.cpp
+++ b/pcbnew/gpcb_plugin.cpp
@@ -295,7 +295,7 @@ void GPCB_FPL_CACHE::Load()
if( !dir.IsOpened() )
{
- THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),
+ THROW_IO_ERROR( wxString::Format( _( "footprint library path \"%s\" does not exist" ),
m_lib_path.GetPath().GetData() ) );
}
@@ -351,7 +351,7 @@ void GPCB_FPL_CACHE::Remove( const wxString& aFootprintName )
if( it == m_modules.end() )
{
- THROW_IO_ERROR( wxString::Format( _( "library <%s> has no footprint '%s' to delete" ),
+ THROW_IO_ERROR( wxString::Format( _( "library \"%s\" has no footprint \"%s\" to delete" ),
m_lib_path.GetPath().GetData(),
aFootprintName.GetData() ) );
}
@@ -393,7 +393,7 @@ bool GPCB_FPL_CACHE::IsModified( const wxString& aLibPath, const wxString& aFoot
if( !fn.FileExists() )
{
wxLogTrace( traceFootprintLibrary,
- wxT( "Footprint cache file '%s' does not exist." ),
+ wxT( "Footprint cache file \"%s\" does not exist." ),
fn.GetFullPath().GetData() );
return true;
}
@@ -401,7 +401,7 @@ bool GPCB_FPL_CACHE::IsModified( const wxString& aLibPath, const wxString& aFoot
if( it->second->IsModified() )
{
wxLogTrace( traceFootprintLibrary,
- wxT( "Footprint cache file '%s' has been modified." ),
+ wxT( "Footprint cache file \"%s\" has been modified." ),
fn.GetFullPath().GetData() );
return true;
}
@@ -981,7 +981,7 @@ void GPCB_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames,
if( !dir.IsOpened() )
{
- THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),
+ THROW_IO_ERROR( wxString::Format( _( "footprint library path \"%s\" does not exist" ),
GetChars( aLibraryPath ) ) );
}
@@ -1046,7 +1046,7 @@ void GPCB_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxString&
if( !m_cache->IsWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "Library '%s' is read only" ),
+ THROW_IO_ERROR( wxString::Format( _( "Library \"%s\" is read only" ),
aLibraryPath.GetData() ) );
}
@@ -1065,7 +1065,7 @@ bool GPCB_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const PROPER
if( !fn.IsDirWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "user does not have permission to delete directory '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "user does not have permission to delete directory \"%s\"" ),
aLibraryPath.GetData() ) );
}
@@ -1073,7 +1073,7 @@ bool GPCB_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const PROPER
if( dir.HasSubDirs() )
{
- THROW_IO_ERROR( wxString::Format( _( "library directory '%s' has unexpected sub-directories" ),
+ THROW_IO_ERROR( wxString::Format( _( "library directory \"%s\" has unexpected sub-directories" ),
aLibraryPath.GetData() ) );
}
@@ -1092,7 +1092,7 @@ bool GPCB_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const PROPER
if( tmp.GetExt() != KiCadFootprintFileExtension )
{
- THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' was found in library path '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "unexpected file \"%s\" was found in library path \"%s\"" ),
files[i].GetData(), aLibraryPath.GetData() ) );
}
}
@@ -1110,7 +1110,7 @@ bool GPCB_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const PROPER
// we don't want that. we want bare metal portability with no UI here.
if( !wxRmdir( aLibraryPath ) )
{
- THROW_IO_ERROR( wxString::Format( _( "footprint library '%s' cannot be deleted" ),
+ THROW_IO_ERROR( wxString::Format( _( "footprint library \"%s\" cannot be deleted" ),
aLibraryPath.GetData() ) );
}
diff --git a/pcbnew/io_mgr.cpp b/pcbnew/io_mgr.cpp
index ac4b22e92..dd45b24de 100644
--- a/pcbnew/io_mgr.cpp
+++ b/pcbnew/io_mgr.cpp
@@ -39,8 +39,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." )
// Some day plugins might be in separate DLL/DSOs, simply because of numbers of them
diff --git a/pcbnew/kicad_netlist_reader.cpp b/pcbnew/kicad_netlist_reader.cpp
index e3dece9a8..089b78148 100644
--- a/pcbnew/kicad_netlist_reader.cpp
+++ b/pcbnew/kicad_netlist_reader.cpp
@@ -366,7 +366,7 @@ void KICAD_NETLIST_PARSER::parseComponent()
if( !footprint.IsEmpty() && fpid.Parse( footprint ) >= 0 )
{
wxString error;
- error.Printf( _( "invalid footprint ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ error.Printf( _( "invalid footprint ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index 61a1cd0e9..2625b789a 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -216,13 +216,13 @@ void FP_CACHE::Save()
{
if( !m_lib_path.DirExists() && !m_lib_path.Mkdir() )
{
- THROW_IO_ERROR( wxString::Format( _( "Cannot create footprint library path '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "Cannot create footprint library path \"%s\"" ),
m_lib_path.GetPath().GetData() ) );
}
if( !m_lib_path.IsDirWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "Footprint library path '%s' is read only" ),
+ THROW_IO_ERROR( wxString::Format( _( "Footprint library path \"%s\" is read only" ),
GetChars( m_lib_path.GetPath() ) ) );
}
@@ -261,7 +261,7 @@ void FP_CACHE::Save()
if( !wxRenameFile( tempFileName, fn.GetFullPath() ) )
{
wxString msg = wxString::Format(
- _( "Cannot rename temporary file '%s' to footprint library file '%s'" ),
+ _( "Cannot rename temporary file \"%s\" to footprint library file \"%s\"" ),
GetChars( tempFileName ),
GetChars( fn.GetFullPath() )
);
@@ -281,7 +281,7 @@ void FP_CACHE::Load()
if( !dir.IsOpened() )
{
wxString msg = wxString::Format(
- _( "Footprint library path '%s' does not exist" ),
+ _( "Footprint library path \"%s\" does not exist" ),
GetChars( m_lib_path.GetPath() )
);
@@ -342,7 +342,7 @@ void FP_CACHE::Remove( const wxString& aFootprintName )
if( it == m_modules.end() )
{
wxString msg = wxString::Format(
- _( "library '%s' has no footprint '%s' to delete" ),
+ _( "library \"%s\" has no footprint \"%s\" to delete" ),
GetChars( m_lib_path.GetPath() ),
GetChars( aFootprintName )
);
@@ -1965,7 +1965,7 @@ void PCB_IO::FootprintEnumerate( wxArrayString& aFootprintNames,
if( !dir.IsOpened() )
{
- THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),
+ THROW_IO_ERROR( wxString::Format( _( "footprint library path \"%s\" does not exist" ),
GetChars( aLibraryPath ) ) );
}
@@ -2035,7 +2035,7 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
if( !m_cache->IsWritable() )
{
wxString msg = wxString::Format(
- _( "Library '%s' is read only" ),
+ _( "Library \"%s\" is read only" ),
GetChars( aLibraryPath )
);
@@ -2052,13 +2052,13 @@ void PCB_IO::FootprintSave( const wxString& aLibraryPath, const MODULE* aFootpri
if( !fn.IsOk() )
{
- THROW_IO_ERROR( wxString::Format( _( "Footprint file name '%s' is not valid." ),
+ THROW_IO_ERROR( wxString::Format( _( "Footprint file name \"%s\" is not valid." ),
GetChars( fn.GetFullPath() ) ) );
}
if( fn.FileExists() && !fn.IsFileWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "user does not have write permission to delete file '%s' " ),
+ THROW_IO_ERROR( wxString::Format( _( "user does not have write permission to delete file \"%s\" " ),
GetChars( fn.GetFullPath() ) ) );
}
@@ -2101,7 +2101,7 @@ void PCB_IO::FootprintDelete( const wxString& aLibraryPath, const wxString& aFoo
if( !m_cache->IsWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "Library '%s' is read only" ),
+ THROW_IO_ERROR( wxString::Format( _( "Library \"%s\" is read only" ),
aLibraryPath.GetData() ) );
}
@@ -2113,7 +2113,7 @@ void PCB_IO::FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES*
{
if( wxDir::Exists( aLibraryPath ) )
{
- THROW_IO_ERROR( wxString::Format( _( "cannot overwrite library path '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "cannot overwrite library path \"%s\"" ),
aLibraryPath.GetData() ) );
}
@@ -2138,7 +2138,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( !fn.IsDirWritable() )
{
- THROW_IO_ERROR( wxString::Format( _( "user does not have permission to delete directory '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "user does not have permission to delete directory \"%s\"" ),
aLibraryPath.GetData() ) );
}
@@ -2146,7 +2146,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( dir.HasSubDirs() )
{
- THROW_IO_ERROR( wxString::Format( _( "library directory '%s' has unexpected sub-directories" ),
+ THROW_IO_ERROR( wxString::Format( _( "library directory \"%s\" has unexpected sub-directories" ),
aLibraryPath.GetData() ) );
}
@@ -2165,7 +2165,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
if( tmp.GetExt() != KiCadFootprintFileExtension )
{
- THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' was found in library path '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "unexpected file \"%s\" was found in library path \"%s\"" ),
files[i].GetData(), aLibraryPath.GetData() ) );
}
}
@@ -2176,14 +2176,14 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES*
}
}
- wxLogTrace( traceFootprintLibrary, wxT( "Removing footprint library '%s'" ),
+ wxLogTrace( traceFootprintLibrary, wxT( "Removing footprint library \"%s\"" ),
aLibraryPath.GetData() );
// Some of the more elaborate wxRemoveFile() crap puts up its own wxLog dialog
// we don't want that. we want bare metal portability with no UI here.
if( !wxRmdir( aLibraryPath ) )
{
- THROW_IO_ERROR( wxString::Format( _( "footprint library '%s' cannot be deleted" ),
+ THROW_IO_ERROR( wxString::Format( _( "footprint library \"%s\" cannot be deleted" ),
aLibraryPath.GetData() ) );
}
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp
index 4c73bc343..19ec4960a 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/legacy_plugin.cpp
@@ -92,7 +92,7 @@
typedef LEGACY_PLUGIN::BIU BIU;
-#define VERSION_ERROR_FORMAT _( "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file." )
+#define VERSION_ERROR_FORMAT _( "File \"%s\" is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file." )
#define UNKNOWN_GRAPHIC_FORMAT _( "unknown graphic type: %d")
#define UNKNOWN_PAD_FORMAT _( "unknown pad type: %d")
#define UNKNOWN_PAD_ATTRIBUTE _( "unknown pad attribute: %d" )
@@ -550,7 +550,7 @@ void LEGACY_PLUGIN::checkVersion()
#if !defined(DEBUG)
if( ver > LEGACY_BOARD_FILE_VERSION )
{
- // "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file."
+ // "File \"%s\" is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file."
m_error.Printf( VERSION_ERROR_FORMAT,
m_reader->GetSource().GetData(), ver, LEGACY_BOARD_FILE_VERSION );
THROW_IO_ERROR( m_error );
@@ -728,7 +728,7 @@ void LEGACY_PLUGIN::loadSHEET()
wxString wname = FROM_UTF8( sname );
if( !page.SetType( wname ) )
{
- m_error.Printf( _( "Unknown sheet type '%s' on line:%d" ),
+ m_error.Printf( _( "Unknown sheet type \"%s\" on line:%d" ),
wname.GetData(), m_reader->LineNumber() );
THROW_IO_ERROR( m_error );
}
@@ -1372,7 +1372,7 @@ void LEGACY_PLUGIN::loadMODULE( MODULE* aModule )
}
wxString msg = wxString::Format(
- wxT( "Missing '$EndMODULE' for MODULE '%s'" ),
+ _( "Missing '$EndMODULE' for MODULE \"%s\"" ),
GetChars( aModule->GetFPID().GetLibItemName() ) );
THROW_IO_ERROR( msg );
@@ -1424,7 +1424,7 @@ void LEGACY_PLUGIN::loadPAD( MODULE* aModule )
case 'O': padshape = PAD_SHAPE_OVAL; break;
case 'T': padshape = PAD_SHAPE_TRAPEZOID; break;
default:
- m_error.Printf( _( "Unknown padshape '%c=0x%02x' on line: %d of footprint: '%s'" ),
+ m_error.Printf( _( "Unknown padshape '%c=0x%02x' on line: %d of footprint: \"%s\"" ),
padchar,
padchar,
m_reader->LineNumber(),
@@ -1630,7 +1630,7 @@ void LEGACY_PLUGIN::loadMODULE_EDGE( MODULE* aModule )
case 'A': shape = S_ARC; break;
case 'P': shape = S_POLYGON; break;
default:
- m_error.Printf( wxT( "Unknown EDGE_MODULE type:'%c=0x%02x' on line:%d of module:'%s'" ),
+ m_error.Printf( _( "Unknown EDGE_MODULE type:'%c=0x%02x' on line:%d of module:\"%s\"" ),
(unsigned char) line[1],
(unsigned char) line[1],
m_reader->LineNumber(),
@@ -2458,7 +2458,7 @@ void LEGACY_PLUGIN::loadNETCLASS()
// unique_ptr will delete nc on this code path
- m_error.Printf( _( "duplicate NETCLASS name '%s'" ), nc->GetName().GetData() );
+ m_error.Printf( _( "duplicate NETCLASS name \"%s\"" ), nc->GetName().GetData() );
THROW_IO_ERROR( m_error );
}
@@ -2540,7 +2540,7 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
if( !hopt )
{
- m_error.Printf( wxT( "Bad ZAux for CZONE_CONTAINER '%s'" ), zc->GetNetname().GetData() );
+ m_error.Printf( _( "Bad ZAux for CZONE_CONTAINER \"%s\"" ), zc->GetNetname().GetData() );
THROW_IO_ERROR( m_error );
}
@@ -2551,7 +2551,7 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
case 'F': outline_hatch = ZONE_CONTAINER::DIAGONAL_FULL; break;
default:
- m_error.Printf( wxT( "Bad ZAux for CZONE_CONTAINER '%s'" ), zc->GetNetname().GetData() );
+ m_error.Printf( _( "Bad ZAux for CZONE_CONTAINER \"%s\"" ), zc->GetNetname().GetData() );
THROW_IO_ERROR( m_error );
}
@@ -2568,7 +2568,7 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
if( smoothing >= ZONE_SETTINGS::SMOOTHING_LAST || smoothing < 0 )
{
- m_error.Printf( wxT( "Bad ZSmoothing for CZONE_CONTAINER '%s'" ), zc->GetNetname().GetData() );
+ m_error.Printf( _( "Bad ZSmoothing for CZONE_CONTAINER \"%s\"" ), zc->GetNetname().GetData() );
THROW_IO_ERROR( m_error );
}
@@ -2642,7 +2642,7 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
case 'X': popt = PAD_ZONE_CONN_NONE; break;
default:
- m_error.Printf( wxT( "Bad ZClearance padoption for CZONE_CONTAINER '%s'" ),
+ m_error.Printf( _( "Bad ZClearance padoption for CZONE_CONTAINER \"%s\"" ),
zc->GetNetname().GetData() );
THROW_IO_ERROR( m_error );
}
@@ -2990,7 +2990,7 @@ BIU LEGACY_PLUGIN::biuParse( const char* aValue, const char** nptrptr )
if( errno )
{
- m_error.Printf( _( "invalid float number in file: '%s'\nline: %d, offset: %d" ),
+ m_error.Printf( _( "invalid float number in file: \"%s\"\nline: %d, offset: %d" ),
m_reader->GetSource().GetData(),
m_reader->LineNumber(), aValue - m_reader->Line() + 1 );
@@ -2999,7 +2999,7 @@ BIU LEGACY_PLUGIN::biuParse( const char* aValue, const char** nptrptr )
if( aValue == nptr )
{
- m_error.Printf( _( "missing float number in file: '%s'\nline: %d, offset: %d" ),
+ m_error.Printf( _( "missing float number in file: \"%s\"\nline: %d, offset: %d" ),
m_reader->GetSource().GetData(),
m_reader->LineNumber(), aValue - m_reader->Line() + 1 );
@@ -3027,7 +3027,7 @@ double LEGACY_PLUGIN::degParse( const char* aValue, const char** nptrptr )
if( errno )
{
- m_error.Printf( _( "invalid float number in file: '%s'\nline: %d, offset: %d" ),
+ m_error.Printf( _( "invalid float number in file: \"%s\"\nline: %d, offset: %d" ),
m_reader->GetSource().GetData(), m_reader->LineNumber(), aValue - m_reader->Line() + 1 );
THROW_IO_ERROR( m_error );
@@ -3035,7 +3035,7 @@ double LEGACY_PLUGIN::degParse( const char* aValue, const char** nptrptr )
if( aValue == nptr )
{
- m_error.Printf( _( "missing float number in file: '%s'\nline: %d, offset: %d" ),
+ m_error.Printf( _( "missing float number in file: \"%s\"\nline: %d, offset: %d" ),
m_reader->GetSource().GetData(), m_reader->LineNumber(), aValue - m_reader->Line() + 1 );
THROW_IO_ERROR( m_error );
@@ -3261,7 +3261,7 @@ void LP_CACHE::ReadAndVerifyHeader( LINE_READER* aReader )
}
L_bad_library:
- THROW_IO_ERROR( wxString::Format( _( "File '%s' is empty or is not a legacy library" ),
+ THROW_IO_ERROR( wxString::Format( _( "File \"%s\" is empty or is not a legacy library" ),
m_lib_path.GetData() ) );
}
@@ -3433,7 +3433,7 @@ MODULE* LEGACY_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
if( it == mods.end() )
{
/*
- THROW_IO_ERROR( wxString::Format( _( "No '%s' footprint in library '%s'" ),
+ THROW_IO_ERROR( wxString::Format( _( "No \"%s\" footprint in library \"%s\"" ),
aFootprintName.GetData(), aLibraryPath.GetData() ) );
*/
@@ -3457,7 +3457,7 @@ bool LEGACY_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const PROP
if( wxRemove( aLibraryPath ) )
{
THROW_IO_ERROR( wxString::Format(
- _( "library '%s' cannot be deleted" ),
+ _( "library \"%s\" cannot be deleted" ),
aLibraryPath.GetData() ) );
}
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 6b28c9073..de62a48d3 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -57,25 +57,25 @@
// unique, "file local" translations:
-#define FMT_OK_OVERWRITE _( "Library '%s' exists, OK to replace ?" )
+#define FMT_OK_OVERWRITE _( "Library \"%s\" exists, OK to replace ?" )
#define FMT_CREATE_LIB _( "Create New Library Folder (the .pretty folder is the library)" )
-#define FMT_OK_DELETE _( "OK to delete footprint %s in library '%s'" )
+#define FMT_OK_DELETE _( "OK to delete footprint \"%s\" in library \"%s\"" )
#define FMT_IMPORT_MODULE _( "Import Footprint" )
-#define FMT_FILE_NOT_FOUND _( "File '%s' not found" )
+#define FMT_FILE_NOT_FOUND _( "File \"%s\" not found" )
#define FMT_NOT_MODULE _( "Not a footprint file" )
-#define FMT_MOD_NOT_FOUND _( "Unable to find or load footprint %s from lib path '%s'" )
-#define FMT_BAD_PATH _( "Unable to find or load footprint from path '%s'" )
-#define FMT_BAD_PATHS _( "The footprint library '%s' could not be found in any of the search paths." )
-#define FMT_LIB_READ_ONLY _( "Library '%s' is read only, not writable" )
+#define FMT_MOD_NOT_FOUND _( "Unable to find or load footprint %s from lib path \"%s\"" )
+#define FMT_BAD_PATH _( "Unable to find or load footprint from path \"%s\"" )
+#define FMT_BAD_PATHS _( "The footprint library \"%s\" could not be found in any of the search paths." )
+#define FMT_LIB_READ_ONLY _( "Library \"%s\" is read only, not writable" )
#define FMT_EXPORT_MODULE _( "Export Footprint" )
#define FMT_SAVE_MODULE _( "Save Footprint" )
#define FMT_MOD_REF _( "Enter footprint name:" )
-#define FMT_EXPORTED _( "Footprint exported to file '%s'" )
-#define FMT_MOD_DELETED _( "Footprint %s deleted from library '%s'" )
+#define FMT_EXPORTED _( "Footprint exported to file \"%s\"" )
+#define FMT_MOD_DELETED _( "Footprint \"%s\" deleted from library \"%s\"" )
#define FMT_MOD_CREATE _( "New Footprint" )
-#define FMT_MOD_EXISTS _( "Footprint %s already exists in library '%s'" )
+#define FMT_MOD_EXISTS _( "Footprint \"%s\" already exists in library \"%s\"" )
#define FMT_NO_REF_ABORTED _( "No footprint name defined." )
#define FMT_SELECT_LIB _( "Select Library" )
@@ -394,7 +394,7 @@ void FOOTPRINT_EDIT_FRAME::Export_Module( MODULE* aModule )
if( fp == NULL )
{
wxMessageBox( wxString::Format(
- _( "Unable to create or write file '%s'" ),
+ _( "Unable to create or write file \"%s\"" ),
GetChars( dlg.GetPath() ) ) );
return;
}
@@ -547,7 +547,7 @@ bool FOOTPRINT_EDIT_FRAME::DeleteModuleFromCurrentLibrary()
if( !Prj().PcbFootprintLibs()->IsFootprintLibWritable( nickname ) )
{
wxString msg = wxString::Format(
- _( "Library '%s' is read only" ),
+ _( "Library \"%s\" is read only" ),
GetChars( nickname )
);
@@ -695,7 +695,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintInLibrary( const wxString& aLibrary,
if( ! MODULE::IsLibNameValid( footprintName ) )
{
wxString msg = wxString::Format(
- _("Error:\none of invalid chars '%s' found\nin '%s'" ),
+ _( "Error:\none of invalid chars \"%s\" found\nin \"%s\"" ),
MODULE::StringLibNameInvalidChars( true ),
GetChars( footprintName ) );
@@ -756,8 +756,8 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintInLibrary( const wxString& aLibrary,
if( aDisplayDialog )
{
wxString fmt = module_exists ?
- _( "Component [%s] replaced in '%s'" ) :
- _( "Component [%s] added in '%s'" );
+ _( "Component \"%s\" replaced in \"%s\"" ) :
+ _( "Component \"%s\" added in \"%s\"" );
wxString msg = wxString::Format( fmt, footprintName.GetData(), aLibrary.GetData() );
SetStatusText( msg );
@@ -871,7 +871,7 @@ wxString PCB_BASE_FRAME::SelectLibrary( const wxString& aNicknameExisting )
wxString nickname = dlg.GetTextSelection();
- wxLogDebug( wxT( "Chose footprint library '%s'." ), GetChars( nickname ) );
+ wxLogDebug( wxT( "Chose footprint library \"%s\"." ), GetChars( nickname ) );
return nickname;
}
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index 31f64f072..819a0dd86 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -227,7 +227,7 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary,
LIB_ID fpid;
wxCHECK_MSG( fpid.Parse( moduleName ) < 0, NULL,
- wxString::Format( wxT( "Could not parse LIB_ID string '%s'." ),
+ wxString::Format( wxT( "Could not parse LIB_ID string \"%s\"." ),
GetChars( moduleName ) ) );
try
@@ -257,7 +257,7 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary,
else
{
wxCHECK_MSG( fpid.Parse( moduleName ) < 0, NULL,
- wxString::Format( wxT( "Could not parse LIB_ID string '%s'." ),
+ wxString::Format( wxT( "Could not parse LIB_ID string \"%s\"." ),
GetChars( moduleName ) ) );
try
@@ -568,7 +568,7 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
std::unique_ptr<MODULE> m( cur->FootprintLoad( curLibPath, mods[i] ) );
dst->FootprintSave( dstLibPath, m.get() );
- msg = wxString::Format( _( "Footprint '%s' saved" ),
+ msg = wxString::Format( _( "Footprint \"%s\" saved" ),
GetChars( mods[i] ) );
SetStatusText( msg );
@@ -582,7 +582,7 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
}
msg = wxString::Format(
- _( "Footprint library '%s' saved as '%s'." ),
+ _( "Footprint library \"%s\" saved as \"%s\"." ),
GetChars( curLibPath ), GetChars( dstLibPath ) );
DisplayInfoMessage( this, msg );
diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp
index a48f0447e..65e027edf 100644
--- a/pcbnew/netlist.cpp
+++ b/pcbnew/netlist.cpp
@@ -247,7 +247,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter )
{
if( aReporter )
{
- msg.Printf( _( "No footprint defined for component '%s'.\n" ),
+ msg.Printf( _( "No footprint defined for component \"%s\".\n" ),
GetChars( component->GetReference() ) );
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
@@ -269,7 +269,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter )
{
if( aReporter )
{
- msg.Printf( _( "Footprint of component '%s' changed: board footprint '%s', netlist footprint '%s'\n" ),
+ msg.Printf( _( "Footprint of component \"%s\" changed: board footprint \"%s\", netlist footprint \"%s\"\n" ),
GetChars( component->GetReference() ),
GetChars( fpOnBoard->GetFPID().Format() ),
GetChars( component->GetFPID().Format() ) );
@@ -299,7 +299,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter )
{
if( aReporter )
{
- msg.Printf( _( "Component '%s' footprint ID '%s' is not "
+ msg.Printf( _( "Component \"%s\" footprint ID \"%s\" is not "
"valid.\n" ),
GetChars( component->GetReference() ),
GetChars( component->GetFPID().Format() ) );
@@ -320,7 +320,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter )
{
if( aReporter )
{
- msg.Printf( _( "Component '%s' footprint '%s' was not found in "
+ msg.Printf( _( "Component \"%s\" footprint \"%s\" was not found in "
"any libraries in the footprint library table.\n" ),
GetChars( component->GetReference() ),
GetChars( component->GetFPID().GetLibItemName() ) );
diff --git a/pcbnew/netlist_reader.cpp b/pcbnew/netlist_reader.cpp
index 4fae9028b..14fe4f83f 100644
--- a/pcbnew/netlist_reader.cpp
+++ b/pcbnew/netlist_reader.cpp
@@ -178,7 +178,7 @@ bool CMP_READER::Load( NETLIST* aNetlist )
if( !footprint.IsEmpty() && fpid.Parse( footprint ) >= 0 )
{
wxString error;
- error.Printf( _( "invalid footprint ID in\nfile: <%s>\nline: %d" ),
+ error.Printf( _( "invalid footprint ID in\nfile: \"%s\"\nline: %d" ),
GetChars( m_lineReader->GetSource() ),
m_lineReader->LineNumber() );
diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp
index cea376681..df6025e30 100644
--- a/pcbnew/pcb_parser.cpp
+++ b/pcbnew/pcb_parser.cpp
@@ -132,7 +132,7 @@ double PCB_PARSER::parseDouble()
if( errno )
{
wxString error;
- error.Printf( _( "invalid floating point number in\nfile: <%s>\nline: %d\noffset: %d" ),
+ error.Printf( _( "invalid floating point number in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
@@ -141,7 +141,7 @@ double PCB_PARSER::parseDouble()
if( CurText() == tmp )
{
wxString error;
- error.Printf( _( "missing floating point number in\nfile: <%s>\nline: %d\noffset: %d" ),
+ error.Printf( _( "missing floating point number in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
@@ -893,7 +893,7 @@ void PCB_PARSER::parseLayers()
if( it == m_layerIndices.end() )
{
wxString error = wxString::Format(
- _( "Layer '%s' in file '%s' at line %d, is not in fixed layer hash" ),
+ _( "Layer \"%s\" in file \"%s\" at line %d, is not in fixed layer hash" ),
GetChars( layer.m_name ),
GetChars( CurSource() ),
CurLineNumber(),
@@ -957,8 +957,8 @@ T PCB_PARSER::lookUpLayer( const M& aMap )
#endif
wxString error = wxString::Format( _(
- "Layer '%s' in file\n"
- "'%s'\n"
+ "Layer \"%s\" in file\n"
+ "\"%s\"\n"
"at line %d, position %d\n"
"was not defined in the layers section"
),
@@ -1343,7 +1343,7 @@ void PCB_PARSER::parseNETCLASS()
// unique_ptr will delete nc on this code path
wxString error;
- error.Printf( _( "duplicate NETCLASS name '%s' in file <%s> at line %d, offset %d" ),
+ error.Printf( _( "duplicate NETCLASS name \"%s\" in file \"%s\" at line %d, offset %d" ),
nc->GetName().GetData(), CurSource().GetData(), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
@@ -1779,7 +1779,7 @@ MODULE* PCB_PARSER::parseMODULE_unchecked( wxArrayString* aInitialComments )
if( !name.IsEmpty() && fpid.Parse( FromUTF8() ) >= 0 )
{
wxString error;
- error.Printf( _( "invalid footprint ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ error.Printf( _( "invalid footprint ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
@@ -2455,13 +2455,13 @@ D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent )
case T_net:
if( ! pad->SetNetCode( getNetCode( parseInt( "net number" ) ), /* aNoAssert */ true ) )
THROW_IO_ERROR(
- wxString::Format( _( "invalid net ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ wxString::Format( _( "invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() )
);
NeedSYMBOLorNUMBER();
if( m_board && FromUTF8() != m_board->FindNet( pad->GetNetCode() )->GetNetname() )
THROW_IO_ERROR(
- wxString::Format( _( "invalid net ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ wxString::Format( _( "invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() )
);
NeedRIGHT();
@@ -2690,7 +2690,7 @@ TRACK* PCB_PARSER::parseTRACK()
case T_net:
if( ! track->SetNetCode( getNetCode( parseInt( "net number" ) ), /* aNoAssert */ true ) )
THROW_IO_ERROR(
- wxString::Format( _( "invalid net ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ wxString::Format( _( "invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() )
);
break;
@@ -2772,7 +2772,7 @@ VIA* PCB_PARSER::parseVIA()
case T_net:
if(! via->SetNetCode( getNetCode( parseInt( "net number" ) ), /* aNoAssert */ true))
THROW_IO_ERROR(
- wxString::Format( _( "invalid net ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ wxString::Format( _( "invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() )
);
NeedRIGHT();
@@ -2836,7 +2836,7 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER()
if( ! zone->SetNetCode( tmp, /* aNoAssert */ true ) )
THROW_IO_ERROR(
- wxString::Format( _( "invalid net ID in\nfile: <%s>\nline: %d\noffset: %d" ),
+ wxString::Format( _( "invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ),
GetChars( CurSource() ), CurLineNumber(), CurOffset() )
);
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index cad1d5075..c8accb7f9 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -608,7 +608,7 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
{
wxString msg = wxString::Format( _(
"Save the changes in\n"
- "'%s'\n"
+ "\"%s\"\n"
"before closing?" ),
GetChars( GetBoard()->GetFileName() )
);
@@ -661,7 +661,7 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
if( fn.FileExists() && !wxRemoveFile( fn.GetFullPath() ) )
{
wxString msg = wxString::Format( _(
- "The auto save file '%s' could not be removed!" ),
+ "The auto save file \"%s\" could not be removed!" ),
GetChars( fn.GetFullPath() )
);
diff --git a/pcbnew/plugin.cpp b/pcbnew/plugin.cpp
index e48e649e1..6f37e347d 100644
--- a/pcbnew/plugin.cpp
+++ b/pcbnew/plugin.cpp
@@ -26,7 +26,7 @@
#include <properties.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
diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp
index 357aabb4b..765436e05 100644
--- a/pcbnew/specctra_export.cpp
+++ b/pcbnew/specctra_export.cpp
@@ -807,7 +807,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
if( module->GetReference() == wxEmptyString )
{
- THROW_IO_ERROR( wxString::Format( _( "Component with value of '%s' has empty reference id." ),
+ THROW_IO_ERROR( wxString::Format( _( "Component with value of \"%s\" has empty reference id." ),
GetChars( module->GetValue() ) ) );
}
@@ -815,7 +815,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) );
if( !refpair.second ) // insert failed
{
- THROW_IO_ERROR( wxString::Format( _( "Multiple components have identical reference IDs of '%s'." ),
+ THROW_IO_ERROR( wxString::Format( _( "Multiple components have identical reference IDs of \"%s\"." ),
GetChars( module->GetReference() ) ) );
}
}
diff --git a/tools/io_benchmark/stdstream_line_reader.cpp b/tools/io_benchmark/stdstream_line_reader.cpp
index efacddf20..cb8ddabdc 100644
--- a/tools/io_benchmark/stdstream_line_reader.cpp
+++ b/tools/io_benchmark/stdstream_line_reader.cpp
@@ -73,7 +73,7 @@ IFSTREAM_LINE_READER::IFSTREAM_LINE_READER( const wxFileName& aFileName ) :
if( !m_fStream.is_open() )
{
wxString msg = wxString::Format(
- _( "Unable to open filename '%s' for reading" ), aFileName.GetFullPath().GetData() );
+ _( "Unable to open filename \"%s\" for reading" ), aFileName.GetFullPath().GetData() );
THROW_IO_ERROR( msg );
}
diff --git a/tools/property_tree.cpp b/tools/property_tree.cpp
index 7c19b3136..9879f159a 100644
--- a/tools/property_tree.cpp
+++ b/tools/property_tree.cpp
@@ -52,7 +52,7 @@ int main( int argc, char** argv )
FILE* fp = fopen( argv[1], "r" );
if( !fp )
{
- fprintf( stderr, "Unable to open '%s'\n", argv[1] );
+ fprintf( stderr, "Unable to open \"%s\"\n", argv[1] );
usage();
}
