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

Fix typo and remove a I18N marker in a sentence containing keywords 

(keywords cannot be translated)
Fix also use of a deprecated constant.
This commit is contained in:
jean-pierre charras 2020-05-26 17:17:29 +02:00
parent 06fde791f0
commit f971e1267b
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/dialogs/dialog_spice_model.cpp
View File

@ -407,7 +407,7 @@ void DIALOG_SPICE_MODEL::showPinOrderNote( int aModelType )
wxString msg; wxString msg;
msg = _( "Symbol pin numbering don't always match the required SPICE pin order\n" msg = _( "Symbol pin numbering don't always match the required SPICE pin order\n"
"Check the symbol and \"useAlternate node sequence\" to reorder the pins" "Check the symbol and use \"Alternate node sequence\" to reorder the pins"
", if necessary" ); ", if necessary" );
msg += '\n'; msg += '\n';

4
pcbnew/class_track.cpp
View File

@ -148,7 +148,7 @@ void TRACK::GetWidthConstraints( int* aMin, int* aMax, wxString* aSource ) const
*aMax = INT_MAX / 2; *aMax = INT_MAX / 2;
if( aSource ) if( aSource )
*aSource = _( "board minumum" ); *aSource = _( "board minimum" );
} }
} }
@ -167,7 +167,7 @@ int VIA::GetMinAnnulus( wxString* aSource ) const
else else
{ {
if( aSource ) if( aSource )
*aSource = _( "board minumum" ); *aSource = _( "board minimum" );
return GetBoard()->GetDesignSettings().m_ViasMinAnnulus; return GetBoard()->GetDesignSettings().m_ViasMinAnnulus;
} }

64
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -49,7 +49,7 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFr
m_textEditor->StyleSetForeground( wxSTC_STYLE_BRACEBAD, *wxRED ); m_textEditor->StyleSetForeground( wxSTC_STYLE_BRACEBAD, *wxRED );
int size = wxNORMAL_FONT->GetPointSize(); int size = wxNORMAL_FONT->GetPointSize();
wxFont fixedFont( size, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTSTYLE_NORMAL ); wxFont fixedFont( size, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL );
for( size_t i = 0; i < wxSTC_STYLE_MAX; ++i ) for( size_t i = 0; i < wxSTC_STYLE_MAX; ++i )
m_textEditor->StyleSetFont( i, fixedFont ); m_textEditor->StyleSetFont( i, fixedFont );
@ -260,46 +260,48 @@ bool PANEL_SETUP_RULES::TransferDataFromWindow()
void PANEL_SETUP_RULES::OnSyntaxHelp( wxHyperlinkEvent& aEvent ) void PANEL_SETUP_RULES::OnSyntaxHelp( wxHyperlinkEvent& aEvent )
{ {
wxString msg = _( // Do not make this full sentence translatable: it contains keywords
// Only a few titles can be traslated.
wxString msg =
"<b>Top-level Expressions</b>" "<b>Top-level Expressions</b>"
"<pre>" "<pre>"
"(version &lt;number>)\r" "(version &lt;number>)<br>"
"(rule &lt;rule_name> &lt;rule_expression> ...)\r" "(rule &lt;rule_name> &lt;rule_expression> ...)<br>"
"\r</pre>" "<br></pre>"
"<b>Rule Expressions</b>" "<b>Rule Expressions</b>"
"<pre>" "<pre>"
"(disallow &lt;item_type>)\r" "(disallow &lt;item_type>)<br>"
"(constraint &lt;constraint_type> ...)\r" "(constraint &lt;constraint_type> ...)<br>"
"(condition \"&lt;expression>\")\r" "(condition \"&lt;expression>\")<br>"
"\r</pre>" "<br></pre>"
"<b>Item Types</b>" "<b>Item Types</b>"
"<pre>" "<pre>"
"track via zone\r" "track via zone<br>"
"pad micro_via text\r" "pad micro_via text<br>"
"hole buried_via graphic\r" "hole buried_via graphic<br>"
"\r</pre>" "<br></pre>"
"<b>Constraint Types</b>" "<b>Constraint Types</b>"
"<pre>" "<pre>"
"clearance annulus_width track_width hole\r" "clearance annulus_width track_width hole<br>"
"\r</pre>" "<br></pre>"
"<b>Examples</b>" "<b>Examples</b>"
"<pre>" "<pre>"
"(rule \"copper keepout\"\r" "(rule \"copper keepout\"<br>"
" (disallow track) (disallow via) (disallow zone)\r" " (disallow track) (disallow via) (disallow zone)<br>"
" (condition \"a.name == no_copper\"))\r" " (condition \"a.name == no_copper\"))<br>"
"\r" "<br>"
"(rule neckdown\r" "(rule neckdown<br>"
" (constraint track_width (min 0.2mm) (opt 0.25mm) (max 1.0mm)\r" " (constraint track_width (min 0.2mm) (opt 0.25mm) (max 1.0mm)<br>"
" (condition \"a.name == BGA\"))\r" " (condition \"a.name == BGA\"))<br>"
"\r" "<br>"
"(rule HV\r" "(rule HV<br>"
" (constraint clearance (min 1.5mm)\r" " (constraint clearance (min 1.5mm)<br>"
" (condition \"a.netclass == HV\"))\r" " (condition \"a.netclass == HV\"))<br>"
"\r" "<br>"
"(rule HV-HV\r" "(rule HV-HV<br>"
" (constraint clearance (min 2.0mm)\r" " (constraint clearance (min 2.0mm)<br>"
" (condition \"a.netclass == HV && b.netclass == HV\"))\r" " (condition \"a.netclass == HV && b.netclass == HV\"))<br>"
"</pre>" ); "</pre>";
HTML_MESSAGE_BOX dlg( m_parent, _( "Syntax Help" ) ); HTML_MESSAGE_BOX dlg( m_parent, _( "Syntax Help" ) );
dlg.SetDialogSizeInDU( 320, 320 ); dlg.SetDialogSizeInDU( 320, 320 );