diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp
index 1d539783d3..0a456580db 100644
--- a/eeschema/dialogs/panel_sym_lib_table_base.cpp
+++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp
@@ -166,7 +166,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
bMainSizer->Add( 0, 5, 0, wxEXPAND, 5 );
wxStaticText* stPathsLabel;
- stPathsLabel = new wxStaticText( this, wxID_ANY, _("Path Substitutions:"), wxDefaultPosition, wxDefaultSize, 0 );
+ stPathsLabel = new wxStaticText( this, wxID_ANY, _("Available path substitutions:"), wxDefaultPosition, wxDefaultSize, 0 );
stPathsLabel->Wrap( -1 );
bMainSizer->Add( stPathsLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 );
diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp
index faf42c1030..8cd9755c72 100644
--- a/eeschema/dialogs/panel_sym_lib_table_base.fbp
+++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp
@@ -936,7 +936,7 @@
0
0
wxID_ANY
- Path Substitutions:
+ Available path substitutions:
0
0
diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp
index b5a43ca322..0bb00847bd 100644
--- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp
@@ -154,7 +154,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i
bMainSizer->Add( bButtonsSizer, 0, wxEXPAND|wxALL, 8 );
wxStaticText* stPathsLabel;
- stPathsLabel = new wxStaticText( this, wxID_ANY, _("Path Substitutions:"), wxDefaultPosition, wxDefaultSize, 0 );
+ stPathsLabel = new wxStaticText( this, wxID_ANY, _("Available path substitutions:"), wxDefaultPosition, wxDefaultSize, 0 );
stPathsLabel->Wrap( -1 );
bMainSizer->Add( stPathsLabel, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 8 );
diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp
index 7c779a446e..85747fcdd8 100644
--- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp
+++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp
@@ -830,7 +830,7 @@
0
0
wxID_ANY
- Path Substitutions:
+ Available path substitutions:
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 42c23171b4..e50cbeee90 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
@@ -20,9 +20,10 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
wxBoxSizer* bSizerTracks;
bSizerTracks = new wxBoxSizer( wxVERTICAL );
- m_tracksLabel = new wxStaticText( this, wxID_ANY, _("Tracks"), wxDefaultPosition, wxDefaultSize, 0 );
- m_tracksLabel->Wrap( -1 );
- bSizerTracks->Add( m_tracksLabel, 0, wxALL, 5 );
+ wxStaticText* stTracksLabel;
+ stTracksLabel = new wxStaticText( this, wxID_ANY, _("Tracks:"), wxDefaultPosition, wxDefaultSize, 0 );
+ stTracksLabel->Wrap( -1 );
+ bSizerTracks->Add( stTracksLabel, 0, wxALL, 5 );
m_trackWidthsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
@@ -83,9 +84,10 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
wxBoxSizer* bSizerVias;
bSizerVias = new wxBoxSizer( wxVERTICAL );
- m_viasLabel = new wxStaticText( this, wxID_ANY, _("Vias"), wxDefaultPosition, wxDefaultSize, 0 );
- m_viasLabel->Wrap( -1 );
- bSizerVias->Add( m_viasLabel, 0, wxALL, 5 );
+ wxStaticText* stViasLabel;
+ stViasLabel = new wxStaticText( this, wxID_ANY, _("Vias:"), wxDefaultPosition, wxDefaultSize, 0 );
+ stViasLabel->Wrap( -1 );
+ bSizerVias->Add( stViasLabel, 0, wxALL, 5 );
m_viaSizesGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
@@ -147,9 +149,10 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
wxBoxSizer* bSizerDiffPairs;
bSizerDiffPairs = new wxBoxSizer( wxVERTICAL );
- m_diffPairsLabel = new wxStaticText( this, wxID_ANY, _("Differential Pairs"), wxDefaultPosition, wxDefaultSize, 0 );
- m_diffPairsLabel->Wrap( -1 );
- bSizerDiffPairs->Add( m_diffPairsLabel, 0, wxALL, 5 );
+ wxStaticText* stDiffPairsLabel;
+ stDiffPairsLabel = new wxStaticText( this, wxID_ANY, _("Differential pairs:"), wxDefaultPosition, wxDefaultSize, 0 );
+ stDiffPairsLabel->Wrap( -1 );
+ bSizerDiffPairs->Add( stDiffPairsLabel, 0, wxALL, 5 );
m_diffPairsGrid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
index 390a57d00b..1c406a64ae 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
@@ -98,7 +98,7 @@
0
0
wxID_ANY
- Tracks
+ Tracks:
0
0
@@ -107,11 +107,11 @@
0
1
- m_tracksLabel
+ stTracksLabel
1
- protected
+ none
1
Resizable
@@ -501,7 +501,7 @@
0
0
wxID_ANY
- Vias
+ Vias:
0
0
@@ -510,11 +510,11 @@
0
1
- m_viasLabel
+ stViasLabel
1
- protected
+ none
1
Resizable
@@ -904,7 +904,7 @@
0
0
wxID_ANY
- Differential Pairs
+ Differential pairs:
0
0
@@ -913,11 +913,11 @@
0
1
- m_diffPairsLabel
+ stDiffPairsLabel
1
- protected
+ none
1
Resizable
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
index f69579a3fe..e8526176cd 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
@@ -38,17 +38,14 @@ class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel
private:
protected:
- wxStaticText* m_tracksLabel;
WX_GRID* m_trackWidthsGrid;
STD_BITMAP_BUTTON* m_trackWidthsAddButton;
STD_BITMAP_BUTTON* m_trackWidthsSortButton;
STD_BITMAP_BUTTON* m_trackWidthsRemoveButton;
- wxStaticText* m_viasLabel;
WX_GRID* m_viaSizesGrid;
STD_BITMAP_BUTTON* m_viaSizesAddButton;
STD_BITMAP_BUTTON* m_viaSizesSortButton;
STD_BITMAP_BUTTON* m_viaSizesRemoveButton;
- wxStaticText* m_diffPairsLabel;
WX_GRID* m_diffPairsGrid;
STD_BITMAP_BUTTON* m_diffPairsAddButton;
STD_BITMAP_BUTTON* m_diffPairsSortButton;