From 8854b799e8467ef93998dcaf7288356cd0e25251 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 11 Apr 2020 13:06:45 +0100
Subject: [PATCH] Fix a minor spelling error.

Also changes the capitalisation of a string which isn't used, but looks
so wrong in FormBuilder that I couldn't help fixing it.
---
 eeschema/dialogs/dialog_sch_import_settings_base.cpp         | 4 ++--
 eeschema/dialogs/dialog_sch_import_settings_base.fbp         | 4 +---
 eeschema/dialogs/dialog_sch_import_settings_base.h           | 2 +-
 eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp | 4 ++--
 eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp | 4 +---
 eeschema/dialogs/panel_eeschema_template_fieldnames_base.h   | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.cpp b/eeschema/dialogs/dialog_sch_import_settings_base.cpp
index 3bcb9c5eca..0fbd0fe91f 100644
--- a/eeschema/dialogs/dialog_sch_import_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sch_import_settings_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -51,7 +51,7 @@ DIALOG_SCH_IMPORT_SETTINGS_BASE::DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* pare
 	m_fieldNameTemplatesOpt = new wxCheckBox( this, wxID_ANY, _("Field name templates"), wxDefaultPosition, wxDefaultSize, 0 );
 	bmiddleSizer->Add( m_fieldNameTemplatesOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-	m_pinMapOpt = new wxCheckBox( this, wxID_ANY, _("Pin confict map"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_pinMapOpt = new wxCheckBox( this, wxID_ANY, _("Pin conflict map"), wxDefaultPosition, wxDefaultSize, 0 );
 	bmiddleSizer->Add( m_pinMapOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_SeveritiesOpt = new wxCheckBox( this, wxID_ANY, _("Violation severities"), wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.fbp b/eeschema/dialogs/dialog_sch_import_settings_base.fbp
index f67ab5db4c..f66662df3e 100644
--- a/eeschema/dialogs/dialog_sch_import_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sch_import_settings_base.fbp
@@ -14,7 +14,6 @@
         <property name="file">dialog_sch_import_settings_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_import_settings_base</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -500,7 +498,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Pin confict map</property>
+                                <property name="label">Pin conflict map</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.h b/eeschema/dialogs/dialog_sch_import_settings_base.h
index 076fbdda21..a4888d7d79 100644
--- a/eeschema/dialogs/dialog_sch_import_settings_base.h
+++ b/eeschema/dialogs/dialog_sch_import_settings_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp
index a20d47ab25..9fe4caa26b 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -20,7 +20,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
 
 	m_topMargin = new wxBoxSizer( wxVERTICAL );
 
-	m_title = new wxStaticText( this, wxID_ANY, _("field name templates:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_title = new wxStaticText( this, wxID_ANY, _("Field name templates:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_title->Wrap( -1 );
 	m_topMargin->Add( m_title, 0, wxTOP|wxBOTTOM, 5 );
 
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp
index 5fbcace712..20f87a0fe4 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp
@@ -14,7 +14,6 @@
         <property name="file">panel_eeschema_template_fieldnames_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">PanelEeschemaTemplateFieldnames</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Panel" expanded="1">
@@ -106,7 +104,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">field name templates:</property>
+                                        <property name="label">Field name templates:</property>
                                         <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h
index d5d1320a43..20653729cd 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 10 2019)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!