Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Standardize on American English spelling of "canceled".

pull/18/head
Jeff Young 4 months ago
parent
06dcb64ad8
commit
30748006f7
22 changed files with 31 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      common/io/cadstar/cadstar_archive_parser.cpp
  2. 2
      eeschema/dialogs/dialog_erc.cpp
  3. 5
      eeschema/files-io.cpp
  4. 2
      eeschema/sch_io/altium/sch_io_altium.cpp
  5. 4
      eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp
  6. 2
      eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp
  7. 2
      eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp
  8. 2
      eeschema/symbol_editor/symbol_edit_frame.cpp
  9. 2
      eeschema/tools/backannotate.cpp
  10. 2
      pcbnew/dialogs/dialog_drc.cpp
  11. 4
      pcbnew/microwave/microwave_footprint.cpp
  12. 2
      pcbnew/pcb_io/altium/altium_pcb.cpp
  13. 4
      pcbnew/pcb_io/eagle/pcb_io_eagle.cpp
  14. 2
      pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp
  15. 2
      pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp
  16. 2
      pcbnew/pcb_io/fabmaster/import_fabmaster.cpp
  17. 2
      pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp
  18. 4
      pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp
  19. 2
      pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp
  20. 2
      pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
  21. 2
      pcbnew/router/router_tool.cpp
  22. 2
      pcbnew/tools/footprint_editor_control.cpp

5
common/io/cadstar/cadstar_archive_parser.cpp
View File

