haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure there are no translation changes for 6.0.x.

This commit is contained in:
Jeff Young 2022-07-28 01:08:42 +01:00
parent af40ddd0e1
commit 7bd073b5cb
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/dialogs/dialog_erc.cpp
View File

@ -90,6 +90,9 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
m_violationsTitleTemplate = m_notebook->GetPageText( 1 ); m_violationsTitleTemplate = m_notebook->GetPageText( 1 );
// Hack to keep from changing translated string in 6.0.x
m_violationsTitleTemplate.Replace( wxT( "%d" ), wxT( "%s" ) );
m_errorsBadge->SetMaximumNumber( 999 ); m_errorsBadge->SetMaximumNumber( 999 );
m_warningsBadge->SetMaximumNumber( 999 ); m_warningsBadge->SetMaximumNumber( 999 );
m_exclusionsBadge->SetMaximumNumber( 999 ); m_exclusionsBadge->SetMaximumNumber( 999 );

2
eeschema/dialogs/dialog_erc_base.cpp
View File

@ -54,7 +54,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
violationsPanel->SetSizer( bViolationsSizer ); violationsPanel->SetSizer( bViolationsSizer );
violationsPanel->Layout(); violationsPanel->Layout();
bViolationsSizer->Fit( violationsPanel ); bViolationsSizer->Fit( violationsPanel );
m_notebook->AddPage( violationsPanel, _("Violations (%s)"), false ); m_notebook->AddPage( violationsPanel, _("Violations (%d)"), false );
bMainSizer->Add( m_notebook, 1, wxEXPAND, 5 ); bMainSizer->Add( m_notebook, 1, wxEXPAND, 5 );

2
eeschema/dialogs/dialog_erc_base.fbp
View File

@ -309,7 +309,7 @@
</object> </object>
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Violations (%s)</property> <property name="label">Violations (%d)</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>

2
eeschema/dialogs/dialog_lib_text_properties.cpp
View File

@ -118,7 +118,7 @@ bool DIALOG_LIB_TEXT_PROPERTIES::TransferDataFromWindow()
if( m_TextCtrl->GetValue().IsEmpty() ) if( m_TextCtrl->GetValue().IsEmpty() )
{ {
// Other text items do not have defined extents, and so will disappear if empty // Other text items do not have defined extents, and so will disappear if empty
DisplayError( this, _( "Text can not be empty." ) ); DisplayError( this, _( "Value may not be empty." ) );
return false; return false;
} }
else else

5
pcbnew/dialogs/dialog_drc.cpp
View File

@ -149,6 +149,11 @@ void DIALOG_DRC::initValues()
m_unconnectedTitleTemplate = m_Notebook->GetPageText( 1 ); m_unconnectedTitleTemplate = m_Notebook->GetPageText( 1 );
m_footprintsTitleTemplate = m_Notebook->GetPageText( 2 ); m_footprintsTitleTemplate = m_Notebook->GetPageText( 2 );
// Hack to keep from changing translated string in 6.0.x
m_markersTitleTemplate.Replace( wxT( "%d" ), wxT( "%s" ) );
m_unconnectedTitleTemplate.Replace( wxT( "%d" ), wxT( "%s" ) );
m_footprintsTitleTemplate.Replace( wxT( "%d" ), wxT( "%s" ) );
auto cfg = m_frame->GetPcbNewSettings(); auto cfg = m_frame->GetPcbNewSettings();
m_cbRefillZones->SetValue( cfg->m_DrcDialog.refill_zones ); m_cbRefillZones->SetValue( cfg->m_DrcDialog.refill_zones );

6
pcbnew/dialogs/dialog_drc_base.cpp
View File

@ -102,7 +102,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
m_panelViolations->SetSizer( bSizerViolationsBox ); m_panelViolations->SetSizer( bSizerViolationsBox );
m_panelViolations->Layout(); m_panelViolations->Layout();
bSizerViolationsBox->Fit( m_panelViolations ); bSizerViolationsBox->Fit( m_panelViolations );
m_Notebook->AddPage( m_panelViolations, _("Violations (%s)"), false ); m_Notebook->AddPage( m_panelViolations, _("Violations (%d)"), false );
m_panelUnconnectedItems = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelUnconnectedItems = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizerUnconnectedBox; wxBoxSizer* bSizerUnconnectedBox;
bSizerUnconnectedBox = new wxBoxSizer( wxVERTICAL ); bSizerUnconnectedBox = new wxBoxSizer( wxVERTICAL );
@ -114,7 +114,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
m_panelUnconnectedItems->SetSizer( bSizerUnconnectedBox ); m_panelUnconnectedItems->SetSizer( bSizerUnconnectedBox );
m_panelUnconnectedItems->Layout(); m_panelUnconnectedItems->Layout();
bSizerUnconnectedBox->Fit( m_panelUnconnectedItems ); bSizerUnconnectedBox->Fit( m_panelUnconnectedItems );
m_Notebook->AddPage( m_panelUnconnectedItems, _("Unconnected Items (%s)"), false ); m_Notebook->AddPage( m_panelUnconnectedItems, _("Unconnected Items (%d)"), false );
m_panelFootprintWarnings = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelFootprintWarnings = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizerFootprintsBox; wxBoxSizer* bSizerFootprintsBox;
bSizerFootprintsBox = new wxBoxSizer( wxVERTICAL ); bSizerFootprintsBox = new wxBoxSizer( wxVERTICAL );
@ -126,7 +126,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
m_panelFootprintWarnings->SetSizer( bSizerFootprintsBox ); m_panelFootprintWarnings->SetSizer( bSizerFootprintsBox );
m_panelFootprintWarnings->Layout(); m_panelFootprintWarnings->Layout();
bSizerFootprintsBox->Fit( m_panelFootprintWarnings ); bSizerFootprintsBox->Fit( m_panelFootprintWarnings );
m_Notebook->AddPage( m_panelFootprintWarnings, _("Schematic Parity (%s)"), false ); m_Notebook->AddPage( m_panelFootprintWarnings, _("Schematic Parity (%d)"), false );
bSizer13->Add( m_Notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizer13->Add( m_Notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

6
pcbnew/dialogs/dialog_drc_base.fbp
View File

@ -777,7 +777,7 @@
<event name="OnNotebookPageChanged">OnChangingNotebookPage</event> <event name="OnNotebookPageChanged">OnChangingNotebookPage</event>
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Violations (%s)</property> <property name="label">Violations (%d)</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -870,7 +870,7 @@
</object> </object>
<object class="notebookpage" expanded="0"> <object class="notebookpage" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Unconnected Items (%s)</property> <property name="label">Unconnected Items (%d)</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -962,7 +962,7 @@
</object> </object>
<object class="notebookpage" expanded="0"> <object class="notebookpage" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Schematic Parity (%s)</property> <property name="label">Schematic Parity (%d)</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>