From a8bb5d7308c1728b94aa856ca9f5136fd27d5bec Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 26 Aug 2018 11:27:14 +0100
Subject: [PATCH] Improve labels.

First two radio buttons together read "Do not show On pads", which is
of course backwards for the second.
---
 pcbnew/dialogs/panel_pcbnew_display_options_base.cpp | 4 ++--
 pcbnew/dialogs/panel_pcbnew_display_options_base.fbp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp b/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp
index 90bce4bcd8..f94e489303 100644
--- a/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.cpp
@@ -28,7 +28,7 @@ PANEL_PCBNEW_DISPLAY_OPTIONS_BASE::PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow*
 	wxStaticBoxSizer* sbAnnotations;
 	sbAnnotations = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Annotations") ), wxVERTICAL );
 	
-	wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("On pads"), _("On tracks"), _("On pads and tracks") };
+	wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("Show on pads"), _("Show on tracks"), _("Show on pads and tracks") };
 	int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString );
 	m_ShowNetNamesOption = new wxRadioBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Net Names"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS );
 	m_ShowNetNamesOption->SetSelection( 0 );
@@ -40,7 +40,7 @@ PANEL_PCBNEW_DISPLAY_OPTIONS_BASE::PANEL_PCBNEW_DISPLAY_OPTIONS_BASE( wxWindow*
 	m_OptDisplayPadNumber->SetValue(true); 
 	sbAnnotations->Add( m_OptDisplayPadNumber, 0, wxALL, 10 );
 	
-	m_OptDisplayPadNoConn = new wxCheckBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Show pad no net connection indicator"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_OptDisplayPadNoConn = new wxCheckBox( sbAnnotations->GetStaticBox(), wxID_ANY, _("Show pad <no net> indicator"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_OptDisplayPadNoConn->SetValue(true); 
 	sbAnnotations->Add( m_OptDisplayPadNoConn, 0, wxBOTTOM|wxLEFT|wxRIGHT, 10 );
 	
diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp
index 54ce4f0088..2ea43fe8b9 100644
--- a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp
+++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp
@@ -143,7 +143,7 @@
                                                 <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
-                                                <property name="choices">&quot;Do not show&quot; &quot;On pads&quot; &quot;On tracks&quot; &quot;On pads and tracks&quot;</property>
+                                                <property name="choices">&quot;Do not show&quot; &quot;Show on pads&quot; &quot;Show on tracks&quot; &quot;Show on pads and tracks&quot;</property>
                                                 <property name="close_button">1</property>
                                                 <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
@@ -336,7 +336,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Show pad no net connection indicator</property>
+                                                <property name="label">Show pad &lt;no net&gt; indicator</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>