diff --git a/common/dialogs/panel_setup_netclasses_base.cpp b/common/dialogs/panel_setup_netclasses_base.cpp index 8276c899df..9c64c73659 100644 --- a/common/dialogs/panel_setup_netclasses_base.cpp +++ b/common/dialogs/panel_setup_netclasses_base.cpp @@ -41,9 +41,9 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_netclassGrid->SetColLabelValue( 1, _("Clearance") ); m_netclassGrid->SetColLabelValue( 2, _("Track Width") ); m_netclassGrid->SetColLabelValue( 3, _("Via Size") ); - m_netclassGrid->SetColLabelValue( 4, _("Via Drill") ); + m_netclassGrid->SetColLabelValue( 4, _("Via Hole") ); m_netclassGrid->SetColLabelValue( 5, _("uVia Size") ); - m_netclassGrid->SetColLabelValue( 6, _("uVia Drill") ); + m_netclassGrid->SetColLabelValue( 6, _("uVia Hole") ); m_netclassGrid->SetColLabelValue( 7, _("DP Width") ); m_netclassGrid->SetColLabelValue( 8, _("DP Gap") ); m_netclassGrid->SetColLabelValue( 9, _("Wire Thickness") ); diff --git a/common/dialogs/panel_setup_netclasses_base.fbp b/common/dialogs/panel_setup_netclasses_base.fbp index 2b82b2bdb1..6b8b0b2a12 100644 --- a/common/dialogs/panel_setup_netclasses_base.fbp +++ b/common/dialogs/panel_setup_netclasses_base.fbp @@ -155,7 +155,7 @@ 1 wxALIGN_CENTER 24 - "Name" "Clearance" "Track Width" "Via Size" "Via Drill" "uVia Size" "uVia Drill" "DP Width" "DP Gap" "Wire Thickness" "Bus Thickness" "Color" "Line Style" + "Name" "Clearance" "Track Width" "Via Size" "Via Hole" "uVia Size" "uVia Hole" "DP Width" "DP Gap" "Wire Thickness" "Bus Thickness" "Color" "Line Style" wxALIGN_CENTER 13 diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp index 3579b67649..87cd3c3dfc 100644 --- a/pcbnew/dialogs/dialog_track_via_properties.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties.cpp @@ -385,7 +385,7 @@ bool DIALOG_TRACK_VIA_PROPERTIES::TransferDataFromWindow() && m_ViaDrillCtrl->IsEnabled() && !m_viaDrill.IsIndeterminate() && m_viaDiameter.GetValue() <= m_viaDrill.GetValue() ) { - DisplayError( GetParent(), _( "Via drill size must be smaller than via diameter" ) ); + DisplayError( GetParent(), _( "Via hole size must be smaller than via diameter" ) ); m_ViaDrillCtrl->SelectAll(); m_ViaDrillCtrl->SetFocus(); return false; diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.cpp b/pcbnew/dialogs/dialog_track_via_properties_base.cpp index 609ae994e4..31ebc48b03 100644 --- a/pcbnew/dialogs/dialog_track_via_properties_base.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties_base.cpp @@ -213,7 +213,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_ViaDiameterUnit->Wrap( -1 ); fgViaLeftSizer->Add( m_ViaDiameterUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via drill:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via hole:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaDrillLabel->Wrap( -1 ); fgViaLeftSizer->Add( m_ViaDrillLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.fbp b/pcbnew/dialogs/dialog_track_via_properties_base.fbp index 209ef2a42f..8f9e27079b 100644 --- a/pcbnew/dialogs/dialog_track_via_properties_base.fbp +++ b/pcbnew/dialogs/dialog_track_via_properties_base.fbp @@ -2598,7 +2598,7 @@ 0 0 wxID_ANY - Via drill: + Via hole: 0 0 diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp index 0ca849fe2a..543747c7e6 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp @@ -359,7 +359,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi m_bitmapMinuViaDrill = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); fgFeatureConstraints->Add( m_bitmapMinuViaDrill, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_uviaMinDrillLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); + m_uviaMinDrillLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia hole:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_uviaMinDrillLabel->Wrap( -1 ); fgFeatureConstraints->Add( m_uviaMinDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 ); diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp index 43eacf9763..5ec009062c 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp @@ -4403,7 +4403,7 @@ 0 0 wxID_ANY - Minimum uVia drill: + Minimum uVia hole: 0 0 diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index f90175cf57..df45b533d1 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -99,7 +99,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_viaSizesGrid->EnableDragColSize( false ); m_viaSizesGrid->SetColLabelSize( 24 ); m_viaSizesGrid->SetColLabelValue( 0, _("Size") ); - m_viaSizesGrid->SetColLabelValue( 1, _("Drill") ); + m_viaSizesGrid->SetColLabelValue( 1, _("Hole") ); m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 554ea72142..e1584481eb 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -433,7 +433,7 @@ 1 wxALIGN_CENTER 24 - "Size" "Drill" + "Size" "Hole" wxALIGN_CENTER 2 125,125 diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp index 512e005707..cfa399d618 100644 --- a/pcbnew/pad.cpp +++ b/pcbnew/pad.cpp @@ -925,13 +925,13 @@ void PAD::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector& { if( GetDrillShape() == PAD_DRILL_SHAPE_CIRCLE ) { - aList.emplace_back( _( "Drill" ), + aList.emplace_back( _( "Hole" ), wxString::Format( "%s", MessageTextFromValue( units, m_drill.x ) ) ); } else { - aList.emplace_back( _( "Drill X / Y" ), + aList.emplace_back( _( "Hole X / Y" ), wxString::Format( "%s / %s", MessageTextFromValue( units, m_drill.x ), MessageTextFromValue( units, m_drill.y ) ) );