From 38b75db12c6aebbe09191990f6b978566f779ef7 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 26 Jul 2022 14:42:19 +0100
Subject: [PATCH] Fix merge breakage.

Fixes https://gitlab.com/kicad/code/kicad/issues/12088
---
 pcbnew/dialogs/dialog_drc_base.cpp | 6 +++---
 pcbnew/dialogs/dialog_drc_base.fbp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pcbnew/dialogs/dialog_drc_base.cpp b/pcbnew/dialogs/dialog_drc_base.cpp
index 4a7582362b..a000d73dd6 100644
--- a/pcbnew/dialogs/dialog_drc_base.cpp
+++ b/pcbnew/dialogs/dialog_drc_base.cpp
@@ -102,7 +102,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	m_panelViolations->SetSizer( bSizerViolationsBox );
 	m_panelViolations->Layout();
 	bSizerViolationsBox->Fit( m_panelViolations );
-	m_Notebook->AddPage( m_panelViolations, _("Violations (%d)"), false );
+	m_Notebook->AddPage( m_panelViolations, _("Violations (%s)"), false );
 	m_panelUnconnectedItems = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizerUnconnectedBox;
 	bSizerUnconnectedBox = new wxBoxSizer( wxVERTICAL );
@@ -114,7 +114,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	m_panelUnconnectedItems->SetSizer( bSizerUnconnectedBox );
 	m_panelUnconnectedItems->Layout();
 	bSizerUnconnectedBox->Fit( m_panelUnconnectedItems );
-	m_Notebook->AddPage( m_panelUnconnectedItems, _("Unconnected Items (%d)"), false );
+	m_Notebook->AddPage( m_panelUnconnectedItems, _("Unconnected Items (%s)"), false );
 	m_panelFootprintWarnings = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizerFootprintsBox;
 	bSizerFootprintsBox = new wxBoxSizer( wxVERTICAL );
@@ -126,7 +126,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	m_panelFootprintWarnings->SetSizer( bSizerFootprintsBox );
 	m_panelFootprintWarnings->Layout();
 	bSizerFootprintsBox->Fit( m_panelFootprintWarnings );
-	m_Notebook->AddPage( m_panelFootprintWarnings, _("Schematic Parity (%d)"), false );
+	m_Notebook->AddPage( m_panelFootprintWarnings, _("Schematic Parity (%s)"), false );
 
 	bSizer13->Add( m_Notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
diff --git a/pcbnew/dialogs/dialog_drc_base.fbp b/pcbnew/dialogs/dialog_drc_base.fbp
index d363bbb7e5..3aeb3f5ef8 100644
--- a/pcbnew/dialogs/dialog_drc_base.fbp
+++ b/pcbnew/dialogs/dialog_drc_base.fbp
@@ -777,7 +777,7 @@
                                             <event name="OnNotebookPageChanged">OnChangingNotebookPage</event>
                                             <object class="notebookpage" expanded="1">
                                                 <property name="bitmap"></property>
-                                                <property name="label">Violations (%d)</property>
+                                                <property name="label">Violations (%s)</property>
                                                 <property name="select">0</property>
                                                 <object class="wxPanel" expanded="1">
                                                     <property name="BottomDockable">1</property>
@@ -870,7 +870,7 @@
                                             </object>
                                             <object class="notebookpage" expanded="0">
                                                 <property name="bitmap"></property>
-                                                <property name="label">Unconnected Items (%d)</property>
+                                                <property name="label">Unconnected Items (%s)</property>
                                                 <property name="select">0</property>
                                                 <object class="wxPanel" expanded="0">
                                                     <property name="BottomDockable">1</property>
@@ -962,7 +962,7 @@
                                             </object>
                                             <object class="notebookpage" expanded="0">
                                                 <property name="bitmap"></property>
-                                                <property name="label">Schematic Parity (%d)</property>
+                                                <property name="label">Schematic Parity (%s)</property>
                                                 <property name="select">0</property>
                                                 <object class="wxPanel" expanded="0">
                                                     <property name="BottomDockable">1</property>