From 9684031bc88298487a9bcca5551150abfaddf4da Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 9 Jan 2017 14:19:02 +0100 Subject: [PATCH] Fix I18n issue in dialog_design_rules.cpp --- pcbnew/dialogs/dialog_design_rules.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index 3c507db9e2..0da920c8d6 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -280,7 +280,7 @@ void DIALOG_DESIGN_RULES::InitDialogRules() void DIALOG_DESIGN_RULES::InitGlobalRules() { // Set unit labels - wxString units = ReturnUnitSymbol( g_UserUnit, _( "%s" ) ); + wxString units = ReturnUnitSymbol( g_UserUnit, "%s" ); m_ViaMinUnits->SetLabel( units ); m_ViaMinDrillUnits->SetLabel( units ); @@ -975,7 +975,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity( wxString* aErrorMsg ) wxString netclassLabel; // Name of a given netclass wxString netclassError; // Error message particular to a given netclass - wxString units = ReturnUnitSymbol( g_UserUnit, _( "%s" ) ); + wxString units = ReturnUnitSymbol( g_UserUnit, "%s" ); int minViaDia = ValueFromTextCtrl( *m_SetViasMinSizeCtrl ); int minViaDrill = ValueFromTextCtrl( *m_SetViasMinDrillCtrl ); @@ -991,7 +991,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity( wxString* aErrorMsg ) for( int row = 0; row < m_grid->GetNumberRows(); row++ ) { netclassLabel = GetChars( m_grid->GetRowLabelValue( row ) ); - netclassError = _( "" ); // Clear the error for this netclass + netclassError.Clear(); // Clear the error for this netclass int tracksize = ValueFromString( g_UserUnit, m_grid->GetCellValue( row, GRID_TRACKSIZE ) ); @@ -1092,7 +1092,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity( wxString* aErrorMsg ) msg.Printf( _( "Netclass: %s
" ), netclassLabel ); errorMsg += msg; errorMsg += netclassError; - errorMsg += _( "
" ); + errorMsg += "
"; } }