diff --git a/compiler/msg/errorct.msg b/compiler/msg/errorct.msg index 1275367752..7252cde2fe 100644 --- a/compiler/msg/errorct.msg +++ b/compiler/msg/errorct.msg @@ -1510,7 +1510,7 @@ asmr_d_finish_reading=07001_DL_S'ha finalitzat l'analizaci asmr_e_none_label_contain_at=07002_E_Un patr que no s una etiqueta cont @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_S'ha produt un error mentre es muntava el desplaament del registre -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_S'est utilitzant OFFSET sense identificador diff --git a/compiler/msg/errorda.msg b/compiler/msg/errorda.msg index f610f8fabf..4b21c41338 100644 --- a/compiler/msg/errorda.msg +++ b/compiler/msg/errorda.msg @@ -2555,7 +2555,7 @@ asmr_d_finish_reading=07001_DL_Afslutter assembler-parsing ($1) asmr_e_none_label_contain_at=07002_E_Ikke-label navn indeholder @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Fejl under opbygning af struktur-offset -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET brugt uden navn diff --git a/compiler/msg/errores.msg b/compiler/msg/errores.msg index e7eff83ce7..cdc42fe476 100644 --- a/compiler/msg/errores.msg +++ b/compiler/msg/errores.msg @@ -2502,7 +2502,7 @@ asmr_d_finish_reading=07001_DL_Finalizado interpretado de ensamblador de estilo asmr_e_none_label_contain_at=07002_E_Una patrn que no es una etiqueta contiene @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Error construyendo desplazamiento de registro (record) -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET usado sin identificador diff --git a/compiler/msg/errorf.msg b/compiler/msg/errorf.msg index 3ca9d2f308..46349f0654 100644 --- a/compiler/msg/errorf.msg +++ b/compiler/msg/errorf.msg @@ -1334,7 +1334,7 @@ asmr_e_none_label_contain_at=07002_E_Non-label pattern contains @ asmr_w_override_op_not_supported=07003_W_Override operator not supported % The Override operator is not supported asmr_e_building_record_offset=07004_E_Error building record offset -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET used without identifier diff --git a/compiler/msg/errorfi.msg b/compiler/msg/errorfi.msg index a1c91eadc2..36cdb492fe 100644 --- a/compiler/msg/errorfi.msg +++ b/compiler/msg/errorfi.msg @@ -2517,7 +2517,7 @@ asmr_d_finish_reading=07001_DL_Analyse assembleur de style $1 termin asmr_e_none_label_contain_at=07002_E_Un identificateur qui n'est pas un label contient @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Erreur de construction de l'offset du record -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET utilis sans identificateur diff --git a/compiler/msg/errorhe.msg b/compiler/msg/errorhe.msg index b9ef626478..f7ed857b60 100644 --- a/compiler/msg/errorhe.msg +++ b/compiler/msg/errorhe.msg @@ -1730,7 +1730,7 @@ asmr_d_finish_reading=07001_DL_ asmr_e_none_label_contain_at=07002_E_ @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_ -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_ OFFSET diff --git a/compiler/msg/errorheu.msg b/compiler/msg/errorheu.msg index a9548f08fa..8c66f1b0e7 100644 --- a/compiler/msg/errorheu.msg +++ b/compiler/msg/errorheu.msg @@ -2508,7 +2508,7 @@ asmr_d_finish_reading=07001_DL_הסתיים ניתוח סגנון אסמבלר $ asmr_e_none_label_contain_at=07002_E_תבנית ללא תווית מכילה את התו @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_שגיאה בבניית היסט הרשומה -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_נעשה שימוש בOFFSET ללא מזהה diff --git a/compiler/msg/erroriu.msg b/compiler/msg/erroriu.msg index 127634d57d..0f078d5f57 100644 --- a/compiler/msg/erroriu.msg +++ b/compiler/msg/erroriu.msg @@ -1870,7 +1870,7 @@ asmr_d_finish_reading=07001_DL_Fine analisi assembler stile $1 asmr_e_none_label_contain_at=07002_E_Il pattern contiene @ ma non una label % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Errore nella costruzione dell'offset di un record -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_usato OFFSET senza identificatore diff --git a/compiler/msg/errorn.msg b/compiler/msg/errorn.msg index 25140d19b4..1ed9c2489f 100644 --- a/compiler/msg/errorn.msg +++ b/compiler/msg/errorn.msg @@ -2511,7 +2511,7 @@ asmr_d_finish_reading=07001_DL_Gedaan met verwerken van $1 assembler asmr_e_none_label_contain_at=07002_E_Symbool dat geen label is bevat "@" % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Fout bij berekenen offset in record -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET gebruikt zonder symbool diff --git a/compiler/msg/errorpl.msg b/compiler/msg/errorpl.msg index 5270079c39..aab80389bf 100644 --- a/compiler/msg/errorpl.msg +++ b/compiler/msg/errorpl.msg @@ -1519,7 +1519,7 @@ asmr_d_finish_reading=07001_DL_Zako asmr_e_none_label_contain_at=07002_E_aden identyfikator (poza etykietami) nie moe zawiera @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Bd tworzenia offsetu rekordu -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET uyty bez identyfikatora diff --git a/compiler/msg/errorpli.msg b/compiler/msg/errorpli.msg index a306a6f1b8..840ecb2e93 100644 --- a/compiler/msg/errorpli.msg +++ b/compiler/msg/errorpli.msg @@ -1519,7 +1519,7 @@ asmr_d_finish_reading=07001_DL_Zako asmr_e_none_label_contain_at=07002_E_aden identyfikator (poza etykietami) nie moe zawiera @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Bd tworzenia offsetu rekordu -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET uyty bez identyfikatora diff --git a/compiler/msg/errorpt.msg b/compiler/msg/errorpt.msg index e01dfef32b..3172a5cebf 100644 --- a/compiler/msg/errorpt.msg +++ b/compiler/msg/errorpt.msg @@ -2212,7 +2212,7 @@ asmr_d_finish_reading=07001_DL_Finalizada $1 an asmr_e_none_label_contain_at=07002_E_Padro no-rtulo contm @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Erro construindo deslocamento registro -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_'OFFSET' usado sem identificador diff --git a/compiler/msg/errorptu.msg b/compiler/msg/errorptu.msg index 4bbed9672c..0841f6868c 100644 --- a/compiler/msg/errorptu.msg +++ b/compiler/msg/errorptu.msg @@ -2515,7 +2515,7 @@ asmr_d_finish_reading=07001_DL_Finalizada $1 análise estilo assembler asmr_e_none_label_contain_at=07002_E_Padrão não-rótulo contêm @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Erro construindo deslocamento registro -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_'OFFSET' usado sem identificador diff --git a/compiler/msg/errorues.msg b/compiler/msg/errorues.msg index 2398ea14dd..4262587d6c 100644 --- a/compiler/msg/errorues.msg +++ b/compiler/msg/errorues.msg @@ -2496,7 +2496,7 @@ asmr_d_finish_reading=07001_DL_Finalizado interpretado de ensamblador de estilo asmr_e_none_label_contain_at=07002_E_Una patrón que no es una etiqueta contiene @ % A identifier which isn't a label can't contain a @. asmr_e_building_record_offset=07004_E_Error construyendo desplazamiento de registro (record) -% There has an error occured while building the offset of a record/object +% An error occurred while building the offset of a record/object % structure, this can happend when there is no field specified at all or % an unknown field identifier is used. asmr_e_offset_without_identifier=07005_E_OFFSET usado sin identificador diff --git a/packages/fcl-web/src/base/fphttpserver.pp b/packages/fcl-web/src/base/fphttpserver.pp index 664d3f2c73..5546fe1baf 100644 --- a/packages/fcl-web/src/base/fphttpserver.pp +++ b/packages/fcl-web/src/base/fphttpserver.pp @@ -98,7 +98,7 @@ Type procedure DoHandleRequest; virtual; // Read request headers Function ReadRequestHeaders : TFPHTTPConnectionRequest; - // Check if we have keep-alive and no errors occured + // Check if we have keep-alive and no errors occurred Function AllowNewRequest : Boolean; // Check if there is a new request pending, i.e. there is data. Function RequestPending : Boolean; diff --git a/packages/ptc/src/win32/directx/p_dinput.pp b/packages/ptc/src/win32/directx/p_dinput.pp index 64d32bc7c1..a6331e6f72 100644 --- a/packages/ptc/src/win32/directx/p_dinput.pp +++ b/packages/ptc/src/win32/directx/p_dinput.pp @@ -3142,7 +3142,7 @@ const DIERR_NOINTERFACE = E_NOINTERFACE; (* - * An undetermined error occured inside the DInput subsystem + * An undetermined error occurred inside the DInput subsystem *) DIERR_GENERIC = E_FAIL; diff --git a/packages/tcl/tests/tcl_demo.pp b/packages/tcl/tests/tcl_demo.pp index d9354f979c..c1fb4f7cc3 100644 --- a/packages/tcl/tests/tcl_demo.pp +++ b/packages/tcl/tests/tcl_demo.pp @@ -49,7 +49,7 @@ begin Tcl_AppendResult(interp, ['bad # arg: ', ArgvItem(argv,0), ' num1 num2 [..numN]', nil]); {* Under Win32 calling of this function can cause crash *} - Test_max:=TCL_ERROR; {* Error was occured *} + Test_max:=TCL_ERROR; {* Error has occurred *} exit; {* Leave *} end; @@ -61,7 +61,7 @@ begin if (not is_num(arg)) then {* Is right number? *} begin Tcl_AppendResult(interp,[' "', arg, '" is not a valid integer value']); - Test_max:=TCL_ERROR; {* Error was occured *} + Test_max:=TCL_ERROR; {* Error has occurred *} exit; {* leave *} end; Value:=StrToInt(arg); {* Convert PChar->Integer *} diff --git a/packages/univint/src/ATSUnicodeDrawing.pas b/packages/univint/src/ATSUnicodeDrawing.pas index 2f936a98c9..f66401b89f 100644 --- a/packages/univint/src/ATSUnicodeDrawing.pas +++ b/packages/univint/src/ATSUnicodeDrawing.pas @@ -1534,7 +1534,7 @@ function ATSUOffsetToPosition( iTextLayout: ATSUTextLayout; iOffset: UniCharArra * Parameters: * * iTextLayout: - * The layout in which the mouse down event occured. + * The layout in which the mouse down event occurred. * * iLocationX: * The x-coordinate of the event, in local coordinates, relative diff --git a/packages/univint/src/CFNetDiagnostics.pas b/packages/univint/src/CFNetDiagnostics.pas index 640c98704a..cf97b32e3d 100644 --- a/packages/univint/src/CFNetDiagnostics.pas +++ b/packages/univint/src/CFNetDiagnostics.pas @@ -242,12 +242,12 @@ type CFNetDiagnosticStatusValues = SInt32; const { - * There is no status, but no error has occured + * There is no status, but no error has occurred } kCFNetDiagnosticNoErr = 0; { - * An error occured that prevented the call from completing + * An error occurred that prevented the call from completing } kCFNetDiagnosticErr = -66560; diff --git a/packages/univint/src/CFNetServices.pas b/packages/univint/src/CFNetServices.pas index dafb6a8844..ca889eac10 100644 --- a/packages/univint/src/CFNetServices.pas +++ b/packages/univint/src/CFNetServices.pas @@ -295,7 +295,7 @@ type CFNetServicesError = SInt32; const { - * An error of unknown type has occured. + * An error of unknown type has occurred. } kCFNetServicesErrorUnknown = -72000; diff --git a/packages/univint/src/CFURL.pas b/packages/univint/src/CFURL.pas index 290f6af262..50d4477198 100644 --- a/packages/univint/src/CFURL.pas +++ b/packages/univint/src/CFURL.pas @@ -1254,7 +1254,7 @@ type @param relativeToURL If non-NULL, the created bookmark will be relative to the given url. If kCFURLBookmarkCreationWithSecurityScope is given as an option and relativeToURL is non-NULL, then a collection-scoped bookmark is created which enables future access to url provided the caller has access to relativeURL. - @param error If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occured during creation of the bookmark data + @param error If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occurred during creation of the bookmark data @result A CFDataRef containing an data, which can be later be passed to CFURLCreateByResolvingBookmarkData() or to CFURLCopyPropertiesForKeysFromBookmarkData() / CFURLCopyPropertyForKeyFromBookmarkData() } function CFURLCreateBookmarkData( allocator: CFAllocatorRef; url: CFURLRef; options: CFURLBookmarkCreationOptions; resourcePropertiesToInclude: CFArrayRef; relativeToURL: CFURLRef; error: CFErrorRefPtr ): CFDataRef; external name '_CFURLCreateBookmarkData'; (* CF_AVAILABLE_STARTING(10_6, 4_0) *) @@ -1278,7 +1278,7 @@ function CFURLCreateBookmarkData( allocator: CFAllocatorRef; url: CFURLRef; opti @param isStale If non-NULL, on exit will be set to true if during resolution any of the properties in the bookmark no longer seemed to match the corresponding properties on the returned file. Clients, upon seeing a stale representation, may want to replace whatever stored bookmark data they have saved and create a new one. - @param error If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occured during resolution of the bookmark data + @param error If non-NULL, on exit will be filled in with a CFErrorRef representing any error which occurred during resolution of the bookmark data @result A CFURLRef of a file which is the closest match to the file the bookmark data } function CFURLCreateByResolvingBookmarkData( allocator: CFAllocatorRef; bookmark: CFDataRef; options: CFURLBookmarkResolutionOptions; relativeToURL: CFURLRef; resourcePropertiesToInclude: CFArrayRef; isStale: BooleanPtr; error: CFErrorRefPtr ): CFURLRef; external name '_CFURLCreateByResolvingBookmarkData'; (* CF_AVAILABLE_STARTING(10_6, 4_0) *) diff --git a/packages/univint/src/CFURLEnumerator.pas b/packages/univint/src/CFURLEnumerator.pas index 162992bfcd..40de93e497 100644 --- a/packages/univint/src/CFURLEnumerator.pas +++ b/packages/univint/src/CFURLEnumerator.pas @@ -259,10 +259,10 @@ type const kCFURLEnumeratorSuccess = 1; { The enumeration was successful. The url output parameter is valid. } kCFURLEnumeratorEnd = 2; { The enumeration is complete. } - kCFURLEnumeratorError = 3; { An error occured during enumeration. The retained error output parameter describes the error. } + kCFURLEnumeratorError = 3; { An error occurred during enumeration. The retained error output parameter describes the error. } kCFURLEnumeratorDirectoryPostOrderSuccess = 4; { The enumeration was successful. The url output parameter is for a directory after all of directory's descendants have been visited (post-order). This result will only be returned for directories when both the kCFURLEnumeratorDescendRecursively and kCFURLEnumeratorIncludeDirectoriesPostOrder options are passed to CFURLEnumeratorCreateForDirectoryURL. } -{ CFURLEnumeratorGetNextURL - Advances the enumerator. If kCFURLEnumeratorSuccess is returned, the url output parameter returns the next URL found. If kCFURLEnumeratorError is returned, an error has occured and the error output parameter describes the error. If kCFURLEnumeratorEnd, the enumeration is finished. +{ CFURLEnumeratorGetNextURL - Advances the enumerator. If kCFURLEnumeratorSuccess is returned, the url output parameter returns the next URL found. If kCFURLEnumeratorError is returned, an error has occurred and the error output parameter describes the error. If kCFURLEnumeratorEnd, the enumeration is finished. The url output parameter, if returned, is not retained. The error output parameter, if returned, is retained and must be released. } diff --git a/packages/univint/src/Menus.pas b/packages/univint/src/Menus.pas index 742cbd8fd1..5e203f3fcd 100644 --- a/packages/univint/src/Menus.pas +++ b/packages/univint/src/Menus.pas @@ -5455,7 +5455,7 @@ const * instead of this API. If you use the standard window Carbon event * handler on your windows, you can also use a * kEventControlContextualMenuClick event handler to be notified - * when a contextual menu click has occured; in this case, you do + * when a contextual menu click has occurred; in this case, you do * not need to call this API. * * Mac OS X threading: @@ -5502,7 +5502,7 @@ function IsShowContextualMenuClick( const (*var*) inEvent: EventRecord ): Boolea * If you use the standard window Carbon event handler on your * windows, you can also use a kEventControlContextualMenuClick * event handler to be notified when a contextual menu click has - * occured; in this case, you do not need to call this API. + * occurred; in this case, you do not need to call this API. * * Mac OS X threading: * Not thread safe diff --git a/packages/univint/src/OpenTransport.pas b/packages/univint/src/OpenTransport.pas index a26429d9cd..8c9f0fd4ee 100644 --- a/packages/univint/src/OpenTransport.pas +++ b/packages/univint/src/OpenTransport.pas @@ -784,7 +784,7 @@ type Events are divided into numerous categories: 1. (0x0000xxxx) The core XTI events have identifiers of the form - T_XXXX. These signal that an XTI event has occured on a stream. + T_XXXX. These signal that an XTI event has occurred on a stream. 2. (0x1000xxxx) Private events are reserved for protocol specific events. Each protocol stack defines them as appropriate for its own usage. diff --git a/packages/univint/src/SCSI.pas b/packages/univint/src/SCSI.pas index 5a2af40443..f1808565b9 100644 --- a/packages/univint/src/SCSI.pas +++ b/packages/univint/src/SCSI.pas @@ -819,7 +819,7 @@ const scsiIdentifyMessageRejected = scsiErrorBase + 12; { -7924 = } scsiMessageRejectReceived = scsiErrorBase + 13; { -7923 = Message reject received } scsiSCSIBusReset = scsiErrorBase + 14; { -7922 = SCSI bus reset sent/received } - scsiParityError = scsiErrorBase + 15; { -7921 = Uncorrectable parity error occured } + scsiParityError = scsiErrorBase + 15; { -7921 = Uncorrectable parity error occurred } scsiAutosenseFailed = scsiErrorBase + 16; { -7920 = Autosense: Request sense cmd fail } scsiUnused11 = scsiErrorBase + 17; { -7919 = } scsiDataRunError = scsiErrorBase + 18; { -7918 = Data overrun/underrun error } diff --git a/packages/univint/src/SKSummary.pas b/packages/univint/src/SKSummary.pas index 58092720df..c448256b89 100644 --- a/packages/univint/src/SKSummary.pas +++ b/packages/univint/src/SKSummary.pas @@ -445,7 +445,7 @@ function SKSummaryCopyParagraphSummaryString( summary: SKSummaryRef; numParagrap * * outParagraphIndexOfSentences: * array for returning the index of the paragraph in which - * sentence occured + * sentence occurred * * Availability: * Mac OS X: in version 10.4 and later in CoreServices.framework diff --git a/packages/univint/src/WSProtocolHandler.pas b/packages/univint/src/WSProtocolHandler.pas index 47c128b992..2e60d11e32 100644 --- a/packages/univint/src/WSProtocolHandler.pas +++ b/packages/univint/src/WSProtocolHandler.pas @@ -278,7 +278,7 @@ function WSProtocolHandlerGetTypeID: CFTypeID; external name '_WSProtocolHandler * SOAP). * * Result: - * a WSProtocolHandlerRef, NULL if a parse error occured. + * a WSProtocolHandlerRef, NULL if a parse error occurred. * * Availability: * Mac OS X: in version 10.3 and later but deprecated in 10.8 diff --git a/packages/univint/src/WSTypes.pas b/packages/univint/src/WSTypes.pas index ae3cfcaa6d..9c723e4cbd 100644 --- a/packages/univint/src/WSTypes.pas +++ b/packages/univint/src/WSTypes.pas @@ -230,7 +230,7 @@ uses MacTypes,CFBase; const errWSInternalError = -65793; { An internal framework error } - errWSTransportError = -65794; { A network error occured } + errWSTransportError = -65794; { A network error occurred } errWSParseError = -65795; { The server response wasn't valid XML } errWSTimeoutError = -65796; { The invocation timed out } diff --git a/tests/test/tstack.pp b/tests/test/tstack.pp index ab9dff1745..46d49799fe 100644 --- a/tests/test/tstack.pp +++ b/tests/test/tstack.pp @@ -35,7 +35,7 @@ begin exitproc:=saveexit; if errorcode<>0 then begin - Writeln('An error occured at level ',level); + Writeln('An error occurred at level ',level); if errorcode=202 then begin Writeln('Stack overflow correctly handled'); diff --git a/tests/test/units/math/tmask.inc b/tests/test/units/math/tmask.inc index 894050db74..7c08057d27 100644 --- a/tests/test/units/math/tmask.inc +++ b/tests/test/units/math/tmask.inc @@ -8,7 +8,7 @@ try writeln('no exception was raised'); except on E:Exception do begin - writeln('Exception occured: ',E.Message); + writeln('Exception occurred: ',E.Message); caught := true; end; end; @@ -29,7 +29,7 @@ try writeln('no exception was raised'); except on E:Exception do begin - writeln('Exception occured: ',E.Message); + writeln('Exception occurred: ',E.Message); caught := true; end; end; @@ -49,7 +49,7 @@ try writeln('no exception was raised'); except on E:Exception do begin - writeln('Exception occured: ',E.Message); + writeln('Exception occurred: ',E.Message); caught := true; end; end; diff --git a/tests/webtbs/tw16884.pp b/tests/webtbs/tw16884.pp index 99f536b71e..8740e19431 100644 --- a/tests/webtbs/tw16884.pp +++ b/tests/webtbs/tw16884.pp @@ -43,7 +43,7 @@ begin if ThreadState = 1 then begin - writeln(Format('ThreadState = %d - constructor race condition occured (should be 2)', [FThreadState])); { we should get the Value 2 here every time, not 1. } + writeln(Format('ThreadState = %d - constructor race condition occurred (should be 2)', [FThreadState])); { we should get the Value 2 here every time, not 1. } ATestFailed := True; readwritebarrier; end diff --git a/tests/webtbs/tw7100.pp b/tests/webtbs/tw7100.pp index d4bbd13d72..cb10606805 100644 --- a/tests/webtbs/tw7100.pp +++ b/tests/webtbs/tw7100.pp @@ -44,7 +44,7 @@ begin result := 1; except result := -1; - write('(exception occured) '); + write('(exception occurred) '); end; end; end;