From b68b1692ec648bc35e6e02fa0d845e234135cb9e Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 18 Dec 2020 01:44:16 +0000 Subject: [PATCH] Clean up some more user messages. Mostly component -> symbol but also some I18N cleanup. --- eeschema/cross-probing.cpp | 23 +++++++++++-------- eeschema/tools/symbol_editor_edit_tool.cpp | 2 +- .../dialogs/dialog_footprint_properties.cpp | 10 ++++---- pcbnew/dialogs/dialog_netlist.cpp | 4 ++-- .../drc_test_provider_courtyard_clearance.cpp | 2 +- pcbnew/footprint_libraries_utils.cpp | 4 ++-- .../netlist_reader/board_netlist_updater.cpp | 4 ++-- 7 files changed, 26 insertions(+), 23 deletions(-) diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp index 12bcc7f22c..dce60915cd 100644 --- a/eeschema/cross-probing.cpp +++ b/eeschema/cross-probing.cpp @@ -246,23 +246,26 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindComponentAndItem( const wxString& aReference, } /* Print diag */ - wxString msg_item; wxString msg; - if( aSearchType == HIGHLIGHT_PIN ) - msg_item.Printf( _( "pin %s" ), aSearchText ); - else - msg_item = _( "component" ); - if( component ) { - if( foundItem ) - msg.Printf( _( "%s %s found" ), aReference, msg_item ); + if( aSearchType == HIGHLIGHT_PIN ) + { + if( foundItem ) + msg.Printf( _( "%s pin %s found" ), aReference, aSearchText ); + else + msg.Printf( _( "%s found but pin %s not found" ), aReference, aSearchText ); + } else - msg.Printf( _( "%s found but %s not found" ), aReference, msg_item ); + { + msg.Printf( _( "%s found" ), aReference ); + } } else - msg.Printf( _( "Component %s not found" ), aReference ); + { + msg.Printf( _( "%s not found" ), aReference ); + } m_frame->SetStatusText( msg ); diff --git a/eeschema/tools/symbol_editor_edit_tool.cpp b/eeschema/tools/symbol_editor_edit_tool.cpp index 5610db1dec..c9ad9fd840 100644 --- a/eeschema/tools/symbol_editor_edit_tool.cpp +++ b/eeschema/tools/symbol_editor_edit_tool.cpp @@ -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 // on the current component. Set the dialog message to inform the user. if( aField->GetId() == VALUE_FIELD ) - caption = _( "Edit Component Name" ); + caption = _( "Edit Symbol Name" ); else caption.Printf( _( "Edit %s Field" ), aField->GetName() ); diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index 32510a2dfe..3fc7596167 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -309,13 +309,13 @@ bool DIALOG_FOOTPRINT_PROPERTIES::TransferDataToWindow() else m_AutoPlaceCtrl->SetSelection( 0 ); - m_AutoPlaceCtrl->SetItemToolTip( 0, _( "Component can be freely moved and auto placed. User " - "can arbitrarily select and edit component's pads." ) ); - m_AutoPlaceCtrl->SetItemToolTip( 1, _( "Component can be freely moved and auto placed, but " + m_AutoPlaceCtrl->SetItemToolTip( 0, _( "Footprint can be freely moved and auto placed. User " + "can arbitrarily select and edit footprint's pads." ) ); + m_AutoPlaceCtrl->SetItemToolTip( 1, _( "Footprint can be freely moved and auto placed, but " "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 " - "\"Locked items\" checkbox is enabled in the " + "'Locked items' checkbox is enabled in the " "selection filter." ) ); m_CostRot90Ctrl->SetValue( m_footprint->GetPlacementCost90() ); diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp index 7d86e6f54d..9c90d494a1 100644 --- a/pcbnew/dialogs/dialog_netlist.cpp +++ b/pcbnew/dialogs/dialog_netlist.cpp @@ -234,9 +234,9 @@ void DIALOG_NETLIST::loadNetlist( bool aDryRun ) reporter.ReportHead( msg, RPT_SEVERITY_INFO ); 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 - 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 ); m_MessageWindow->SetLazyUpdate( true ); // Use lazy update to speed the creation of the report diff --git a/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp b/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp index b1eee21371..1dd34168c1 100644 --- a/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp +++ b/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp @@ -58,7 +58,7 @@ public: virtual const wxString GetDescription() const override { - return "Tests components' courtyard clearance"; + return "Tests footprints' courtyard clearance"; } virtual std::set GetConstraintTypes() const override; diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp index 645cbbf1a7..6291c1f92b 100644 --- a/pcbnew/footprint_libraries_utils.cpp +++ b/pcbnew/footprint_libraries_utils.cpp @@ -973,8 +973,8 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint ) // Once saved-as a board footprint is no longer a board footprint aFootprint->SetLink( niluuid ); - wxString fmt = footprintExists ? _( "Component \"%s\" replaced in \"%s\"" ) - : _( "Component \"%s\" added in \"%s\"" ); + wxString fmt = footprintExists ? _( "Footprint '%s' replaced in '%s'" ) + : _( "Footprint '%s' added to '%s'" ); wxString msg = wxString::Format( fmt, footprintName.GetData(), libraryName.GetData() ); SetStatusText( msg ); diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp index 76833949d8..9ee2345d66 100644 --- a/pcbnew/netlist_reader/board_netlist_updater.cpp +++ b/pcbnew/netlist_reader/board_netlist_updater.cpp @@ -392,7 +392,7 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( FOOTPRINT* aPcbCompon else if( m_warnForNoNetPads && pad->IsOnCopperLayer() && !pad->GetName().IsEmpty() ) { // 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(), pad->GetName() ); 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" ) ) continue; - msg.Printf( _( "Processing component \"%s:%s\"." ), + msg.Printf( _( "Processing symbol '%s:%s'." ), component->GetReference(), component->GetFPID().Format().wx_str() ); m_reporter->Report( msg, RPT_SEVERITY_INFO );