diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp index 71b8411055..25201fc9d4 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -520,11 +520,11 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer11->Add( 0, 0, 1, 0, 5 ); - m_staticText20 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation °"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText20 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText20->Wrap( -1 ); fgSizer11->Add( m_staticText20, 0, wxALL, 5 ); - m_staticText18 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth °"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText18 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); fgSizer11->Add( m_staticText18, 0, wxALL, 5 ); @@ -537,11 +537,11 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi fgSizer11->Add( 0, 0, 1, 0, 5 ); - m_staticText27 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation °"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText27 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Elevation (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText27->Wrap( -1 ); fgSizer11->Add( m_staticText27, 0, wxALL, 5 ); - m_staticText28 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth °"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText28 = new wxStaticText( sbSizerRaytracingLightConfiguration->GetStaticBox(), wxID_ANY, _("Azimuth (degrees)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText28->Wrap( -1 ); fgSizer11->Add( m_staticText28, 0, wxALL, 5 ); diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp index 072a878c54..30f6c5e8a6 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.fbp @@ -47,7 +47,7 @@ DIALOG_3D_VIEW_OPTIONS_BASE - 659,567 + 810,567 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h 3D Display Options @@ -3603,7 +3603,7 @@ 5 wxALL|wxEXPAND 0 - + wxID_ANY Raytracing Render Options -1,32 @@ -4153,7 +4153,7 @@ 5 wxALL|wxEXPAND 1 - + wxID_ANY Lights configuration -1,-1 @@ -4605,7 +4605,7 @@ - + 5 wxALL|wxEXPAND 0 @@ -4673,7 +4673,7 @@ 0 0 wxID_ANY - Elevation ° + Elevation (degrees) 0 0 @@ -4734,7 +4734,7 @@ 0 0 wxID_ANY - Azimuth ° + Azimuth (degrees) 0 0 @@ -4825,7 +4825,7 @@ 0 0 wxID_ANY - Elevation ° + Elevation (degrees) 0 0 @@ -4886,7 +4886,7 @@ 0 0 wxID_ANY - Azimuth ° + Azimuth (degrees) 0 0 diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h index b473803c93..a2eeb409e6 100644 --- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h +++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Aug 13 2020) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -155,7 +155,7 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM public: - DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 659,567 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 810,567 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_3D_VIEW_OPTIONS_BASE(); }; diff --git a/include/class_pcb_group.h b/include/class_pcb_group.h index e9af797ce7..d8e26765ca 100644 --- a/include/class_pcb_group.h +++ b/include/class_pcb_group.h @@ -110,7 +110,7 @@ public: ///> @copydoc BOARD_ITEM::SetLayer void SetLayer( PCB_LAYER_ID aLayer ) override { - wxFAIL_MSG( _( "groups don't support layer SetLayer" ) ); + wxFAIL_MSG( "groups don't support layer SetLayer" ); } ///> @copydoc EDA_ITEM::Clone @@ -132,7 +132,7 @@ public: ///> @copydoc BOARD_ITEM::IsOnLayer bool IsOnLayer( PCB_LAYER_ID aLayer ) const override { - wxFAIL_MSG( _( "groups don't support layer IsOnLayer" ) ); + wxFAIL_MSG( "groups don't support layer IsOnLayer" ); return false; } @@ -181,7 +181,7 @@ public: /** * Invokes a function on all descendents of the group. - * Note that this function should not add or remove items to the group or descendent + * Note that this function should not add or remove items to the group or descendent * groups. * @param aFunction is the function to be invoked. */ diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp index 1650b2ad3c..f8dc3fd202 100644 --- a/pcbnew/class_board.cpp +++ b/pcbnew/class_board.cpp @@ -2079,7 +2079,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) return wxString::Format( _( "Two groups of identical name: %s" ), group.GetName() ); } wxCHECK( groupNames.insert( group.GetName() ).second == true, - _( "Insert failed of new group" ) ); + "Insert failed of new group" ); } for( const BOARD_ITEM* member : group.GetItems() ) @@ -2119,7 +2119,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) item->m_Uuid.AsString() ); } wxCHECK( allMembers.insert( member->m_Uuid.AsString() ).second == true, - _( "Insert failed of new member" ) ); + "Insert failed of new member" ); if( item->Type() == PCB_GROUP_T ) { @@ -2130,10 +2130,10 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) // is not found in the groups list, then the board.GetItem() // check above should have failed. wxCHECK( childIdx >= 0 && childIdx < groups.size(), - wxString::Format( _( "Group %s not found in groups list" ), + wxString::Format( "Group %s not found in groups list", item->m_Uuid.AsString() ) ); wxCHECK( parentGroupIdx[childIdx] == -1, - wxString::Format( _( "Duplicate group despite allMembers check previously: %s" ), + wxString::Format( "Duplicate group despite allMembers check previously: %s", item->m_Uuid.AsString() ) ); parentGroupIdx[childIdx] = idx; } @@ -2167,7 +2167,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) // Initialize set of groups to check that could participate in a cycle. for( size_t idx = 0; idx < groups.size(); idx++ ) { - wxCHECK( toCheckGroups.insert( idx ).second == true, _( "Insert of ints failed" ) ); + wxCHECK( toCheckGroups.insert( idx ).second == true, "Insert of ints failed" ); } while( !toCheckGroups.empty() ) @@ -2180,7 +2180,7 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) { if( repair ) board.Groups().erase( board.Groups().begin() + currIdx ); - return _( "Cycle detected in group membership" ); + return "Cycle detected in group membership"; } else if( knownCycleFreeGroups.find( currIdx ) != knownCycleFreeGroups.end() ) { @@ -2188,10 +2188,10 @@ wxString BOARD::GroupsSanityCheckInternal( bool repair ) break; } wxCHECK( currentChainGroups.insert( currIdx ).second == true, - _( "Insert of new group to check failed" ) ); + "Insert of new group to check failed" ); // We haven't visited currIdx yet, so it must be in toCheckGroups wxCHECK( toCheckGroups.erase( currIdx ) == 1, - _( "Erase of idx for group just checked failed" ) ); + "Erase of idx for group just checked failed" ); currIdx = parentGroupIdx[currIdx]; if( currIdx == -1 ) { @@ -2371,7 +2371,7 @@ void BOARD::GroupRemoveItems( const PCBNEW_SELECTION& selection, BOARD_COMMIT* c removedSomething = true; } } - wxCHECK_RET( removedSomething, _( "Item to be removed not found in it's parent group" ) ); + wxCHECK_RET( removedSomething, "Item to be removed not found in it's parent group" ); } } diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp index dbb620c900..ab18fdd011 100644 --- a/pcbnew/dialogs/dialog_board_reannotate.cpp +++ b/pcbnew/dialogs/dialog_board_reannotate.cpp @@ -297,7 +297,7 @@ void DIALOG_BOARD_REANNOTATE::MakeSampleText( wxString& aMessage ) { wxString tmp; - aMessage.Printf( _( "\n%s footprints will be reannotated. " ), + aMessage.Printf( _( "\n%s footprints will be reannotated." ), _( AnnotateString[m_AnnotationChoice] ) ); if( !m_ExcludeList->GetValue().empty() )