diff --git a/common/eda_item.cpp b/common/eda_item.cpp index 9ef37b9806..3f03af84f1 100644 --- a/common/eda_item.cpp +++ b/common/eda_item.cpp @@ -373,7 +373,6 @@ static struct EDA_ITEM_DESC .Map( SCH_SCREEN_T, _HKI( "SCH Screen" ) ) .Map( LIB_SYMBOL_T, _HKI( "Symbol" ) ) - .Map( LIB_ALIAS_T, _HKI( "Alias" ) ) .Map( LIB_SHAPE_T, _HKI( "Graphic" ) ) .Map( LIB_TEXT_T, _HKI( "Text" ) ) .Map( LIB_TEXTBOX_T, _HKI( "Text Box" ) ) diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp index 90b3347b0d..2cf6c9f4f6 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp +++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -271,7 +271,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::Validate() if( parentName.IsEmpty() ) { - m_delayedErrorMessage = _( "Aliased symbol must have a parent selected" ); + m_delayedErrorMessage = _( "Derived symbol must have a parent selected" ); return false; } diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp index 520b2fb535..ceb80e93c9 100644 --- a/eeschema/generate_alias_info.cpp +++ b/eeschema/generate_alias_info.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2017 Chris Pavlina - * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2017-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -34,7 +34,7 @@ static const wxString DescriptionFormat = "__FIELDS__" ""; -static const wxString AliasOfFormat = "
" + _( "Alias of" ) + " %s (%s)"; +static const wxString AliasOfFormat = "
" + _( "Derived from" ) + " %s (%s)"; static const wxString DescFormat = "
%s"; static const wxString KeywordsFormat = "
" + _( "Keywords" ) + ": %s"; static const wxString FieldFormat = diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp index 720127bc67..29e591a99a 100644 --- a/eeschema/sch_symbol.cpp +++ b/eeschema/sch_symbol.cpp @@ -1684,7 +1684,7 @@ void SCH_SYMBOL::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vectorGetName(); - aList.emplace_back( _( "Alias of" ), UnescapeString( msg ) ); + aList.emplace_back( _( "Derived from" ), UnescapeString( msg ) ); } else if( !m_lib_id.GetLibNickname().empty() ) { diff --git a/include/core/typeinfo.h b/include/core/typeinfo.h index 3bb5920c8f..01d647597b 100644 --- a/include/core/typeinfo.h +++ b/include/core/typeinfo.h @@ -196,7 +196,6 @@ enum KICAD_T * sort order is logical. */ LIB_SYMBOL_T, - LIB_ALIAS_T, LIB_SHAPE_T, LIB_TEXT_T, LIB_TEXTBOX_T, @@ -408,7 +407,6 @@ constexpr bool IsEeschemaType( const KICAD_T aType ) case SCHEMATIC_T: case LIB_SYMBOL_T: - case LIB_ALIAS_T: case LIB_SHAPE_T: case LIB_TEXT_T: case LIB_TEXTBOX_T: diff --git a/qa/unittests/eeschema/test_ee_item.cpp b/qa/unittests/eeschema/test_ee_item.cpp index dcf33db2f0..d026c6c11e 100644 --- a/qa/unittests/eeschema/test_ee_item.cpp +++ b/qa/unittests/eeschema/test_ee_item.cpp @@ -112,8 +112,7 @@ public: case SCHEMATIC_T: case SCH_PIN_T: - case LIB_SYMBOL_T: - case LIB_ALIAS_T: return nullptr; + case LIB_SYMBOL_T: return nullptr; default: BOOST_FAIL( wxString::Format(