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

Update a few strings based on new string freeze policy.

This commit is contained in:
Jeff Young 2024-02-05 11:05:31 +00:00
parent 8cd0c5d574
commit da46a96623
9 changed files with 38 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/picksymbol.cpp
View File

@ -158,9 +158,7 @@ void SCH_EDIT_FRAME::FlipBodyStyle( SCH_SYMBOL* aSymbol )
if( aSymbol->IsSelected() ) if( aSymbol->IsSelected() )
m_toolManager->RunAction<EDA_ITEM*>( EE_ACTIONS::addItemToSel, aSymbol ); m_toolManager->RunAction<EDA_ITEM*>( EE_ACTIONS::addItemToSel, aSymbol );
// TODO: 9.0 It would be better as "Change Body Style", but we're past string freeze so commit.Push( _( "Change Body Style" ) );
// this (existing) string will have to do....
commit.Push( _( "Convert Symbol" ) );
} }

3
eeschema/symbol_checker.cpp
View File

@ -197,8 +197,7 @@ void CheckLibSymbol( LIB_SYMBOL* aSymbol, std::vector<wxString>& aMessages,
if( aSymbol->HasAlternateBodyStyle() ) if( aSymbol->HasAlternateBodyStyle() )
{ {
// TODO: 9.0: change to "A Power Symbol should not have DeMorgan variants" msg.Printf( _( "<b>A Power Symbol should not have DeMorgan variants</b><br><br>" ) );
msg.Printf( _( "<b>A Power Symbol should have no convert option</b><br><br>" ) );
aMessages.push_back( msg ); aMessages.push_back( msg );
} }

4
eeschema/tools/sch_edit_tool.cpp
View File

@ -1706,10 +1706,8 @@ int SCH_EDIT_TOOL::ChangeBodyStyle( const TOOL_EVENT& aEvent )
if( symbol->IsNew() ) if( symbol->IsNew() )
m_toolMgr->PostAction( ACTIONS::refreshPreview ); m_toolMgr->PostAction( ACTIONS::refreshPreview );
// TODO: 9.0 It would be better as "Change Body Style", but we're past string freeze so
// this (existing) string will have to do....
if( !commit.Empty() ) if( !commit.Empty() )
commit.Push( _( "Convert Symbol" ) ); commit.Push( _( "Change Body Style" ) );
if( selection.IsHover() ) if( selection.IsHover() )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection ); m_toolMgr->RunAction( EE_ACTIONS::clearSelection );

29
eeschema/widgets/search_handlers.cpp
View File

