From 4525b1f0853d41f0a9bb5cb48f5709cdd8c28fc0 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 23 Apr 2022 09:39:34 +0100
Subject: [PATCH] More consistency in DRC error messages.

---
 pcbnew/drc/drc_item.cpp | 2 +-
 pcbnew/footprint.cpp    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pcbnew/drc/drc_item.cpp b/pcbnew/drc/drc_item.cpp
index 9ac8facbe5..a073724c21 100644
--- a/pcbnew/drc/drc_item.cpp
+++ b/pcbnew/drc/drc_item.cpp
@@ -241,7 +241,7 @@ DRC_ITEM DRC_ITEM::diffPairUncoupledLengthTooLong( DRCE_DIFF_PAIR_UNCOUPLED_LENG
         wxT( "diff_pair_uncoupled_length_too_long" ) );
 
 DRC_ITEM DRC_ITEM::footprintTypeMismatch( DRCE_FOOTPRINT_TYPE_MISMATCH,
-        _( "Footprint type doesn't match footprint pads" ),
+        _( "Footprint component type doesn't match footprint pads" ),
         wxT( "footprint_type_mismatch" ) );
 
 DRC_ITEM DRC_ITEM::footprintTHPadhasNoHole( DRCE_PAD_TH_WITH_NO_HOLE,
diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp
index 393ae9eb7f..198385f22a 100644
--- a/pcbnew/footprint.cpp
+++ b/pcbnew/footprint.cpp
@@ -2214,15 +2214,15 @@ void FOOTPRINT::CheckFootprintAttributes( const std::function<void( const wxStri
 
         if( likelyAttr == FP_THROUGH_HOLE )
         {
-            msg.Printf( _( "Expected \"Through hole\" type but set to \"%s\"" ), GetTypeName() );
+            msg.Printf( _( "(expected 'Through hole'; actual '%s')" ), GetTypeName() );
         }
         else if( likelyAttr == FP_SMD )
         {
-            msg.Printf( _( "Expected \"SMD\" type but set to \"%s\"" ), GetTypeName() );
+            msg.Printf( _( "(expected 'SMD'; actual '%s')" ), GetTypeName() );
         }
         else
         {
-            msg.Printf( _( "Expected \"Other\" type but set to \"%s\"" ), GetTypeName() );
+            msg.Printf( _( "(expected 'Other'; actual '%s')" ), GetTypeName() );
         }
 
         msg = wxT( "(" ) + msg + wxT( ")" );