From 096564ec0c9cae57ffba45c5b6f275ddfdc9be5e Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 11 Apr 2020 08:54:34 +0200 Subject: [PATCH] Fix some typos and I18n issues --- eeschema/dialogs/dialog_sch_import_settings_base.cpp | 4 ++-- eeschema/dialogs/dialog_sch_import_settings_base.fbp | 4 +++- eeschema/dialogs/dialog_sch_import_settings_base.h | 2 +- eeschema/dialogs/dialog_schematic_setup.cpp | 2 +- eeschema/dialogs/panel_eeschema_template_fieldnames.cpp | 6 ++---- .../dialogs/panel_eeschema_template_fieldnames_base.cpp | 4 ++-- .../dialogs/panel_eeschema_template_fieldnames_base.fbp | 4 +++- eeschema/dialogs/panel_eeschema_template_fieldnames_base.h | 2 +- eeschema/sch_sexpr_parser.cpp | 2 +- pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.cpp b/eeschema/dialogs/dialog_sch_import_settings_base.cpp index 2081984c40..3bcb9c5eca 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.cpp +++ b/eeschema/dialogs/dialog_sch_import_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,7 +51,7 @@ DIALOG_SCH_IMPORT_SETTINGS_BASE::DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* pare m_fieldNameTemplatesOpt = new wxCheckBox( this, wxID_ANY, _("Field name templates"), wxDefaultPosition, wxDefaultSize, 0 ); bmiddleSizer->Add( m_fieldNameTemplatesOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_pinMapOpt = new wxCheckBox( this, wxID_ANY, _("Pin Map"), wxDefaultPosition, wxDefaultSize, 0 ); + m_pinMapOpt = new wxCheckBox( this, wxID_ANY, _("Pin confict map"), wxDefaultPosition, wxDefaultSize, 0 ); bmiddleSizer->Add( m_pinMapOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_SeveritiesOpt = new wxCheckBox( this, wxID_ANY, _("Violation severities"), wxDefaultPosition, wxDefaultSize, 0 ); diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.fbp b/eeschema/dialogs/dialog_sch_import_settings_base.fbp index 5e601e42f6..f67ab5db4c 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.fbp +++ b/eeschema/dialogs/dialog_sch_import_settings_base.fbp @@ -14,6 +14,7 @@ dialog_sch_import_settings_base 1000 none + 1 dialog_import_settings_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -498,7 +500,7 @@ 0 0 wxID_ANY - Pin Map + Pin confict map 0 diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.h b/eeschema/dialogs/dialog_sch_import_settings_base.h index a4888d7d79..076fbdda21 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.h +++ b/eeschema/dialogs/dialog_sch_import_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp index 688bcc5dbc..2935bf53b0 100644 --- a/eeschema/dialogs/dialog_schematic_setup.cpp +++ b/eeschema/dialogs/dialog_schematic_setup.cpp @@ -55,7 +55,7 @@ DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) : m_treebook->AddSubPage( m_fieldNameTemplates, _( "Field Name Templates" ) ); m_treebook->AddPage( new wxPanel( this ), _( "Electrical Rules" ) ); - m_treebook->AddSubPage( m_pinMap, _( "Pin Map" ) ); + m_treebook->AddSubPage( m_pinMap, _( "Pin Conflicts Map" ) ); m_treebook->AddSubPage( m_severities, _( "Violation Severity" ) ); m_treebook->AddPage( new wxPanel( this ), _( "Project" ) ); diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp index fe14055f3e..6bc7c50027 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp @@ -38,10 +38,8 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT m_frame( aFrame ), m_global( aGlobal ) { - wxString msg; - - msg.Printf( m_title->GetLabel(), aGlobal ? _( "Global" ) : _( "Project" ) ); - m_title->SetLabel( msg ); + m_title->SetLabel( aGlobal ? _( "Global field name templates:" ) + : _( "Project field name templates:" ) ); // Yep, it's a hack. I haven't a clue why the global and project versions don't lay // out the same. diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp index 1476ada95d..a20d47ab25 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,7 +20,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE m_topMargin = new wxBoxSizer( wxVERTICAL ); - m_title = new wxStaticText( this, wxID_ANY, _("%s field name templates:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_title = new wxStaticText( this, wxID_ANY, _("field name templates:"), wxDefaultPosition, wxDefaultSize, 0 ); m_title->Wrap( -1 ); m_topMargin->Add( m_title, 0, wxTOP|wxBOTTOM, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp index 2b86cbf895..5fbcace712 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp @@ -14,6 +14,7 @@ panel_eeschema_template_fieldnames_base 1000 none + 1 PanelEeschemaTemplateFieldnames @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -104,7 +106,7 @@ 0 0 wxID_ANY - %s field name templates: + field name templates: 0 0 diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h index 20653729cd..d5d1320a43 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/sch_sexpr_parser.cpp b/eeschema/sch_sexpr_parser.cpp index 51dceb4ac1..f687160835 100644 --- a/eeschema/sch_sexpr_parser.cpp +++ b/eeschema/sch_sexpr_parser.cpp @@ -1961,7 +1961,7 @@ SCH_COMPONENT* SCH_SEXPR_PARSER::parseSchematicSymbol() if( !text.IsEmpty() && id.Parse( text, LIB_ID::ID_SCH, true ) >= 0 ) { - tmp.Printf( _( "Invalid symbol lbirary ID in\nfile: \"%s\"\nline: %d\n" + tmp.Printf( _( "Invalid symbol library ID in\nfile: \"%s\"\nline: %d\n" "offset: %d" ), GetChars( CurSource() ), CurLineNumber(), CurOffset() ); THROW_IO_ERROR( tmp ); diff --git a/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp b/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp index b1c80ff281..1c6852cf5a 100644 --- a/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp +++ b/pcbnew/altium2kicadpcb_plugin/altium_pcb.cpp @@ -1451,8 +1451,8 @@ void ALTIUM_PCB::ParsePads6Data( if( elem.layer == ALTIUM_LAYER::MULTI_LAYER ) { wxLogError( wxString::Format( - _( "Pad '%s' of Footprint %s marked as multilayer, but it is an SMT pad" ), - elem.name, module->GetReference() ) ); + "Pad '%s' of Footprint %s marked as multilayer, but it is an SMT pad", + elem.name, module->GetReference() ) ); } pad->SetAttribute( PAD_ATTR_T::PAD_ATTRIB_SMD ); }