diff --git a/compiler/assemble.pas b/compiler/assemble.pas index 370fc46fa0..3033866647 100644 --- a/compiler/assemble.pas +++ b/compiler/assemble.pas @@ -2027,7 +2027,7 @@ Implementation MaybeNextList(hp); end; ObjData.afteralloc; - { leave if errors have occured } + { leave if errors have occurred } if errorcount>0 then goto doexit; @@ -2048,7 +2048,7 @@ Implementation ObjData.createsection(sec_code); ObjData.afteralloc; - { leave if errors have occured } + { leave if errors have occurred } if errorcount>0 then goto doexit; @@ -2069,7 +2069,7 @@ Implementation ObjData.createsection(sec_code); ObjData.afterwrite; - { don't write the .o file if errors have occured } + { don't write the .o file if errors have occurred } if errorcount=0 then begin { write objectfile } @@ -2122,7 +2122,7 @@ Implementation ObjData.CreateSection(startsectype,startsecname,startsecorder); TreePass0(hp); ObjData.afteralloc; - { leave if errors have occured } + { leave if errors have occurred } if errorcount>0 then break; @@ -2135,7 +2135,7 @@ Implementation TreePass1(hp); ObjData.afteralloc; - { leave if errors have occured } + { leave if errors have occurred } if errorcount>0 then break; @@ -2149,7 +2149,7 @@ Implementation hp:=TreePass2(hp); ObjData.afterwrite; - { leave if errors have occured } + { leave if errors have occurred } if errorcount>0 then break; diff --git a/compiler/powerpc/agppcmpw.pas b/compiler/powerpc/agppcmpw.pas index 6ef9437dfe..16383d3fa3 100644 --- a/compiler/powerpc/agppcmpw.pas +++ b/compiler/powerpc/agppcmpw.pas @@ -127,7 +127,7 @@ interface t32bitarray = array[0..3] of byte; function ReplaceForbiddenChars(var s: string):Boolean; - {Returns wheater a replacement has occured.} + {Returns wheater a replacement has occurred.} var i:Integer; diff --git a/compiler/powerpc/cgcpu.pas b/compiler/powerpc/cgcpu.pas index 8f1ac17136..74f4255141 100644 --- a/compiler/powerpc/cgcpu.pas +++ b/compiler/powerpc/cgcpu.pas @@ -771,7 +771,7 @@ const { one. } { This procedure may be called before, as well as after g_return_from_proc } { is called. NOTE registers are not to be allocated through the register } - { allocator here, because the register colouring has already occured !! } + { allocator here, because the register colouring has already occurred !! } var regcounter,firstregfpu,firstregint: TSuperRegister; @@ -921,7 +921,7 @@ const procedure tcgppc.g_proc_exit(list : TAsmList;parasize : longint;nostackframe:boolean); { This procedure may be called before, as well as after g_stackframe_entry } { is called. NOTE registers are not to be allocated through the register } - { allocator here, because the register colouring has already occured !! } + { allocator here, because the register colouring has already occurred !! } var regcounter,firstregfpu,firstregint: TsuperRegister; diff --git a/compiler/powerpc64/cgcpu.pas b/compiler/powerpc64/cgcpu.pas index 93fef36f01..dae77c500c 100644 --- a/compiler/powerpc64/cgcpu.pas +++ b/compiler/powerpc64/cgcpu.pas @@ -1115,7 +1115,7 @@ end; called by the current one IMPORTANT: registers are not to be allocated through the register - allocator here, because the register colouring has already occured !! + allocator here, because the register colouring has already occurred !! } procedure tcgppc.g_proc_entry(list: TAsmList; localsize: longint; nostackframe: boolean); @@ -1281,7 +1281,7 @@ end; is called. IMPORTANT: registers are not to be allocated through the register - allocator here, because the register colouring has already occured !! + allocator here, because the register colouring has already occurred !! } procedure tcgppc.g_proc_exit(list: TAsmList; parasize: longint; nostackframe: boolean); diff --git a/compiler/script.pas b/compiler/script.pas index e49b73a113..9285326639 100644 --- a/compiler/script.pas +++ b/compiler/script.pas @@ -269,10 +269,10 @@ Begin AddStart('@echo off'); Add('goto end'); Add(':asmend'); - Add('echo An error occured while assembling %THEFILE%'); + Add('echo An error occurred while assembling %THEFILE%'); Add('goto end'); Add(':linkend'); - Add('echo An error occured while linking %THEFILE%'); + Add('echo An error occurred while linking %THEFILE%'); Add(':end'); inherited WriteToDisk; end; @@ -336,11 +336,11 @@ Begin Add('skip end'); Add('lab asmend'); Add('why'); - Add('echo An error occured while assembling $THEFILE'); + Add('echo An error occurred while assembling $THEFILE'); Add('skip end'); Add('lab linkend'); Add('why'); - Add('echo An error occured while linking $THEFILE'); + Add('echo An error occurred while linking $THEFILE'); Add('lab end'); inherited WriteToDisk; end; diff --git a/utils/fpdoc/intl/dwriter.de.po b/utils/fpdoc/intl/dwriter.de.po index ebe2f3f3d1..fb34cdd363 100644 --- a/utils/fpdoc/intl/dwriter.de.po +++ b/utils/fpdoc/intl/dwriter.de.po @@ -1,5 +1,5 @@ #: dwriter:serrfilewriting -msgid "An error occured during writing of file \"%s\": %s" +msgid "An error occurred during writing of file \"%s\": %s" msgstr "Beim Schreiben der Datei \"%s\" ist ein Fehler aufgetrete: %s" #: dwriter:serrinvalidshortdescr