Clean up some more user messages.

Mostly component -> symbol but also some I18N cleanup.
This commit is contained in:
Jeff Young 2020-12-18 01:44:16 +00:00
parent 4ce91d3e92
commit b68b1692ec
7 changed files with 26 additions and 23 deletions

View File

@ -246,23 +246,26 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindComponentAndItem( const wxString& aReference,
} }
/* Print diag */ /* Print diag */
wxString msg_item;
wxString msg; wxString msg;
if( aSearchType == HIGHLIGHT_PIN )
msg_item.Printf( _( "pin %s" ), aSearchText );
else
msg_item = _( "component" );
if( component ) if( component )
{ {
if( foundItem ) if( aSearchType == HIGHLIGHT_PIN )
msg.Printf( _( "%s %s found" ), aReference, msg_item ); {
if( foundItem )
msg.Printf( _( "%s pin %s found" ), aReference, aSearchText );
else
msg.Printf( _( "%s found but pin %s not found" ), aReference, aSearchText );
}
else else
msg.Printf( _( "%s found but %s not found" ), aReference, msg_item ); {
msg.Printf( _( "%s found" ), aReference );
}
} }
else else
msg.Printf( _( "Component %s not found" ), aReference ); {
msg.Printf( _( "%s not found" ), aReference );
}
m_frame->SetStatusText( msg ); m_frame->SetStatusText( msg );

View File

@ -497,7 +497,7 @@ void SYMBOL_EDITOR_EDIT_TOOL::editFieldProperties( LIB_FIELD* aField )
// Editing the component value field is equivalent to creating a new component based // Editing the component value field is equivalent to creating a new component based
// on the current component. Set the dialog message to inform the user. // on the current component. Set the dialog message to inform the user.
if( aField->GetId() == VALUE_FIELD ) if( aField->GetId() == VALUE_FIELD )
caption = _( "Edit Component Name" ); caption = _( "Edit Symbol Name" );
else else
caption.Printf( _( "Edit %s Field" ), aField->GetName() ); caption.Printf( _( "Edit %s Field" ), aField->GetName() );

View File

@ -309,13 +309,13 @@ bool DIALOG_FOOTPRINT_PROPERTIES::TransferDataToWindow()
else else
m_AutoPlaceCtrl->SetSelection( 0 ); m_AutoPlaceCtrl->SetSelection( 0 );
m_AutoPlaceCtrl->SetItemToolTip( 0, _( "Component can be freely moved and auto placed. User " m_AutoPlaceCtrl->SetItemToolTip( 0, _( "Footprint can be freely moved and auto placed. User "
"can arbitrarily select and edit component's pads." ) ); "can arbitrarily select and edit footprint's pads." ) );
m_AutoPlaceCtrl->SetItemToolTip( 1, _( "Component can be freely moved and auto placed, but " m_AutoPlaceCtrl->SetItemToolTip( 1, _( "Footprint can be freely moved and auto placed, but "
"its pads cannot be edited." ) ); "its pads cannot be edited." ) );
m_AutoPlaceCtrl->SetItemToolTip( 2, _( "Component is locked: it cannot be freely moved or " m_AutoPlaceCtrl->SetItemToolTip( 2, _( "Footprint is locked: it cannot be freely moved or "
"auto placed, and can only be selected when the " "auto placed, and can only be selected when the "
"\"Locked items\" checkbox is enabled in the " "'Locked items' checkbox is enabled in the "
"selection filter." ) ); "selection filter." ) );
m_CostRot90Ctrl->SetValue( m_footprint->GetPlacementCost90() ); m_CostRot90Ctrl->SetValue( m_footprint->GetPlacementCost90() );

View File

@ -234,9 +234,9 @@ void DIALOG_NETLIST::loadNetlist( bool aDryRun )
reporter.ReportHead( msg, RPT_SEVERITY_INFO ); reporter.ReportHead( msg, RPT_SEVERITY_INFO );
if( m_matchByTimestamp->GetSelection() == 1 ) if( m_matchByTimestamp->GetSelection() == 1 )
msg = _( "Using reference designators to match components and footprints.\n" ); msg = _( "Using reference designators to match symbols and footprints.\n" );
else else
msg = _( "Using tstamps (unique IDs) to match components and footprints.\n" ); msg = _( "Using tstamps (unique IDs) to match symbols and footprints.\n" );
reporter.ReportHead( msg, RPT_SEVERITY_INFO ); reporter.ReportHead( msg, RPT_SEVERITY_INFO );
m_MessageWindow->SetLazyUpdate( true ); // Use lazy update to speed the creation of the report m_MessageWindow->SetLazyUpdate( true ); // Use lazy update to speed the creation of the report

View File

@ -58,7 +58,7 @@ public:
virtual const wxString GetDescription() const override virtual const wxString GetDescription() const override
{ {
return "Tests components' courtyard clearance"; return "Tests footprints' courtyard clearance";
} }
virtual std::set<DRC_CONSTRAINT_TYPE_T> GetConstraintTypes() const override; virtual std::set<DRC_CONSTRAINT_TYPE_T> GetConstraintTypes() const override;

View File

@ -973,8 +973,8 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint )
// Once saved-as a board footprint is no longer a board footprint // Once saved-as a board footprint is no longer a board footprint
aFootprint->SetLink( niluuid ); aFootprint->SetLink( niluuid );
wxString fmt = footprintExists ? _( "Component \"%s\" replaced in \"%s\"" ) wxString fmt = footprintExists ? _( "Footprint '%s' replaced in '%s'" )
: _( "Component \"%s\" added in \"%s\"" ); : _( "Footprint '%s' added to '%s'" );
wxString msg = wxString::Format( fmt, footprintName.GetData(), libraryName.GetData() ); wxString msg = wxString::Format( fmt, footprintName.GetData(), libraryName.GetData() );
SetStatusText( msg ); SetStatusText( msg );

View File

@ -392,7 +392,7 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( FOOTPRINT* aPcbCompon
else if( m_warnForNoNetPads && pad->IsOnCopperLayer() && !pad->GetName().IsEmpty() ) else if( m_warnForNoNetPads && pad->IsOnCopperLayer() && !pad->GetName().IsEmpty() )
{ {
// pad is connectable but has no net found in netlist // pad is connectable but has no net found in netlist
msg.Printf( _( "No net for component %s pin %s." ), msg.Printf( _( "No net for symbol %s pin %s." ),
aPcbComponent->GetReference(), aPcbComponent->GetReference(),
pad->GetName() ); pad->GetName() );
m_reporter->Report( msg, RPT_SEVERITY_WARNING); m_reporter->Report( msg, RPT_SEVERITY_WARNING);
@ -816,7 +816,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist )
if( component->GetProperties().count( "exclude_from_board" ) ) if( component->GetProperties().count( "exclude_from_board" ) )
continue; continue;
msg.Printf( _( "Processing component \"%s:%s\"." ), msg.Printf( _( "Processing symbol '%s:%s'." ),
component->GetReference(), component->GetReference(),
component->GetFPID().Format().wx_str() ); component->GetFPID().Format().wx_str() );
m_reporter->Report( msg, RPT_SEVERITY_INFO ); m_reporter->Report( msg, RPT_SEVERITY_INFO );