diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index 581d7835c4..8b847b3b31 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -100,7 +100,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bButtonSize->Add( 0, 0, 1, wxEXPAND, 5 ); - m_updateFieldValues = new wxButton( sbFields->GetStaticBox(), wxID_ANY, _(" Update Fields from Library... "), wxDefaultPosition, wxDefaultSize, 0 ); + m_updateFieldValues = new wxButton( sbFields->GetStaticBox(), wxID_ANY, _("Update Fields from Library..."), wxDefaultPosition, wxDefaultSize, 0 ); m_updateFieldValues->SetToolTip( _("Sets fields to the original library values") ); bButtonSize->Add( m_updateFieldValues, 0, wxALL|wxEXPAND, 5 ); @@ -176,10 +176,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE lowerSizer->Add( m_rbOrientation, 2, wxEXPAND|wxRIGHT|wxLEFT, 8 ); - wxString m_rbMirrorChoices[] = { _("Default"), _("Mirror around X axis "), _("Mirror around Y axis ") }; + wxString m_rbMirrorChoices[] = { _("Default"), _("Mirror around X axis"), _("Mirror around Y axis") }; int m_rbMirrorNChoices = sizeof( m_rbMirrorChoices ) / sizeof( wxString ); m_rbMirror = new wxRadioBox( this, wxID_ANY, _("Aspect"), wxDefaultPosition, wxDefaultSize, m_rbMirrorNChoices, m_rbMirrorChoices, 1, wxRA_SPECIFY_COLS ); - m_rbMirror->SetSelection( 2 ); + m_rbMirror->SetSelection( 1 ); m_rbMirror->SetToolTip( _("Pick the graphical transformation to be used when displaying the symbol") ); lowerSizer->Add( m_rbMirror, 2, wxEXPAND|wxRIGHT|wxLEFT, 8 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index 74faeef375..0d39faa0ac 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -748,7 +748,7 @@ 0 0 wxID_ANY - Update Fields from Library... + Update Fields from Library... 0 @@ -1569,7 +1569,7 @@ 1 0 - "Default" "Mirror around X axis " "Mirror around Y axis " + "Default" "Mirror around X axis" "Mirror around Y axis" 1 1 @@ -1601,7 +1601,7 @@ 1 Resizable - 2 + 1 1 wxRA_SPECIFY_COLS diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp index 36fcddda3d..b215948886 100644 --- a/pcbnew/board_netlist_updater.cpp +++ b/pcbnew/board_netlist_updater.cpp @@ -480,12 +480,12 @@ bool BOARD_NETLIST_UPDATER::deleteUnusedComponents( NETLIST& aNetlist ) { if( module->IsLocked() ) { - msg.Printf( _( "Cannot remove unused %s (locked)." ), module->GetReference() ); + msg.Printf( _( "Cannot remove unused footprint %s (locked)." ), module->GetReference() ); m_reporter->Report( msg, REPORTER::RPT_WARNING ); continue; } - msg.Printf( _( "Remove unused %s." ), module->GetReference() ); + msg.Printf( _( "Remove unused footprint %s." ), module->GetReference() ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); if( !m_isDryRun ) diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp index 1bf2d52439..ea35fbe9a4 100644 --- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp @@ -290,7 +290,7 @@ bool DIALOG_PAD_PRIMITIVE_POLY_PROPS::doValidate( bool aRemoveRedundantCorners ) if( polyline.PointCount() < 3 ) { - m_warningText->SetLabel( _("Polygon must have at least 3 corners\n after simplification" ) ); + m_warningText->SetLabel( _("Polygon must have at least 3 corners after simplification" ) ); valid = false; } diff --git a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp index 2ea43fe8b9..696a68dcef 100644 --- a/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp +++ b/pcbnew/dialogs/panel_pcbnew_display_options_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 PanelPcbnewDisplayOptions - + . - + 1 1 1 @@ -29,57 +29,57 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_PCBNEW_DISPLAY_OPTIONS_BASE - + -1,-1 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -88,7 +88,7 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - + bupperSizer wxHORIZONTAL none @@ -97,7 +97,7 @@ wxEXPAND 1 - + m_galOptionsSizer wxVERTICAL protected @@ -108,7 +108,7 @@ wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 - + bRightSizer wxVERTICAL none @@ -119,12 +119,12 @@ wxID_ANY Annotations - + sbAnnotations wxVERTICAL 1 none - + 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT @@ -134,85 +134,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Do not show" "Show on pads" "Show on tracks" "Show on pads and tracks" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Net Names 1 - + 0 - - + + 0 - + 1 m_ShowNetNamesOption 1 - - + + protected 1 - + Resizable 0 1 - + wxRA_SPECIFY_COLS - + 0 Show or hide net names on pads and/or tracks. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -224,83 +224,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Show pad numbers - + 0 - - + + 0 - + 1 m_OptDisplayPadNumber 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312,83 +312,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Show pad <no net> indicator - + 0 - - + + 0 - + 1 m_OptDisplayPadNoConn 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -400,12 +400,12 @@ wxID_ANY Clearance Outlines - + sbClearance wxVERTICAL 1 none - + 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT @@ -415,85 +415,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Do not show" "Show when creating tracks" "Show with via clearance at end" "Show when creating and editing tracks" "Show always" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 ID_SHOW_CLEARANCE Track Clearance 1 - + 0 - - + + 0 - + 1 m_OptDisplayTracksClearance 1 - - + + protected 1 - + Resizable 2 1 - + wxRA_SPECIFY_COLS - + 0 Show or hide the track and via clearance area. If "New track" is selected, track clearance area is shown only when creating the track. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -505,83 +505,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Show pad clearance - + 0 - - + + 0 - + 1 m_OptDisplayPadClearence 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +