diff --git a/cvpcb/common_help_msg.h b/cvpcb/common_help_msg.h index f9e3bc0466..c0431aebfe 100644 --- a/cvpcb/common_help_msg.h +++ b/cvpcb/common_help_msg.h @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2014-2018 KiCad Developers, see CHANGELOG.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 @@ -25,6 +25,6 @@ #ifndef HELP_MESSAGE_FILE_H #define HELP_MESSAGE_FILE_H -#define SAVE_HLP_MSG _( "Save footprint association in schematic component footprint fields" ) +#define SAVE_HLP_MSG _( "Save footprint associations in schematic symbol footprint fields" ) #endif // HELP_MESSAGE_FILE_H diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index c47ecdbd5d..0b76e5d352 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2018 KiCad Developers, see change_log.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 @@ -63,7 +63,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() // Save the footprints back into eeschema AddMenuItem( filesMenu, wxID_SAVE, _( "&Save Footprint Associations\tCtrl+S" ), - _( "Save footprint association in schematic symbol footprint fields" ), + SAVE_HLP_MSG, KiBitmap( save_xpm ) ); // Separator diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index c826072d89..627575c610 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2009 Wayne Stambaugh - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2018 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 @@ -104,14 +104,14 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( fileMenu, ID_LIBEDIT_GEN_PNG_FILE, _( "Create &PNG File from Screen..." ), - _( "Create a PNG file from the part displayed on screen" ), + _( "Create a PNG file from the current symbol" ), KiBitmap( plot_xpm ) ); // Export as SVG file AddMenuItem( fileMenu, ID_LIBEDIT_GEN_SVG_FILE, _( "Create S&VG File..." ), - _( "Create a SVG file from the current loaded part" ), + _( "Create a SVG file from the current symbol" ), KiBitmap( plot_svg_xpm ) ); // Separator diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp index c8dd4153ed..5455d4b6c6 100644 --- a/eeschema/sch_component.cpp +++ b/eeschema/sch_component.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2018 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 @@ -1441,7 +1441,7 @@ void SCH_COMPONENT::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList ) aList.push_back( MSG_PANEL_ITEM( msg, GetField( VALUE )->GetShownText(), DARKCYAN ) ); // Display component reference in library and library - aList.push_back( MSG_PANEL_ITEM( _( "Component" ), GetLibId().GetLibItemName(), + aList.push_back( MSG_PANEL_ITEM( _( "Name" ), GetLibId().GetLibItemName(), BROWN ) ); if( alias->GetName() != part->GetName() ) @@ -1477,7 +1477,7 @@ void SCH_COMPONENT::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList ) aList.push_back( MSG_PANEL_ITEM( _( "Value" ), GetField( VALUE )->GetShownText(), DARKCYAN ) ); - aList.push_back( MSG_PANEL_ITEM( _( "Symbol" ), GetLibId().GetLibItemName(), BROWN ) ); + aList.push_back( MSG_PANEL_ITEM( _( "Name" ), GetLibId().GetLibItemName(), BROWN ) ); wxString libNickname = GetLibId().GetLibNickname(); @@ -1724,7 +1724,7 @@ LIB_ITEM* SCH_COMPONENT::GetDrawItem( const wxPoint& aPosition, KICAD_T aType ) wxString SCH_COMPONENT::GetSelectMenuText() const { wxString tmp; - tmp.Printf( _( "Component %s, %s" ), + tmp.Printf( _( "Symbol %s, %s" ), GetChars( GetLibId().GetLibItemName() ), GetChars( GetField( REFERENCE )->GetShownText() ) ); return tmp; diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index ebe385df8b..0f2da062f8 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2008 Wayne Stambaugh - * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2018 KiCad Developers, see change_log.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 @@ -89,12 +89,12 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString, KiBitmap( morgan1_xpm ), - _( "Show as \"De Morgan\" normal part" ), + _( "Show as \"De Morgan\" normal symbol" ), wxITEM_CHECK ); m_mainToolBar->AddTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, wxEmptyString, KiBitmap( morgan2_xpm ), - _( "Show as \"De Morgan\" convert part" ), + _( "Show as \"De Morgan\" convert symbol" ), wxITEM_CHECK ); m_mainToolBar->AddSeparator(); diff --git a/eeschema/viewlibs.cpp b/eeschema/viewlibs.cpp index 3d1de7c534..4144b50ad2 100644 --- a/eeschema/viewlibs.cpp +++ b/eeschema/viewlibs.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2015-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2015-2018 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 @@ -56,7 +56,7 @@ void LIB_VIEW_FRAME::OnSelectSymbol( wxCommandEvent& aEvent ) adapter->AddLibrariesWithProgress( libNicknames, this ); - dialogTitle.Printf( _( "Choose Component (%d items loaded)" ), + dialogTitle.Printf( _( "Choose Symbol (%d items loaded)" ), adapter->GetComponentsCount() ); DIALOG_CHOOSE_COMPONENT dlg( this, dialogTitle, adapter, m_convert, false ); @@ -177,8 +177,8 @@ void LIB_VIEW_FRAME::DisplayLibInfos() { const SYMBOL_LIB_TABLE_ROW* row = Prj().SchSymbolLibTable()->FindRow( m_libraryName ); - wxString title = wxString::Format( L"Symbol Library Browser \u2014 %s", - row ? row->GetFullURI() : "no library selected" ); + wxString title = wxString::Format( _( "Symbol Library Browser \u2014 %s" ), + row ? row->GetFullURI() : _( "no library selected" ) ); SetTitle( title ); } } @@ -236,7 +236,7 @@ void LIB_VIEW_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg ) part->SetName( tmp ); ClearMsgPanel(); - AppendMsgPanel( _( "Part" ), part->GetName(), BLUE, 6 ); + AppendMsgPanel( _( "Name" ), part->GetName(), BLUE, 6 ); AppendMsgPanel( _( "Alias" ), msg, RED, 6 ); AppendMsgPanel( _( "Description" ), entry->GetDescription(), CYAN, 6 ); AppendMsgPanel( _( "Key words" ), entry->GetKeyWords(), DARKDARKGRAY );