diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index bf283e4aab..24a056c705 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -331,8 +331,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje if( !aErrors.empty() ) aErrors += "\n"; - msg.Printf( _( "Cannot copy file '%s' as it will be overwritten by the new root " - "sheet file." ), destFile.GetFullPath() ); + msg.Printf( _( "Cannot copy file '%s'." ), destFile.GetFullPath() ); aErrors += msg; return; } diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp index 24e3a819bf..02912c348d 100644 --- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp +++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp @@ -624,12 +624,16 @@ void SCH_SEXPR_PLUGIN::loadHierarchy( const SCH_SHEET_PATH& aParentSheetPath, SC { if( ancestorSheetPath.LastScreen()->GetFileName() == fileName.GetFullPath() ) { + if( m_error.IsEmpty() ) + { + m_error = _( "The entire schematic could not be loaded. Errors occurred " + "attempting to load hierarchical sheets." ); + } + if( !m_error.IsEmpty() ) m_error += "\n"; - m_error += wxString::Format( _( "Could not load sheet '%s' because it already " - "appears as a direct ancestor in the schematic " - "hierarchy." ), + m_error += wxString::Format( _( "Error loading schematic '%s'." ), fileName.GetFullPath() ); fileName = wxEmptyString; diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp index b6949e7728..2d404fa92e 100644 --- a/pcbnew/tools/pcb_control.cpp +++ b/pcbnew/tools/pcb_control.cpp @@ -786,9 +786,11 @@ void PCB_CONTROL::pruneItemLayers( std::vector& aItems ) if( ( returnItems.size() < aItems.size() ) || fpItemDeleted ) { - DisplayError( m_frame, _( "Warning: some pasted items were on layers which are not " - "present in the current board.\n" - "These items could not be pasted.\n" ) ); + // We have no existing strings in 6.0 that are even remotely appropriate here, so the + // best we can do is show the user English and let them use Google Translate. + DisplayError( m_frame, wxT( "Warning: some pasted items were on layers which are not " + "present in the current board.\n" + "These items could not be pasted.\n" ) ); } aItems = returnItems;