@ -127,16 +127,16 @@ void SCH_SEARCH_HANDLER::SelectItems( std::vector<long>& aItemRows )
SYMBOL_SEARCH_HANDLER::SYMBOL_SEARCH_HANDLER( SCH_EDIT_FRAME* aFrame ) : SYMBOL_SEARCH_HANDLER::SYMBOL_SEARCH_HANDLER( SCH_EDIT_FRAME* aFrame ) :
SCH_SEARCH_HANDLER( _HKI( "Symbols" ), aFrame ) SCH_SEARCH_HANDLER( _HKI( "Symbols" ), aFrame )
{ {
m_columns.emplace_back( _HKI( "Reference" ), 2, wxLIST_FORMAT_LEFT ); m_columns.emplace_back( _HKI( "Reference" ), 2, wxLIST_FORMAT_LEFT );
m_columns.emplace_back( _HKI( "Value" ), 6, wxLIST_FORMAT_LEFT ); m_columns.emplace_back( _HKI( "Value" ), 6, wxLIST_FORMAT_LEFT );
m_columns.emplace_back( _HKI( "Footprint" ), 10, wxLIST_FORMAT_LEFT ); m_columns.emplace_back( _HKI( "Footprint" ), 10, wxLIST_FORMAT_LEFT );
m_columns.emplace_back( _HKI( "Page" ), 1, wxLIST_FORMAT_CENTER ); m_columns.emplace_back( _HKI( "Page" ), 1, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( wxT( "X" ), 3, wxLIST_FORMAT_CENTER ); m_columns.emplace_back( wxT( "X" ), 3, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( wxT( "Y" ), 3, wxLIST_FORMAT_CENTER ); m_columns.emplace_back( wxT( "Y" ), 3, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( wxT( "Excl. sim" ), 2, wxLIST_FORMAT_CENTER ); // 9.0 TODO: wxT -> _HKI m_columns.emplace_back( _HKI( "Excl. sim" ), 2, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( wxT( "Excl. BOM" ), 2, wxLIST_FORMAT_CENTER ); // 9.0 TODO: wxT -> _HKI m_columns.emplace_back( _HKI( "Excl. BOM" ), 2, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( wxT( "Excl. board" ), 2, wxLIST_FORMAT_CENTER ); // 9.0 TODO: wxT -> _HKI m_columns.emplace_back( _HKI( "Excl. board" ), 2, wxLIST_FORMAT_CENTER );
m_columns.emplace_back( _HKI( "DNP" ), 2, wxLIST_FORMAT_CENTER ); m_columns.emplace_back( _HKI( "DNP" ), 2, wxLIST_FORMAT_CENTER );
} }
@ -347,15 +347,14 @@ wxString LABEL_SEARCH_HANDLER::getResultCell( const SCH_SEARCH_HIT& aHit, int aC
if (aCol == 0) if (aCol == 0)
{ {
// 9.0 TODO: wxS() -> _HKI():
if(lbl->Type() == SCH_LABEL_T) if(lbl->Type() == SCH_LABEL_T)
return wxS( "Local" ); return _HKI( "Local" );
else if( lbl->Type() == SCH_GLOBAL_LABEL_T ) else if( lbl->Type() == SCH_GLOBAL_LABEL_T )
return wxS( "Global" ); return _HKI( "Global" );
else if( lbl->Type() == SCH_HIER_LABEL_T ) else if( lbl->Type() == SCH_HIER_LABEL_T )
return wxS( "Hierarchical" ); return _HKI( "Hierarchical" );
else if( lbl->Type() == SCH_DIRECTIVE_LABEL_T ) else if( lbl->Type() == SCH_DIRECTIVE_LABEL_T )
return wxS( "Directive" ); return _HKI( "Directive" );
} }
else if( aCol == 1 ) else if( aCol == 1 )
return lbl->GetShownText( false ); return lbl->GetShownText( false );

12
pcbnew/exporters/step/exporter_step.cpp
View File

@ -117,9 +117,9 @@ wxString EXPORTER_STEP_PARAMS::GetDefaultExportExtension()
{ {
switch( m_format ) switch( m_format )
{ {
case EXPORTER_STEP_PARAMS::FORMAT::STEP: return wxS( "step" ); break; case EXPORTER_STEP_PARAMS::FORMAT::STEP: return wxS( "step" );
case EXPORTER_STEP_PARAMS::FORMAT::GLB: return wxS( "glb" ); break; case EXPORTER_STEP_PARAMS::FORMAT::GLB: return wxS( "glb" );
default: return wxEmptyString; // shouldn't happen default: return wxEmptyString; // shouldn't happen
} }
} }
@ -128,9 +128,9 @@ wxString EXPORTER_STEP_PARAMS::GetFormatName()
switch( m_format ) switch( m_format )
{ {
// honestly these names shouldn't be translated since they are mostly industry standard acronyms // honestly these names shouldn't be translated since they are mostly industry standard acronyms
case EXPORTER_STEP_PARAMS::FORMAT::STEP: return wxS( "STEP" ); break; case EXPORTER_STEP_PARAMS::FORMAT::STEP: return wxS( "STEP" );
case EXPORTER_STEP_PARAMS::FORMAT::GLB: return wxS("Binary GLTF" ); break; case EXPORTER_STEP_PARAMS::FORMAT::GLB: return wxS("Binary GLTF" );
default: return wxEmptyString; // shouldn't happen default: return wxEmptyString; // shouldn't happen
} }
} }

6
pcbnew/footprint_libraries_utils.cpp
View File

@ -926,8 +926,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
// connections and properties are kept) and the sourceFootprint (old footprint) is // connections and properties are kept) and the sourceFootprint (old footprint) is
// deleted // deleted
pcbframe->ExchangeFootprint( sourceFootprint, newFootprint, commit ); pcbframe->ExchangeFootprint( sourceFootprint, newFootprint, commit );
// TODO: 9.0: make translatable commit.Push( _( "Update Footprint" ) );
commit.Push( wxT( "Update Footprint" ) );
} }
else // This is an insert command else // This is an insert command
{ {
@ -940,8 +939,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
newFootprint->SetPosition( VECTOR2I( 0, 0 ) ); newFootprint->SetPosition( VECTOR2I( 0, 0 ) );
viewControls->SetCrossHairCursorPosition( cursorPos, false ); viewControls->SetCrossHairCursorPosition( cursorPos, false );
const_cast<KIID&>( newFootprint->m_Uuid ) = KIID(); const_cast<KIID&>( newFootprint->m_Uuid ) = KIID();
// TODO: 9.0: make translatable commit.Push( _( "Insert Footprint" ) );
commit.Push( wxT( "Insert Footprint" ) );
pcbframe->Raise(); pcbframe->Raise();
pcb_ToolManager->RunAction( PCB_ACTIONS::placeFootprint, newFootprint ); pcb_ToolManager->RunAction( PCB_ACTIONS::placeFootprint, newFootprint );

3
pcbnew/tools/pcb_actions.cpp
View File

@ -611,8 +611,7 @@ TOOL_ACTION PCB_ACTIONS::filletLines( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::chamferLines( TOOL_ACTION_ARGS() TOOL_ACTION PCB_ACTIONS::chamferLines( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveEdit.chamferLines" ) .Name( "pcbnew.InteractiveEdit.chamferLines" )
.Scope( AS_GLOBAL ) .Scope( AS_GLOBAL )
// TODO: 9.0: Change to "Chamfer Lines..." .FriendlyName( _( "Chamfer Lines..." ) )
.FriendlyName( _( "Chamfer Lines" ) )
.Tooltip( _( "Cut away corners between selected lines" ) ) .Tooltip( _( "Cut away corners between selected lines" ) )
.Icon( BITMAPS::chamfer ) ); .Icon( BITMAPS::chamfer ) );

4
pcbnew/widgets/search_handlers.cpp
View File

@ -271,7 +271,7 @@ NETS_SEARCH_HANDLER::NETS_SEARCH_HANDLER( PCB_EDIT_FRAME* aFrame ) :
PCB_SEARCH_HANDLER( _HKI( "Nets" ), aFrame ) PCB_SEARCH_HANDLER( _HKI( "Nets" ), aFrame )
{ {
m_columns.emplace_back( _HKI( "Name" ), 6, wxLIST_FORMAT_LEFT ); m_columns.emplace_back( _HKI( "Name" ), 6, wxLIST_FORMAT_LEFT );
m_columns.emplace_back( wxT( "Class" ), 6, wxLIST_FORMAT_LEFT ); // 9.0 TODO: wxT -> _HKI m_columns.emplace_back( _HKI( "Class" ), 6, wxLIST_FORMAT_LEFT );
} }
@ -350,7 +350,7 @@ RATSNEST_SEARCH_HANDLER::RATSNEST_SEARCH_HANDLER( PCB_EDIT_FRAME* aFrame ) :
PCB_SEARCH_HANDLER( _HKI( "Ratsnest" ), aFrame ) PCB_SEARCH_HANDLER( _HKI( "Ratsnest" ), aFrame )
{ {
m_columns.emplace_back( _HKI( "Name" ), 6, wxLIST_FORMAT_LEFT ); m_columns.emplace_back( _HKI( "Name" ), 6, wxLIST_FORMAT_LEFT );
m_columns.emplace_back( wxT( "Class" ), 6, wxLIST_FORMAT_LEFT ); // 9.0 TODO: wxT -> _HKI m_columns.emplace_back( _HKI( "Class" ), 6, wxLIST_FORMAT_LEFT );
} }

28
pcbnew/zone.cpp
View File

@ -1609,7 +1609,7 @@ static struct ZONE_DESC
return false; return false;
}; };
auto isBelowAreaIslandRemoval = auto isAreaBasedIslandRemoval =
[]( INSPECTABLE* aItem ) -> bool []( INSPECTABLE* aItem ) -> bool
{ {
if( ZONE* zone = dynamic_cast<ZONE*>( aItem ) ) if( ZONE* zone = dynamic_cast<ZONE*>( aItem ) )
@ -1652,7 +1652,6 @@ static struct ZONE_DESC
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isHatchedFill ); .SetWriteableFunc( isHatchedFill );
// TODO: Switch to translated
auto atLeastMinWidthValidator = auto atLeastMinWidthValidator =
[]( const wxAny&& aValue, EDA_ITEM* aZone ) -> VALIDATOR_RESULT []( const wxAny&& aValue, EDA_ITEM* aZone ) -> VALIDATOR_RESULT
{ {
@ -1663,30 +1662,27 @@ static struct ZONE_DESC
if( val < zone->GetMinThickness() ) if( val < zone->GetMinThickness() )
{ {
return std::make_unique<VALIDATION_ERROR_MSG>( return std::make_unique<VALIDATION_ERROR_MSG>(
wxT( "Cannot be less than zone minimum width" ) ); _( "Cannot be less than zone minimum width" ) );
} }
return std::nullopt; return std::nullopt;
}; };
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, int>( _HKI( "Hatch Width" ),
propMgr.AddProperty( new PROPERTY<ZONE, int>( wxT( "Hatch Width" ),
&ZONE::SetHatchThickness, &ZONE::GetHatchThickness, PROPERTY_DISPLAY::PT_SIZE ), &ZONE::SetHatchThickness, &ZONE::GetHatchThickness, PROPERTY_DISPLAY::PT_SIZE ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isHatchedFill ) .SetWriteableFunc( isHatchedFill )
.SetValidator( atLeastMinWidthValidator ); .SetValidator( atLeastMinWidthValidator );
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, int>( _HKI( "Hatch Gap" ),
propMgr.AddProperty( new PROPERTY<ZONE, int>( wxT( "Hatch Gap" ),
&ZONE::SetHatchGap, &ZONE::GetHatchGap, PROPERTY_DISPLAY::PT_SIZE ), &ZONE::SetHatchGap, &ZONE::GetHatchGap, PROPERTY_DISPLAY::PT_SIZE ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isHatchedFill ) .SetWriteableFunc( isHatchedFill )
.SetValidator( atLeastMinWidthValidator ); .SetValidator( atLeastMinWidthValidator );
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, double>( _HKI( "Hatch Minimum Hole Ratio" ),
propMgr.AddProperty( new PROPERTY<ZONE, double>( wxT( "Hatch Minimum Hole Ratio" ),
&ZONE::SetHatchHoleMinArea, &ZONE::GetHatchHoleMinArea ), &ZONE::SetHatchHoleMinArea, &ZONE::GetHatchHoleMinArea ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
@ -1694,32 +1690,28 @@ static struct ZONE_DESC
.SetValidator( PROPERTY_VALIDATORS::PositiveRatioValidator ); .SetValidator( PROPERTY_VALIDATORS::PositiveRatioValidator );
// TODO: Smoothing effort needs to change to enum (in dialog too) // TODO: Smoothing effort needs to change to enum (in dialog too)
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, int>( _HKI( "Smoothing Effort" ),
propMgr.AddProperty( new PROPERTY<ZONE, int>( wxT( "Smoothing Effort" ),
&ZONE::SetHatchSmoothingLevel, &ZONE::GetHatchSmoothingLevel ), &ZONE::SetHatchSmoothingLevel, &ZONE::GetHatchSmoothingLevel ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isHatchedFill ); .SetWriteableFunc( isHatchedFill );
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, double>( _HKI( "Smoothing Amount" ),
propMgr.AddProperty( new PROPERTY<ZONE, double>( wxT( "Smoothing Amount" ),
&ZONE::SetHatchSmoothingValue, &ZONE::GetHatchSmoothingValue ), &ZONE::SetHatchSmoothingValue, &ZONE::GetHatchSmoothingValue ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isHatchedFill ); .SetWriteableFunc( isHatchedFill );
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY_ENUM<ZONE, ISLAND_REMOVAL_MODE>( _HKI( "Remove Islands" ),
propMgr.AddProperty( new PROPERTY_ENUM<ZONE, ISLAND_REMOVAL_MODE>( wxT( "Remove Islands" ),
&ZONE::SetIslandRemovalMode, &ZONE::GetIslandRemovalMode ), &ZONE::SetIslandRemovalMode, &ZONE::GetIslandRemovalMode ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ); .SetAvailableFunc( isCopperZone );
// TODO: Switch to translated propMgr.AddProperty( new PROPERTY<ZONE, long long int>( _HKI( "Minimum Island Area" ),
propMgr.AddProperty( new PROPERTY<ZONE, long long int>( wxT( "Minimum Island Area" ),
&ZONE::SetMinIslandArea, &ZONE::GetMinIslandArea, PROPERTY_DISPLAY::PT_AREA ), &ZONE::SetMinIslandArea, &ZONE::GetMinIslandArea, PROPERTY_DISPLAY::PT_AREA ),
groupFill ) groupFill )
.SetAvailableFunc( isCopperZone ) .SetAvailableFunc( isCopperZone )
.SetWriteableFunc( isBelowAreaIslandRemoval ); .SetWriteableFunc( isAreaBasedIslandRemoval );
const wxString groupElectrical = _HKI( "Electrical" ); const wxString groupElectrical = _HKI( "Electrical" );