@ -2492,8 +2492,7 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName,
{
delete rootNode;
// @spellingerror
THROW_IO_ERROR( _( "File import cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
aProgressReporter->SetCurrentProgress( currentProgress() );
@ -2817,7 +2816,7 @@ void CADSTAR_ARCHIVE_PARSER::checkPoint()
m_progressReporter->AdvanceProgress();
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "File import cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
}

2
eeschema/dialogs/dialog_erc.cpp
View File

@ -453,7 +453,7 @@ void DIALOG_ERC::OnRunERCClick( wxCommandEvent& event )
if( m_cancelled )
// @spellingerror
m_messages->Report( _( "-------- ERC cancelled by user.<br><br>" ), RPT_SEVERITY_INFO );
m_messages->Report( _( "-------- ERC canceled by user.<br><br>" ), RPT_SEVERITY_INFO );
else
m_messages->Report( _( "Done.<br><br>" ), RPT_SEVERITY_INFO );

5
eeschema/files-io.cpp
View File

@ -1382,6 +1382,11 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType,
GetScreen()->SetFileName( newfilename.GetFullPath() );
GetScreen()->SetContentModified();
progressReporter.Report( _( "Cleaning up schematic..." ) );
if( !progressReporter.KeepRefreshing() )
THROW_IO_ERROR( _( "File import canceled by user." ) );
RecalculateConnections( nullptr, GLOBAL_CLEANUP );
// Only perform the dangling end test on root sheet.

2
eeschema/sch_io/altium/sch_io_altium.cpp
View File

@ -836,7 +836,7 @@ void SCH_IO_ALTIUM::ParseAltiumSch( const wxString& aFileName )
m_progressReporter->Report( wxString::Format( _( "Importing %s" ), relative.GetFullPath() ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
if( isBinaryFile( aFileName ) )

4
eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp
View File

@ -115,7 +115,7 @@ void SCH_IO_KICAD_LEGACY::checkpoint()
/ std::max( 1U, m_lineCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
m_lastProgressLine = curLine;
}
@ -287,7 +287,7 @@ void SCH_IO_KICAD_LEGACY::loadFile( const wxString& aFileName, SCH_SCREEN* aScre
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
m_lineReader = &reader;
m_lineCount = 0;

2
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp
View File

@ -303,7 +303,7 @@ void SCH_IO_KICAD_SEXPR::loadFile( const wxString& aFileName, SCH_SHEET* aSheet
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
while( reader.ReadLine() )
lineCount++;

2
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp
View File

@ -106,7 +106,7 @@ void SCH_IO_KICAD_SEXPR_PARSER::checkpoint()
/ std::max( 1U, m_lineCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
m_lastProgressLine = curLine;
}

2
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -279,7 +279,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
Raise();
if( loadingCancelled )
ShowInfoBarWarning( _( "Symbol library loading was cancelled by user." ) );
ShowInfoBarWarning( _( "Symbol library loading canceled by user." ) );
}

2
eeschema/tools/backannotate.cpp
View File

@ -353,7 +353,7 @@ void BACK_ANNOTATE::checkForUnusedSymbols()
if( m_matchByReference && !m_frame->ReadyToNetlist( _( "Re-linking footprints requires a fully "
"annotated schematic." ) ) )
{
m_reporter.ReportTail( _( "Footprint re-linking cancelled by user." ), RPT_SEVERITY_ERROR );
m_reporter.ReportTail( _( "Footprint re-linking canceled by user." ), RPT_SEVERITY_ERROR );
}
}

2
pcbnew/dialogs/dialog_drc.cpp
View File

@ -357,7 +357,7 @@ void DIALOG_DRC::OnRunDRCClick( wxCommandEvent& aEvent )
}
if( m_cancelled )
m_messages->Report( _( "-------- DRC cancelled by user.<br><br>" ) );
m_messages->Report( _( "-------- DRC canceled by user.<br><br>" ) );
else
m_messages->Report( _( "Done.<br><br>" ) );

4
pcbnew/microwave/microwave_footprint.cpp
View File

@ -82,7 +82,7 @@ FOOTPRINT* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprint
// TODO: why is this QuasiModal?
if( dlg.ShowQuasiModal() != wxID_OK )
return nullptr; // cancelled by user
return nullptr; // canceled by user
value = dlg.GetValue();
gap_size = editFrame->ValueFromString( value );
@ -97,7 +97,7 @@ FOOTPRINT* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprint
// TODO: why is this QuasiModal?
if( angledlg.ShowQuasiModal() != wxID_OK )
return nullptr; // cancelled by user
return nullptr; // canceled by user
msg = angledlg.GetValue();

2
pcbnew/pcb_io/altium/altium_pcb.cpp
View File

@ -330,7 +330,7 @@ void ALTIUM_PCB::checkpoint()
/ std::max( 1U, m_totalCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
m_lastProgressCount = m_doneCount;
}

4
pcbnew/pcb_io/eagle/pcb_io_eagle.cpp
View File

@ -306,7 +306,7 @@ void PCB_IO_EAGLE::checkpoint()
/ std::max( 1U, m_totalCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
m_lastProgressCount = m_doneCount;
}
@ -348,7 +348,7 @@ BOARD* PCB_IO_EAGLE::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
wxFileName fn = aFileName;

2
pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp
View File

@ -153,7 +153,7 @@ BOARD* PCB_IO_EASYEDA::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
PCB_IO_EASYEDA_PARSER parser( nullptr );

2
pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp
View File

@ -116,7 +116,7 @@ BOARD* PCB_IO_EASYEDAPRO::LoadBoard( const wxString& aFileName, BOARD* aAppendTo
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
PCB_IO_EASYEDAPRO_PARSER parser( nullptr, nullptr );

2
pcbnew/pcb_io/fabmaster/import_fabmaster.cpp
View File

@ -79,7 +79,7 @@ void FABMASTER::checkpoint()
/ std::max( 1U, m_totalCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
m_lastProgressCount = m_doneCount;
}

2
pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp
View File

@ -59,7 +59,7 @@ BOARD* PCB_IO_FABMASTER::LoadBoard( const wxString& aFileName, BOARD* aAppendToM
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "File import canceled by user." ) );
}
if( !m_fabmaster.Read( aFileName.ToStdString() ) )

4
pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp
View File

@ -217,7 +217,7 @@ void PCB_IO_KICAD_LEGACY::checkpoint()
/ std::max( 1U, m_lineCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
m_lastProgressLine = curLine;
}
@ -503,7 +503,7 @@ BOARD* PCB_IO_KICAD_LEGACY::LoadBoard( const wxString& aFileName, BOARD* aAppend
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
while( reader.ReadLine() )
m_lineCount++;

2
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp
View File

@ -2814,7 +2814,7 @@ BOARD* PCB_IO_KICAD_SEXPR::LoadBoard( const wxString& aFileName, BOARD* aAppendT
m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
while( reader.ReadLine() )
lineCount++;

2
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
View File

@ -152,7 +152,7 @@ void PCB_IO_KICAD_SEXPR_PARSER::checkpoint()
/ std::max( 1U, m_lineCount ) );
if( !m_progressReporter->KeepRefreshing() )
THROW_IO_ERROR( _( "Open cancelled by user." ) );
THROW_IO_ERROR( _( "Open canceled by user." ) );
m_lastProgressTime = curTime;
}

2
pcbnew/router/router_tool.cpp
View File

@ -1048,7 +1048,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia )
// Reset the cursor to the end of the track
controls()->SetCursorPosition( m_endSnapPoint );
if( targetLayer == UNDEFINED_LAYER ) // cancelled by user
if( targetLayer == UNDEFINED_LAYER ) // canceled by user
return 0;
// One cannot place a blind/buried via on only one layer:

2
pcbnew/tools/footprint_editor_control.cpp
View File

@ -478,7 +478,7 @@ int FOOTPRINT_EDITOR_CONTROL::RenameFootprint( const TOOL_EVENT& aEvent )
return true;
} ) )
{
return 0; // cancelled by user
return 0; // canceled by user
}
if( newName == oldName )

Write Preview
Loading…
Cancel
Save