From bc24d8e957064356d513f06e8c7fd43a648c5390 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 10 May 2020 16:55:15 +0200 Subject: [PATCH] Fix typo and I18N string --- eeschema/files-io.cpp | 5 ++--- eeschema/sch_screen.cpp | 2 +- pcbnew/class_zone.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 5790be940e..de79c4cff2 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -645,14 +645,13 @@ bool SCH_EDIT_FRAME::SaveProject() msg += "\n" + overwrittenFile; } - msg = _( "The following files will be overwritten:\n\n" ) + msg; - wxRichMessageDialog dlg( this, _( "Saving the project to the new file format will overwrite existing files." ), _( "Project Save Warning" ), wxOK | wxCANCEL | wxCANCEL_DEFAULT | wxCENTER | wxICON_EXCLAMATION ); - dlg.ShowDetailedText( msg ); + dlg.ShowDetailedText( wxString::Format( + _( "The following files will be overwritten:\n\n%s" ), msg ) ); dlg.SetOKCancelLabels( wxMessageDialog::ButtonLabel( _( "Overwrite Files" ) ), wxMessageDialog::ButtonLabel( _( "Abort Project Save" ) ) ); diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 45bf509881..dd44ea7d63 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -643,7 +643,7 @@ void SCH_SCREEN::UpdateSymbolLinks( REPORTER* aReporter ) if( aReporter ) { msg.Printf( _( "Symbol library '%s' not found and no fallback cache " - "library avaiable. Unable to link library symbol." ), + "library available. Unable to link library symbol." ), symbol->GetLibId().GetLibNickname().wx_str() ); aReporter->ReportTail( msg, RPT_SEVERITY_WARNING ); } diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp index fa661ed605..3776c78fe3 100644 --- a/pcbnew/class_zone.cpp +++ b/pcbnew/class_zone.cpp @@ -541,16 +541,16 @@ void ZONE_CONTAINER::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector