diff --git a/common/dialogs/wx_html_report_panel_base.cpp b/common/dialogs/wx_html_report_panel_base.cpp
index 565ed54f3e..1910aba930 100644
--- a/common/dialogs/wx_html_report_panel_base.cpp
+++ b/common/dialogs/wx_html_report_panel_base.cpp
@@ -55,14 +55,14 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
bSizer1->Add( m_warningsBadge, 0, wxBOTTOM|wxRIGHT|wxTOP, 4 );
- m_checkBoxShowInfos = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Infos"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer1->Add( m_checkBoxShowInfos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_checkBoxShowActions = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Actions"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer1->Add( m_checkBoxShowActions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
- m_checkBoxShowActions = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Actions"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer1->Add( m_checkBoxShowActions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_checkBoxShowInfos = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Infos"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer1->Add( m_checkBoxShowInfos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
@@ -86,8 +86,8 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
m_checkBoxShowAll->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowAll ), NULL, this );
m_checkBoxShowErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowErrors ), NULL, this );
m_checkBoxShowWarnings->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowWarnings ), NULL, this );
- m_checkBoxShowInfos->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowInfos ), NULL, this );
m_checkBoxShowActions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowActions ), NULL, this );
+ m_checkBoxShowInfos->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowInfos ), NULL, this );
m_btnSaveReportToFile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onBtnSaveToFile ), NULL, this );
}
@@ -98,8 +98,8 @@ WX_HTML_REPORT_PANEL_BASE::~WX_HTML_REPORT_PANEL_BASE()
m_checkBoxShowAll->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowAll ), NULL, this );
m_checkBoxShowErrors->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowErrors ), NULL, this );
m_checkBoxShowWarnings->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowWarnings ), NULL, this );
- m_checkBoxShowInfos->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowInfos ), NULL, this );
m_checkBoxShowActions->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowActions ), NULL, this );
+ m_checkBoxShowInfos->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onCheckBoxShowInfos ), NULL, this );
m_btnSaveReportToFile->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WX_HTML_REPORT_PANEL_BASE::onBtnSaveToFile ), NULL, this );
}
diff --git a/common/dialogs/wx_html_report_panel_base.fbp b/common/dialogs/wx_html_report_panel_base.fbp
index d2cc160661..23b69cba99 100644
--- a/common/dialogs/wx_html_report_panel_base.fbp
+++ b/common/dialogs/wx_html_report_panel_base.fbp
@@ -748,7 +748,7 @@
0
0
wxID_ANY
- Infos
+ Actions
0
@@ -756,7 +756,7 @@
0
1
- m_checkBoxShowInfos
+ m_checkBoxShowActions
1
@@ -778,7 +778,7 @@
- onCheckBoxShowInfos
+ onCheckBoxShowActions
@@ -846,7 +846,7 @@
0
0
wxID_ANY
- Actions
+ Infos
0
@@ -854,7 +854,7 @@
0
1
- m_checkBoxShowActions
+ m_checkBoxShowInfos
1
@@ -876,7 +876,7 @@
- onCheckBoxShowActions
+ onCheckBoxShowInfos
diff --git a/common/dialogs/wx_html_report_panel_base.h b/common/dialogs/wx_html_report_panel_base.h
index ec2832ec15..7443dc4087 100644
--- a/common/dialogs/wx_html_report_panel_base.h
+++ b/common/dialogs/wx_html_report_panel_base.h
@@ -48,8 +48,8 @@ class WX_HTML_REPORT_PANEL_BASE : public wxPanel
wxStaticBitmap* m_errorsBadge;
wxCheckBox* m_checkBoxShowWarnings;
wxStaticBitmap* m_warningsBadge;
- wxCheckBox* m_checkBoxShowInfos;
wxCheckBox* m_checkBoxShowActions;
+ wxCheckBox* m_checkBoxShowInfos;
wxButton* m_btnSaveReportToFile;
// Virtual event handlers, overide them in your derived class
@@ -57,8 +57,8 @@ class WX_HTML_REPORT_PANEL_BASE : public wxPanel
virtual void onCheckBoxShowAll( wxCommandEvent& event ) { event.Skip(); }
virtual void onCheckBoxShowErrors( wxCommandEvent& event ) { event.Skip(); }
virtual void onCheckBoxShowWarnings( wxCommandEvent& event ) { event.Skip(); }
- virtual void onCheckBoxShowInfos( wxCommandEvent& event ) { event.Skip(); }
virtual void onCheckBoxShowActions( wxCommandEvent& event ) { event.Skip(); }
+ virtual void onCheckBoxShowInfos( wxCommandEvent& event ) { event.Skip(); }
virtual void onBtnSaveToFile( wxCommandEvent& event ) { event.Skip(); }
diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp
index 0066e2771c..deb6b14ed2 100644
--- a/pcbnew/board_netlist_updater.cpp
+++ b/pcbnew/board_netlist_updater.cpp
@@ -122,17 +122,17 @@ MODULE* BOARD_NETLIST_UPDATER::addNewComponent( COMPONENT* aComponent )
if( aComponent->GetModule() != NULL )
{
- msg.Printf( _( "Adding new symbol \"%s:%s\" footprint \"%s\".\n" ),
+ msg.Printf( _( "Add symbol %s, footprint: %s." ),
+ GetChars( aComponent->GetReference() ),
+ GetChars( aComponent->GetFPID().Format() ) );
+ m_reporter->Report( msg, REPORTER::RPT_ACTION );
+
+ msg.Printf( _( "Adding new symbol \"%s:%s\" footprint \"%s\"." ),
GetChars( aComponent->GetReference() ),
GetChars( aComponent->GetTimeStamp() ),
GetChars( aComponent->GetFPID().Format() ) );
m_reporter->Report( msg, REPORTER::RPT_INFO );
- msg.Printf( _( "Add symbol %s, footprint: %s.\n" ),
- GetChars( aComponent->GetReference() ),
- GetChars( aComponent->GetFPID().Format() ) );
- m_reporter->Report( msg, REPORTER::RPT_ACTION );
-
if( !m_isDryRun )
{
@@ -150,18 +150,15 @@ MODULE* BOARD_NETLIST_UPDATER::addNewComponent( COMPONENT* aComponent )
}
else
{
- msg.Printf( _( "Cannot add symbol %s due to missing footprint %s.\n" ),
+ msg.Printf( _( "Cannot add symbol %s due to missing footprint %s." ),
GetChars( aComponent->GetReference() ),
GetChars( aComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_ERROR );
- msg.Printf( _( "Cannot add new symbol \"%s:%s\" due to missing "
- "footprint \"%s\".\n" ),
+ msg.Printf( _( "Cannot add new symbol \"%s:%s\" due to missing footprint \"%s\"." ),
GetChars( aComponent->GetReference() ),
GetChars( aComponent->GetTimeStamp() ),
GetChars( aComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_INFO );
++m_errorCount;
}
@@ -183,20 +180,17 @@ MODULE* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, MODULE* aPcb
if( aNewComponent->GetModule() != NULL )
{
- msg.Printf( _( "Change symbol %s footprint from %s to %s.\n"),
+ msg.Printf( _( "Change symbol %s footprint from %s to %s."),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetFPID().Format() ),
GetChars( aNewComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Replacing symbol \"%s:%s\" footprint \"%s\" with "
- "\"%s\".\n" ),
+ msg.Printf( _( "Replacing symbol \"%s:%s\" footprint \"%s\" with \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( aPcbComponent->GetFPID().Format() ),
GetChars( aNewComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_INFO );
if( !m_isDryRun )
@@ -220,19 +214,15 @@ MODULE* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, MODULE* aPcb
}
else
{
- msg.Printf( _( "Cannot change symbol %s footprint due to missing "
- "footprint %s.\n" ),
+ msg.Printf( _( "Cannot change symbol %s footprint due to missing footprint %s." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aNewComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_ERROR );
- msg.Printf( _( "Cannot replace symbol \"%s:%s\" due to missing "
- "footprint \"%s\".\n" ),
+ msg.Printf( _( "Cannot replace symbol \"%s:%s\" due to missing footprint \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( aNewComponent->GetFPID().Format() ) );
-
m_reporter->Report( msg, REPORTER::RPT_INFO );
++m_errorCount;
@@ -256,17 +246,15 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO
// Test for reference designator field change.
if( aPcbComponent->GetReference() != aNewComponent->GetReference() )
{
- msg.Printf( _( "Change symbol %s reference to %s.\n" ),
+ msg.Printf( _( "Change symbol %s reference to %s." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aNewComponent->GetReference() ) );
-
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Changing symbol \"%s:%s\" reference to \"%s\".\n" ),
+ msg.Printf( _( "Changing symbol \"%s:%s\" reference to \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( aNewComponent->GetReference() ) );
-
m_reporter->Report( msg, REPORTER::RPT_INFO );
if ( !m_isDryRun )
@@ -279,20 +267,18 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO
// Test for value field change.
if( aPcbComponent->GetValue() != aNewComponent->GetValue() )
{
- msg.Printf( _( "Change symbol %s value from %s to %s.\n" ),
+ msg.Printf( _( "Change symbol %s value from %s to %s." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetValue() ),
GetChars( aNewComponent->GetValue() ) );
-
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Changing symbol \"%s:%s\" value from \"%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing symbol \"%s:%s\" value from \"%s\" to \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( aPcbComponent->GetValue() ),
GetChars( aNewComponent->GetValue() ) );
-
- m_reporter->Report( msg, REPORTER::RPT_ACTION );
+ m_reporter->Report( msg, REPORTER::RPT_INFO );
if( !m_isDryRun )
{
@@ -304,11 +290,10 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO
// Test for time stamp change.
if( aPcbComponent->GetPath() != aNewComponent->GetTimeStamp() )
{
- msg.Printf( _( "Changing symbol path \"%s:%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing symbol path \"%s:%s\" to \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( aNewComponent->GetTimeStamp() ) );
-
m_reporter->Report( msg, REPORTER::RPT_INFO );
if( !m_isDryRun )
@@ -344,12 +329,12 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( MODULE* aPcbComponent
{
if( !pad->GetNetname().IsEmpty() )
{
- msg.Printf( _( "Disconnect symbol %s pin %s.\n" ),
+ msg.Printf( _( "Disconnect symbol %s pin %s." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( pad->GetName() ) );
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Clearing symbol \"%s:%s\" pin \"%s\" net name.\n" ),
+ msg.Printf( _( "Clearing symbol \"%s:%s\" pin \"%s\" net name." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( pad->GetName() ) );
@@ -395,23 +380,22 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( MODULE* aPcbComponent
if( !pad->GetNetname().IsEmpty() )
{
- msg.Printf( _( "Reconnect symbol %s pin %s from net %s to net %s.\n"),
+ msg.Printf( _( "Reconnect symbol %s pin %s from net %s to net %s."),
GetChars( aPcbComponent->GetReference() ),
GetChars( pad->GetName() ),
GetChars( pad->GetNetname() ),
GetChars( netName ) );
-
- } else {
- msg.Printf( _( "Connect symbol %s pin %s to net %s.\n"),
+ }
+ else
+ {
+ msg.Printf( _( "Connect symbol %s pin %s to net %s."),
GetChars( aPcbComponent->GetReference() ),
GetChars( pad->GetName() ),
GetChars( netName ) );
}
-
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Changing symbol \"%s:%s\" pin \"%s\" net name from "
- "\"%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing symbol \"%s:%s\" pin \"%s\" net from \"%s\" to \"%s\"." ),
GetChars( aPcbComponent->GetReference() ),
GetChars( aPcbComponent->GetPath() ),
GetChars( pad->GetName() ),
@@ -494,7 +478,7 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
if( !updatedNetname.IsEmpty() )
{
- msg.Printf( _( "Reconnect copper zone from net \"%s\" to net \"%s\"." ),
+ msg.Printf( _( "Reconnect copper zone from net %s to net %s." ),
zone->GetNetname(), updatedNetname );
m_reporter->Report( msg, REPORTER::RPT_ACTION );
@@ -518,7 +502,7 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
}
else
{
- msg.Printf( _( "Copper zone (net \"%s\") has no pads connected." ),
+ msg.Printf( _( "Copper zone (net %s) has no pads connected." ),
zone->GetNetname() );
m_reporter->Report( msg, REPORTER::RPT_WARNING );
++m_warningCount;
@@ -549,17 +533,17 @@ bool BOARD_NETLIST_UPDATER::deleteUnusedComponents( NETLIST& aNetlist )
{
if( module->IsLocked() )
{
- msg.Printf( _( "Footprint %s is locked, skipping removal.\n" ),
+ msg.Printf( _( "Footprint %s is locked, skipping removal." ),
GetChars( module->GetReference() ) );
m_reporter->Report( msg, REPORTER::RPT_WARNING );
continue;
}
- msg.Printf( _( "Remove footprint %s." ),
+ msg.Printf( _( "Remove unused footprint %s." ),
GetChars( module->GetReference() ) );
m_reporter->Report( msg, REPORTER::RPT_ACTION );
- msg.Printf( _( "Removing unused footprint \"%s:%s\".\n" ),
+ msg.Printf( _( "Removing unused footprint \"%s:%s\"." ),
GetChars( module->GetReference() ),
GetChars( module->GetPath() ) );
m_reporter->Report( msg, REPORTER::RPT_INFO );
@@ -632,11 +616,11 @@ bool BOARD_NETLIST_UPDATER::deleteSinglePadNets()
GetChars( getNetname( previouspad ) ) );
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\"." ),
GetChars( getNetname( previouspad ) ),
GetChars( previouspad->GetParent()->GetReference() ),
GetChars( previouspad->GetName() ) );
- m_reporter->Report( msg, REPORTER::RPT_ACTION );
+ m_reporter->Report( msg, REPORTER::RPT_INFO );
if( !m_isDryRun )
previouspad->SetNetCode( NETINFO_LIST::UNCONNECTED );
@@ -697,7 +681,7 @@ bool BOARD_NETLIST_UPDATER::testConnectivity( NETLIST& aNetlist )
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." ),
GetChars( component->GetReference() ),
GetChars( padname ),
GetChars( footprint->GetFPID().Format() ) );
@@ -728,7 +712,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
COMPONENT* component = aNetlist.GetComponent( i );
MODULE* footprint = NULL;
- msg.Printf( _( "Processing component \"%s:%s:%s\".\n" ),
+ msg.Printf( _( "Processing component \"%s:%s:%s\"." ),
GetChars( component->GetReference() ),
GetChars( component->GetTimeStamp() ),
GetChars( component->GetFPID().Format() ) );
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 89858f64c2..ca1c406402 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -2512,7 +2512,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
if( aReporter )
{
- msg.Printf( _( "Checking netlist symbol footprint \"%s:%s:%s\".\n" ),
+ msg.Printf( _( "Checking netlist symbol footprint \"%s:%s:%s\"." ),
GetChars( component->GetReference() ),
GetChars( component->GetTimeStamp() ),
GetChars( component->GetFPID().Format() ) );
@@ -2530,21 +2530,16 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( component->GetModule() != NULL )
{
- msg.Printf( _( "Adding new symbol \"%s:%s\" footprint \"%s\".\n" ),
+ msg.Printf( _( "Adding new symbol %s footprint %s." ),
GetChars( component->GetReference() ),
- GetChars( component->GetTimeStamp() ),
GetChars( component->GetFPID().Format() ) );
-
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
else
{
- msg.Printf( _( "Cannot add new symbol \"%s:%s\" due to missing "
- "footprint \"%s\".\n" ),
+ msg.Printf( _( "Cannot add new symbol %s due to missing footprint %s." ),
GetChars( component->GetReference() ),
- GetChars( component->GetTimeStamp() ),
GetChars( component->GetFPID().Format() ) );
-
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
}
@@ -2572,23 +2567,18 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( component->GetModule() != NULL )
{
- msg.Printf( _( "Replacing symbol \"%s:%s\" footprint \"%s\" with "
- "\"%s\".\n" ),
+ msg.Printf( _( "Changing symbol %s footprint from %s to %s." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( footprint->GetFPID().Format() ),
GetChars( component->GetFPID().Format() ) );
-
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
else
{
- msg.Printf( _( "Cannot replace symbol \"%s:%s\" due to missing "
- "footprint \"%s\".\n" ),
+ msg.Printf( _( "Cannot change symbol %s footprint due to missing "
+ "footprint %s." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( component->GetFPID().Format() ) );
-
aReporter->Report( msg, REPORTER::RPT_ERROR );
}
}
@@ -2636,9 +2626,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Changing footprint \"%s:%s\" reference to \"%s\".\n" ),
+ msg.Printf( _( "Changing footprint %s reference to %s." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( component->GetReference() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
@@ -2652,9 +2641,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Changing footprint \"%s:%s\" value from \"%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing footprint %s value from %s to %s." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( footprint->GetValue() ),
GetChars( component->GetValue() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION );
@@ -2669,7 +2657,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Changing component path \"%s:%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing component path \"%s:%s\" to \"%s\"." ),
GetChars( footprint->GetReference() ),
GetChars( footprint->GetPath() ),
GetChars( component->GetTimeStamp() ) );
@@ -2693,9 +2681,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter && !pad->GetNetname().IsEmpty() )
{
- msg.Printf( _( "Clearing component \"%s:%s\" pin \"%s\" net name.\n" ),
+ msg.Printf( _( "Clearing component %s pin %s net." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( pad->GetName() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
@@ -2712,10 +2699,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Changing footprint \"%s:%s\" pad \"%s\" net name from "
- "\"%s\" to \"%s\".\n" ),
+ msg.Printf( _( "Changing footprint %s pad %s net from %s to %s." ),
GetChars( footprint->GetReference() ),
- GetChars( footprint->GetPath() ),
GetChars( pad->GetName() ),
GetChars( pad->GetNetname() ),
GetChars( net.GetNetName() ) );
@@ -2764,9 +2749,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Removing unused footprint \"%s:%s\".\n" ),
- GetChars( module->GetReference() ),
- GetChars( module->GetPath() ) );
+ msg.Printf( _( "Removing unused footprint %s." ),
+ GetChars( module->GetReference() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
@@ -2830,10 +2814,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( aReporter )
{
- msg.Printf( _( "Remove single pad net \"%s\" on \"%s\" pad \"%s\"\n" ),
- GetChars( pad->GetNetname() ),
- GetChars( pad->GetParent()->GetReference() ),
- GetChars( pad->GetName() ) );
+ msg.Printf( _( "Remove single pad net %s." ),
+ GetChars( pad->GetNetname() ) );
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
@@ -2869,7 +2851,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( _( "Symbol %s pad %s not found in footprint %s.\n" ),
GetChars( component->GetReference() ),
GetChars( padname ),
GetChars( footprint->GetFPID().Format() ) );
@@ -2906,13 +2888,13 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets,
{
if( updatedNet )
{
- msg.Printf( _( "Updating copper zone (net name \"%s\") to net name \"%s\"." ),
+ msg.Printf( _( "Updating copper zone from net %s to %s." ),
zone->GetNetname(), updatedNet->GetNetname() );
aReporter->Report( msg, REPORTER::RPT_ACTION );
}
else
{
- msg.Printf( _( "Copper zone (net name \"%s\") has no pads connected." ),
+ msg.Printf( _( "Copper zone (net %s) has no pads connected." ),
zone->GetNetname() );
aReporter->Report( msg, REPORTER::RPT_WARNING );
}