From: Markus Wanner Date: Tue, 16 Jun 2020 23:03:11 +0200 Subject: Fix various spelling errors in release 2016.1.0. Origin: lintian Forwarded: no Last-Update: 2016/02/06 --- .../iaxclient/lib/portaudio/bindings/cpp/example/devs.cxx | 8 ++++---- .../iaxclient/lib/portaudio/bindings/cpp/example/sine.cxx | 10 ++++------ .../iaxclient/lib/portaudio/pa_tests/patest_in_overflow.c | 2 +- 3rdparty/iaxclient/lib/portaudio/pablio/test_rw.c | 2 +- 3rdparty/iaxclient/lib/portaudio/pablio/test_rw_echo.c | 2 +- 3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw.c | 2 +- 3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw8.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_convert.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_dual.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_multi_in.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_multi_out.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_record.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_record_reuse.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_sine.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_sine_amp.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_sine_formats.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_srate.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/debug_test1.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/pa_devs.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/pa_fuzz.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/pa_minlat.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest1.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_buffer.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_callbackstop.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_clip.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_dither.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_hang.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_in_overflow.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_latency.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_leftright.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_longsine.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_many.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_maxsines.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_mono.c | 2 +- .../lib/portaudio/test/patest_mono_asio_channel_select.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_multi_sine.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_out_underflow.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_pink.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_prime.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_read_record.c | 2 +- .../iaxclient/lib/portaudio/test/patest_read_write_wire.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_record.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_saw.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_sine.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_sine8.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_sine_formats.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_sine_time.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_start_stop.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_stop.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_stop_playout.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_sync.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_toomanysines.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_two_rates.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_underflow.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_wire.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_write_sine.c | 2 +- 3rdparty/iaxclient/lib/portaudio/test/patest_write_stop.c | 2 +- src/FDM/JSBSim/models/propulsion/FGForce.cpp | 2 +- src/GUI/SetupRootDialog.cxx | 4 ++-- src/Main/fg_init.cxx | 2 +- src/Navaids/waypoint.cxx | 2 +- src/Network/generic.cxx | 2 +- src/Scripting/NasalPositioned.cxx | 12 ++++++------ 63 files changed, 75 insertions(+), 77 deletions(-) --- a/3rdparty/iaxclient/lib/portaudio/bindings/cpp/example/devs.cxx +++ b/3rdparty/iaxclient/lib/portaudio/bindings/cpp/example/devs.cxx @@ -158,19 +158,19 @@ } catch (const portaudio::PaException &e) { - std::cout << "A PortAudio error occured: " << e.paErrorText() << std::endl; + std::cout << "A PortAudio error occurred: " << e.paErrorText() << std::endl; } catch (const portaudio::PaCppException &e) { - std::cout << "A PortAudioCpp error occured: " << e.what() << std::endl; + std::cout << "A PortAudioCpp error occurred: " << e.what() << std::endl; } catch (const std::exception &e) { - std::cout << "A generic exception occured: " << e.what() << std::endl; + std::cout << "A generic exception occurred: " << e.what() << std::endl; } catch (...) { - std::cout << "An unknown exception occured." << std::endl; + std::cout << "An unknown exception occurred." << std::endl; } return 0; --- a/3rdparty/iaxclient/lib/portaudio/bindings/cpp/example/sine.cxx +++ b/3rdparty/iaxclient/lib/portaudio/bindings/cpp/example/sine.cxx @@ -116,22 +116,20 @@ } catch (const portaudio::PaException &e) { - std::cout << "A PortAudio error occured: " << e.paErrorText() << std::endl; + std::cout << "A PortAudio error occurred: " << e.paErrorText() << std::endl; } catch (const portaudio::PaCppException &e) { - std::cout << "A PortAudioCpp error occured: " << e.what() << std::endl; + std::cout << "A PortAudioCpp error occurred: " << e.what() << std::endl; } catch (const std::exception &e) { - std::cout << "A generic exception occured: " << e.what() << std::endl; + std::cout << "A generic exception occurred: " << e.what() << std::endl; } catch (...) { - std::cout << "An unknown exception occured." << std::endl; + std::cout << "An unknown exception occurred." << std::endl; } return 0; } - - --- a/3rdparty/iaxclient/lib/portaudio/pa_tests/patest_in_overflow.c +++ b/3rdparty/iaxclient/lib/portaudio/pa_tests/patest_in_overflow.c @@ -217,7 +217,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/pablio/test_rw.c +++ b/3rdparty/iaxclient/lib/portaudio/pablio/test_rw.c @@ -92,7 +92,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/pablio/test_rw_echo.c +++ b/3rdparty/iaxclient/lib/portaudio/pablio/test_rw_echo.c @@ -116,7 +116,7 @@ return 0; error: - fprintf( stderr, "An error occured while using PortAudio\n" ); + fprintf( stderr, "An error occurred while using PortAudio\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw.c +++ b/3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw.c @@ -101,7 +101,7 @@ return 0; error: - fprintf( stderr, "An error occured while using PABLIO\n" ); + fprintf( stderr, "An error occurred while using PABLIO\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw8.c +++ b/3rdparty/iaxclient/lib/portaudio/pablio/test_w_saw8.c @@ -99,7 +99,7 @@ return 0; error: - fprintf( stderr, "An error occured while using PABLIO\n" ); + fprintf( stderr, "An error occurred while using PABLIO\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_convert.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_convert.c @@ -124,7 +124,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_dual.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_dual.c @@ -138,7 +138,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_multi_in.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_multi_in.c @@ -172,7 +172,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_multi_out.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_multi_out.c @@ -137,7 +137,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_record.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_record.c @@ -328,7 +328,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); if( err == paHostError ) --- a/3rdparty/iaxclient/lib/portaudio/test/debug_record_reuse.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_record_reuse.c @@ -340,7 +340,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); if( err == paHostError ) --- a/3rdparty/iaxclient/lib/portaudio/test/debug_sine.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_sine.c @@ -185,7 +185,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_sine_amp.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_sine_amp.c @@ -150,7 +150,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_sine_formats.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_sine_formats.c @@ -195,7 +195,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/debug_srate.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_srate.c @@ -254,7 +254,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); if( err == paHostError ) --- a/3rdparty/iaxclient/lib/portaudio/test/debug_test1.c +++ b/3rdparty/iaxclient/lib/portaudio/test/debug_test1.c @@ -101,7 +101,7 @@ } else { - fprintf( stderr, "An error occured while opening the portaudio stream\n" ); + fprintf( stderr, "An error occurred while opening the portaudio stream\n" ); if( err == paHostError ) fprintf( stderr, "Host error number: %d\n", Pa_GetHostError() ); else --- a/3rdparty/iaxclient/lib/portaudio/test/pa_devs.c +++ b/3rdparty/iaxclient/lib/portaudio/test/pa_devs.c @@ -223,7 +223,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/pa_fuzz.c +++ b/3rdparty/iaxclient/lib/portaudio/test/pa_fuzz.c @@ -161,7 +161,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/test/pa_minlat.c +++ b/3rdparty/iaxclient/lib/portaudio/test/pa_minlat.c @@ -180,7 +180,7 @@ return 0; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return 1; --- a/3rdparty/iaxclient/lib/portaudio/test/patest1.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest1.c @@ -163,7 +163,7 @@ if( err != paNoError ) { - fprintf( stderr, "An error occured while using portaudio\n" ); + fprintf( stderr, "An error occurred while using portaudio\n" ); if( err == paUnanticipatedHostError ) { fprintf( stderr, " unanticipated host error.\n"); --- a/3rdparty/iaxclient/lib/portaudio/test/patest_buffer.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_buffer.c @@ -184,7 +184,7 @@ return paNoError; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); fprintf( stderr, "Host Error message: %s\n", Pa_GetLastHostErrorInfo()->errorText ); --- a/3rdparty/iaxclient/lib/portaudio/test/patest_callbackstop.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_callbackstop.c @@ -214,7 +214,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_clip.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_clip.c @@ -127,7 +127,7 @@ return 0; error: - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return 1; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_dither.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_dither.c @@ -167,7 +167,7 @@ done: if (err) { - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); err = 1; /* Though PlaySine() already called Pa_Terminate(), */ --- a/3rdparty/iaxclient/lib/portaudio/test/patest_hang.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_hang.c @@ -145,7 +145,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_in_overflow.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_in_overflow.c @@ -217,7 +217,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_latency.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_latency.c @@ -175,7 +175,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_leftright.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_leftright.c @@ -166,7 +166,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_longsine.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_longsine.c @@ -133,7 +133,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_many.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_many.c @@ -191,7 +191,7 @@ return paNoError; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_maxsines.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_maxsines.c @@ -197,7 +197,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_mono.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_mono.c @@ -138,7 +138,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_mono_asio_channel_select.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_mono_asio_channel_select.c @@ -148,7 +148,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_multi_sine.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_multi_sine.c @@ -185,7 +185,7 @@ done: if (err) { - fprintf(stderr, "An error occured while using the portaudio stream\n"); + fprintf(stderr, "An error occurred while using the portaudio stream\n"); fprintf(stderr, "Error number: %d\n", err ); fprintf(stderr, "Error message: %s\n", Pa_GetErrorText(err)); } --- a/3rdparty/iaxclient/lib/portaudio/test/patest_out_underflow.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_out_underflow.c @@ -210,7 +210,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_pink.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_pink.c @@ -261,7 +261,7 @@ return 0; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return 0; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_prime.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_prime.c @@ -216,7 +216,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_read_record.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_read_record.c @@ -221,7 +221,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_read_write_wire.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_read_write_wire.c @@ -175,7 +175,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return -1; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_record.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_record.c @@ -327,7 +327,7 @@ free( data.recordedSamples ); if( err != paNoError ) { - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); err = 1; /* Always return 0 or 1, but no other return codes. */ --- a/3rdparty/iaxclient/lib/portaudio/test/patest_saw.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_saw.c @@ -118,7 +118,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_sine.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_sine.c @@ -144,7 +144,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_sine8.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_sine8.c @@ -205,7 +205,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_sine_formats.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_sine_formats.c @@ -189,7 +189,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_sine_time.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_sine_time.c @@ -201,7 +201,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_start_stop.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_start_stop.c @@ -155,7 +155,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_stop.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_stop.c @@ -306,7 +306,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_stop_playout.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_stop_playout.c @@ -425,7 +425,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_sync.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_sync.c @@ -252,7 +252,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_toomanysines.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_toomanysines.c @@ -166,7 +166,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_two_rates.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_two_rates.c @@ -161,7 +161,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_underflow.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_underflow.c @@ -143,7 +143,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_wire.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_wire.c @@ -223,7 +223,7 @@ error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); printf("Hit ENTER to quit.\n"); fflush(stdout); --- a/3rdparty/iaxclient/lib/portaudio/test/patest_write_sine.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_write_sine.c @@ -140,7 +140,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/3rdparty/iaxclient/lib/portaudio/test/patest_write_stop.c +++ b/3rdparty/iaxclient/lib/portaudio/test/patest_write_stop.c @@ -151,7 +151,7 @@ return err; error: Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); + fprintf( stderr, "An error occurred while using the portaudio stream\n" ); fprintf( stderr, "Error number: %d\n", err ); fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); return err; --- a/src/FDM/JSBSim/models/propulsion/FGForce.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGForce.cpp @@ -112,7 +112,7 @@ case tNone: return mT; default: - cout << "Unrecognized tranform requested from FGForce::Transform()" << endl; + cout << "Unrecognized transform requested from FGForce::Transform()" << endl; exit(1); } } --- a/src/GUI/SetupRootDialog.cxx +++ b/src/GUI/SetupRootDialog.cxx @@ -266,13 +266,13 @@ break; case ChoseInvalidLocation: - t = tr("The choosen location (%1) does not appear to contain FlightGear data files. Please try another location.").arg(m_browsedPath); + t = tr("The chosen location (%1) does not appear to contain FlightGear data files. Please try another location.").arg(m_browsedPath); break; case ChoseInvalidVersion: { QString curVer = QString::fromStdString(fgBasePackageVersion(m_browsedPath.toStdString())); - t = tr("The choosen location (%1) contains files for version %2, but this is FlightGear %3. " \ + t = tr("The chosen location (%1) contains files for version %2, but this is FlightGear %3. " \ "Please update or try another location").arg(m_browsedPath).arg(curVer).arg(QString::fromLatin1(FLIGHTGEAR_VERSION)); break; } --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -322,7 +322,7 @@ "Error reading aircraft: " << e.getFormattedMessage()); flightgear::fatalMessageBoxWithoutExit( "Error reading aircraft", - "An error occured reading the requested aircraft (" + aircraft + ")", + "An error occurred reading the requested aircraft (" + aircraft + ")", e.getFormattedMessage()); return false; } --- a/src/Navaids/waypoint.cxx +++ b/src/Navaids/waypoint.cxx @@ -625,7 +625,7 @@ WayptVec Via::expandToWaypoints(WayptRef aPreceeding) const { if (!aPreceeding) { - throw sg_exception("invalid preceeding waypoint"); + throw sg_exception("invalid preceding waypoint"); } WayptRef toWp = new NavaidWaypoint(_to, nullptr); --- a/src/Network/generic.cxx +++ b/src/Network/generic.cxx @@ -244,7 +244,7 @@ direction = tokens[2]; if (direction != "in" && direction != "out" && direction != "bi") { - SG_LOG(SG_NETWORK, SG_ALERT, "Unsuported protocol direction: " + SG_LOG(SG_NETWORK, SG_ALERT, "Unsupported protocol direction: " << direction); return; } --- a/src/Scripting/NasalPositioned.cxx +++ b/src/Scripting/NasalPositioned.cxx @@ -1254,7 +1254,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsNum(args[argOffset])) { - naRuntimeError(c, "findNDBByFrquency expectes frequency (in kHz) as arg %d", argOffset); + naRuntimeError(c, "findNDBByFrquency expected frequency (in kHz) as arg %d", argOffset); } double dbFreq = args[argOffset++].num; @@ -1274,7 +1274,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsNum(args[argOffset])) { - naRuntimeError(c, "findNDBsByFrquency expectes frequency (in kHz) as arg %d", argOffset); + naRuntimeError(c, "findNDBsByFrquency expected frequency (in kHz) as arg %d", argOffset); } double dbFreq = args[argOffset++].num; @@ -1298,7 +1298,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsNum(args[argOffset])) { - naRuntimeError(c, "findNavaidByFrequency expectes frequency (in Mhz) as arg %d", argOffset); + naRuntimeError(c, "findNavaidByFrequency expected frequency (in Mhz) as arg %d", argOffset); } FGPositioned::Type type = FGPositioned::INVALID; @@ -1326,7 +1326,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsNum(args[argOffset])) { - naRuntimeError(c, "findNavaidsByFrequency expectes frequency (in Mhz) as arg %d", argOffset); + naRuntimeError(c, "findNavaidsByFrequency expected frequency (in Mhz) as arg %d", argOffset); } FGPositioned::Type type = FGPositioned::INVALID; @@ -1355,7 +1355,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsString(args[argOffset])) { - naRuntimeError(c, "findNavaidsByIdent expectes ident string as arg %d", argOffset); + naRuntimeError(c, "findNavaidsByIdent expected ident string as arg %d", argOffset); } FGPositioned::Type type = FGPositioned::INVALID; @@ -1382,7 +1382,7 @@ argOffset += geodFromArgs(args, 0, argc, pos); if (!naIsString(args[argOffset])) { - naRuntimeError(c, "findFixesByIdent expectes ident string as arg %d", argOffset); + naRuntimeError(c, "findFixesByIdent expected ident string as arg %d", argOffset); } std::string ident(naStr_data(args[argOffset]));