haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use more basic strings which have already been translated.

This commit is contained in:
Jeff Young 2022-09-29 23:49:51 +01:00
parent 594beef22e
commit 22e9985f5d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/eeschema.cpp
View File

@ -331,8 +331,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
if( !aErrors.empty() ) if( !aErrors.empty() )
aErrors += "\n"; aErrors += "\n";
msg.Printf( _( "Cannot copy file '%s' as it will be overwritten by the new root " msg.Printf( _( "Cannot copy file '%s'." ), destFile.GetFullPath() );
"sheet file." ), destFile.GetFullPath() );
aErrors += msg; aErrors += msg;
return; return;
} }

10
eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
View File

@ -624,12 +624,16 @@ void SCH_SEXPR_PLUGIN::loadHierarchy( const SCH_SHEET_PATH& aParentSheetPath, SC
{ {
if( ancestorSheetPath.LastScreen()->GetFileName() == fileName.GetFullPath() ) 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() ) if( !m_error.IsEmpty() )
m_error += "\n"; m_error += "\n";
m_error += wxString::Format( _( "Could not load sheet '%s' because it already " m_error += wxString::Format( _( "Error loading schematic '%s'." ),
"appears as a direct ancestor in the schematic "
"hierarchy." ),
fileName.GetFullPath() ); fileName.GetFullPath() );
fileName = wxEmptyString; fileName = wxEmptyString;

4
pcbnew/tools/pcb_control.cpp
View File

@ -786,7 +786,9 @@ void PCB_CONTROL::pruneItemLayers( std::vector<BOARD_ITEM*>& aItems )
if( ( returnItems.size() < aItems.size() ) || fpItemDeleted ) if( ( returnItems.size() < aItems.size() ) || fpItemDeleted )
{ {
DisplayError( m_frame, _( "Warning: some pasted items were on layers which are not " // 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" "present in the current board.\n"
"These items could not be pasted.\n" ) ); "These items could not be pasted.\n" ) );
} }