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

Fix a few I18N issues.

This commit is contained in:
jean-pierre charras 2020-09-14 10:02:07 +02:00
parent 748bee1bc7
commit ff0a728753
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/drc/drc_engine.cpp
View File

@ -488,10 +488,10 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRulesForItems( DRC_CONSTRAINT_TYPE_T aConstraintI
const CONSTRAINT_WITH_CONDITIONS* rcons = ruleset->sortedConstraints[ ii ]; const CONSTRAINT_WITH_CONDITIONS* rcons = ruleset->sortedConstraints[ ii ];
bool implicit = rcons->parentRule && rcons->parentRule->m_Implicit; bool implicit = rcons->parentRule && rcons->parentRule->m_Implicit;
REPORT( wxString::Format( _( "Checking %s %s." ), if( implicit )
implicit ? _( "" ) : _( "rule" ), REPORT( wxString::Format( _( "Checking %s." ), rcons->parentRule->m_Name ) )
rcons->parentRule->m_Name ) ) else
REPORT( wxString::Format( _( "Checking rule %s." ), rcons->parentRule->m_Name ) )
if( aLayer != UNDEFINED_LAYER && !rcons->layerTest.test( aLayer ) ) if( aLayer != UNDEFINED_LAYER && !rcons->layerTest.test( aLayer ) )
{ {
REPORT( wxString::Format( _( "Rule layer \"%s\" not matched." ), REPORT( wxString::Format( _( "Rule layer \"%s\" not matched." ),

11
pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -52,17 +52,18 @@ void CADSTAR_PCB_ARCHIVE_LOADER::Load( ::BOARD* aBoard )
long long designSizeYkicad = (long long) designLimit.y * KiCadUnitMultiplier; long long designSizeYkicad = (long long) designLimit.y * KiCadUnitMultiplier;
// Max size limited by the positive dimention of wxPoint // Max size limited by the positive dimention of wxPoint
long long maxDesignSizekicad = (long long) std::numeric_limits<int>::max(); double maxDesignSizekicad = Iu2Millimeter( std::numeric_limits<int>::max() );
if( designSizeXkicad > maxDesignSizekicad || designSizeYkicad > maxDesignSizekicad ) if( designSizeXkicad > maxDesignSizekicad || designSizeYkicad > maxDesignSizekicad )
THROW_IO_ERROR( wxString::Format( THROW_IO_ERROR( wxString::Format(
_( "The design is too large and cannot be imported into KiCad. \n" _( "The design is too large and cannot be imported into KiCad. \n"
"Please reduce the maximum design size in CADSTAR by navigating to: \n" "Please reduce the maximum design size in CADSTAR by navigating to: \n"
"Design Tab -> Properties -> Design Options -> Maximum Design Size. \n" "Design Tab -> Properties -> Design Options -> Maximum Design Size. \n"
"Current Design size: %.2f, %.2f milimetres. \n" "Current Design size: %.2f, %.2f millimeters. \n"
"Maximum permitted design size: %.2f, %.2f milimetres.\n" ), "Maximum permitted design size: %.2f, %.2f millimeters.\n" ),
(double) designSizeXkicad / 1E6, (double) designSizeYkicad / 1E6, (double) designSizeXkicad / PCB_IU_PER_MM,
(double) maxDesignSizekicad / 1E6, (double) maxDesignSizekicad / 1E6 ) ); (double) designSizeYkicad / PCB_IU_PER_MM,
maxDesignSizekicad, maxDesignSizekicad ) );
mDesignCenter = mDesignCenter =
( Assignments.Technology.DesignArea.first + Assignments.Technology.DesignArea.second ) ( Assignments.Technology.DesignArea.first + Assignments.Technology.DesignArea.second )