diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index 1787e2f60d..3f036ae592 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -185,7 +185,7 @@ endif
 endif
 endif
 
-# set correct defines (-d$(CPU_TARGET) is automaticly added in makefile.fpc)
+# set correct defines (-d$(CPU_TARGET) is automatically added in makefile.fpc)
 override LOCALOPT+=-d$(CPC_TARGET) -dGDB -dBROWSERLOG
 
 # i386 specific
diff --git a/compiler/aasmbase.pas b/compiler/aasmbase.pas
index 4a7710b38a..bb49dac49a 100644
--- a/compiler/aasmbase.pas
+++ b/compiler/aasmbase.pas
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
diff --git a/compiler/aasmdata.pas b/compiler/aasmdata.pas
index ac45ad72cf..1744b00653 100644
--- a/compiler/aasmdata.pas
+++ b/compiler/aasmdata.pas
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas
index fc387d4085..2431133d7d 100644
--- a/compiler/aasmtai.pas
+++ b/compiler/aasmtai.pas
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
@@ -2154,7 +2154,7 @@ implementation
 
     function tai_cpu_abstract.is_same_reg_move(regtype: Tregistertype):boolean;
       begin
-        { When the generic RA is used this needs to be overriden, we don't use
+        { When the generic RA is used this needs to be overridden, we don't use
           virtual;abstract; to prevent a lot of warnings of unimplemented abstract methods
           when tai_cpu is created (PFV) }
         internalerror(200404091);
diff --git a/compiler/aggas.pas b/compiler/aggas.pas
index 9f391b5579..f4688bbdc1 100644
--- a/compiler/aggas.pas
+++ b/compiler/aggas.pas
@@ -66,7 +66,7 @@ interface
 
       {# This is the base class for writing instructions.
 
-         The WriteInstruction() method must be overriden
+         The WriteInstruction() method must be overridden
          to write a single instruction to the assembler
          file.
       }
diff --git a/compiler/assemble.pas b/compiler/assemble.pas
index 93058b1e04..8773470115 100644
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@@ -60,7 +60,7 @@ interface
         procedure MakeObject;virtual;abstract;
       end;
 
-      {# This is the base class which should be overriden for each each
+      {# This is the base class which should be overridden for each each
          assembler writer. It is used to actually assembler a file,
          and write the output to the assembler file.
       }
@@ -115,11 +115,11 @@ interface
         procedure AsmCreate(Aplace:tcutplace);
         procedure AsmClose;
 
-        {# This routine should be overriden for each assembler, it is used
+        {# This routine should be overridden for each assembler, it is used
            to actually write the abstract assembler stream to file.}
         procedure WriteTree(p:TAsmList);virtual;
 
-        {# This routine should be overriden for each assembler, it is used
+        {# This routine should be overridden for each assembler, it is used
            to actually write all the different abstract assembler streams
            by calling for each stream type, the @var(WriteTree) method.}
         procedure WriteAsmList;virtual;
diff --git a/compiler/browcol.pas b/compiler/browcol.pas
index 1e52db42d9..f88c928d62 100644
--- a/compiler/browcol.pas
+++ b/compiler/browcol.pas
@@ -1484,7 +1484,7 @@ end;
   procedure ProcessDefIfStruct(definition: tdef);
   begin
     { still led to infinite recursions
-      only usefull for unamed types PM }
+      only useful for unamed types PM }
     if assigned(definition) and not assigned(definition.typesym) then
     begin
       case definition.typ of
diff --git a/compiler/cfileutl.pas b/compiler/cfileutl.pas
index 0e62c123f1..2ca2cecb80 100644
--- a/compiler/cfileutl.pas
+++ b/compiler/cfileutl.pas
@@ -651,7 +651,7 @@ end;
                exit;
              end;
           end;
-        { Set foundfile to something usefull }
+        { Set foundfile to something useful }
         FoundFile:=fn;
       end;
 
diff --git a/compiler/cgobj.pas b/compiler/cgobj.pas
index 7012d9e40f..d8018bdc51 100644
--- a/compiler/cgobj.pas
+++ b/compiler/cgobj.pas
@@ -49,7 +49,7 @@ unit cgobj;
        {# @abstract(Abstract code generator)
           This class implements an abstract instruction generator. Some of
           the methods of this class are generic, while others must
-          be overriden for all new processors which will be supported
+          be overridden for all new processors which will be supported
           by Free Pascal. For 32-bit processors, the base class
           should be @link(tcg64f32) and not @var(tcg).
        }
@@ -131,7 +131,7 @@ unit cgobj;
           {# Pass a parameter, which is a constant, to a routine.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
              It must generate register allocation information for the cgpara in
              case it consists of cpuregisters.
@@ -144,7 +144,7 @@ unit cgobj;
           {# Pass the value of a parameter, which is located in memory, to a routine.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
              It must generate register allocation information for the cgpara in
              case it consists of cpuregisters.
@@ -171,7 +171,7 @@ unit cgobj;
              case it consists of cpuregisters.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
 
              @param(r reference to get address from)
@@ -222,7 +222,7 @@ unit cgobj;
           }
 
           {# Emits instruction to call the method specified by symbol name.
-             This routine must be overriden for each new target cpu.
+             This routine must be overridden for each new target cpu.
 
              There is no a_call_ref because loading the reference will use
              a temp register on most cpu's resulting in conflicts with the
@@ -231,7 +231,7 @@ unit cgobj;
           procedure a_call_name(list : TAsmList;const s : string; weak: boolean);virtual; abstract;
           procedure a_call_reg(list : TAsmList;reg : tregister);virtual; abstract;
           procedure a_call_ref(list : TAsmList;ref : treference);virtual; abstract;
-          { same as a_call_name, might be overriden on certain architectures to emit
+          { same as a_call_name, might be overridden on certain architectures to emit
             static calls without usage of a got trampoline }
           procedure a_call_name_static(list : TAsmList;const s : string);virtual;
 
@@ -419,7 +419,7 @@ unit cgobj;
           {# This should emit the opcode to copy len bytes from the source
              to destination.
 
-             It must be overriden for each new target processor.
+             It must be overridden for each new target processor.
 
              @param(source Source reference of copy)
              @param(dest Destination reference of copy)
@@ -429,7 +429,7 @@ unit cgobj;
           {# This should emit the opcode to copy len bytes from the an unaligned source
              to destination.
 
-             It must be overriden for each new target processor.
+             It must be overridden for each new target processor.
 
              @param(source Source reference of copy)
              @param(dest Destination reference of copy)
@@ -452,7 +452,7 @@ unit cgobj;
           procedure g_finalize(list : TAsmList;t : tdef;const ref : treference);
 
           {# Generates range checking code. It is to note
-             that this routine does not need to be overriden,
+             that this routine does not need to be overridden,
              as it takes care of everything.
 
              @param(p Node which contains the value to check)
@@ -469,7 +469,7 @@ unit cgobj;
 
           {# Emits instructions when compilation is done in profile
              mode (this is set as a command line option). The default
-             behavior does nothing, should be overriden as required.
+             behavior does nothing, should be overridden as required.
           }
           procedure g_profilecode(list : TAsmList);virtual;
           {# Emits instruction for allocating @var(size) bytes at the stackpointer
diff --git a/compiler/dbgdwarf.pas b/compiler/dbgdwarf.pas
index c53be63f25..c3528b7c92 100644
--- a/compiler/dbgdwarf.pas
+++ b/compiler/dbgdwarf.pas
@@ -854,7 +854,7 @@ implementation
 
     procedure TDebugInfoDwarf.set_def_dwarf_labs(def:tdef);
       begin
-        { Keep track of used dwarf entries, this info is only usefull for dwarf entries
+        { Keep track of used dwarf entries, this info is only useful for dwarf entries
           referenced by the symbols. Definitions will always include all
           required stabs }
         if def.dbg_state=dbg_state_unused then
diff --git a/compiler/dbgstabs.pas b/compiler/dbgstabs.pas
index b3702146c8..22429b2901 100644
--- a/compiler/dbgstabs.pas
+++ b/compiler/dbgstabs.pas
@@ -290,7 +290,7 @@ implementation
            not(def.dbg_state in [dbg_state_writing,dbg_state_written,dbg_state_queued]) then
           internalerror(200403091);
 
-        { Keep track of used stabs, this info is only usefull for stabs
+        { Keep track of used stabs, this info is only useful for stabs
           referenced by the symbols. Definitions will always include all
           required stabs }
         if def.dbg_state=dbg_state_unused then
@@ -514,7 +514,7 @@ implementation
             st:=def_stabstr_evaluate(def,'"'+symname+':$1$2=',[stabchar,def_stab_number(def)]);
           end;
         st:=st+ss;
-        { line info is set to 0 for all defs, because the def can be in an other
+        { line info is set to 0 for all defs, because the def can be in another
           unit and then the linenumber is invalid in the current sourcefile }
         st:=st+def_stabstr_evaluate(def,'",${N_LSYM},0,0,0',[]);
         { add to list }
diff --git a/compiler/fppu.pas b/compiler/fppu.pas
index 8b3815ce4c..0566849326 100644
--- a/compiler/fppu.pas
+++ b/compiler/fppu.pas
@@ -1079,7 +1079,7 @@ var
          writeusedunit(true);
 
          { write the objectfiles and libraries that come for this unit,
-           preserve the containers becuase they are still needed to load
+           preserve the containers because they are still needed to load
            the link.res.
             All doesn't depend on the crc! It doesn't matter
            if a unit is in a .o or .a file }
@@ -1161,7 +1161,7 @@ var
          { write whole program optimisation-related information }
          tunitwpoinfo(wpoinfo).ppuwrite(ppufile);
 
-         { the last entry ibend is written automaticly }
+         { the last entry ibend is written automatically }
 
          { flush to be sure }
          ppufile.flush;
diff --git a/compiler/globals.pas b/compiler/globals.pas
index 6167f75093..93aca14e48 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -1447,7 +1447,7 @@ implementation
         RelocSection:=false;
         RelocSectionSetExplicitly:=false;
         LinkTypeSetExplicitly:=false;
-        { memory sizes, will be overriden by parameter or default for target
+        { memory sizes, will be overridden by parameter or default for target
           in options or init_parser }
         stacksize:=0;
         { not initialized yet }
diff --git a/compiler/i386/daopt386.pas b/compiler/i386/daopt386.pas
index 3f7298e117..921839237c 100644
--- a/compiler/i386/daopt386.pas
+++ b/compiler/i386/daopt386.pas
@@ -41,7 +41,7 @@ const
   con_ref = 1;
   con_const = 2;
   { The contents aren't usable anymore for CSE, but they may still be   }
-  { usefull for detecting whether the result of a load is actually used }
+  { useful for detecting whether the result of a load is actually used }
   con_invalid = 3;
   { the reverse of the above (in case a (conditional) jump is encountered): }
   { CSE is still possible, but the original instruction can't be removed    }
diff --git a/compiler/msg/errorct.msg b/compiler/msg/errorct.msg
index c12b6005ef..07f1dbba5e 100644
--- a/compiler/msg/errorct.msg
+++ b/compiler/msg/errorct.msg
@@ -521,7 +521,7 @@ parser_e_cant_access_private_member=03063_E_Aqu
 % declaration cannot be accessed outside the module where the class is
 % defined.
 parser_e_overridden_methods_not_same_ret=03066_E_Els m�todes sobrecarregats han de retornar el mateix tipus: "$2" est� sobrecarregat per "$1", el qual retorna un altre tipus
-% If you declare overriden methods in a class definition, they must
+% If you declare overridden methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_Les funcions declarades amb EXPORT no poden estar niades
 % You cannot declare a function or procedure within a function or procedure
@@ -784,7 +784,7 @@ parser_e_threadvars_only_sg=03147_E_Les variables del fil nom
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_L'assemblador directe no �s compatible amb el format binari de la sortida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 % \end{description}
 parser_w_no_objpas_use_mode=03149_W_No carregueu manualment l'unitat OBJPAS, utilitzeu {\$mode objfpc\} o {\$mode delphi\}
 % You are trying to load the ObjPas unit manual from a uses clause. This is
@@ -1192,7 +1192,7 @@ type_w_signed_unsigned_always_true=04045_W_La comparaci
 type_w_instance_with_abstract=04046_W_S'est� construint una classe "$1" amb m�todes abstractes 
 % An instance of a class is created which contains non_implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_L'operand esquerra per a l'operador d'IN ha de tenir el tamany d'un octet
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errord.msg b/compiler/msg/errord.msg
index f599c30f56..4288a90aa1 100644
--- a/compiler/msg/errord.msg
+++ b/compiler/msg/errord.msg
@@ -1547,7 +1547,7 @@ type_w_signed_unsigned_always_true=04045_W_Wegen des Bereichs der Werte ist das
 type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Gr�sse haben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorda.msg b/compiler/msg/errorda.msg
index 467b319695..99e86b8a6d 100644
--- a/compiler/msg/errorda.msg
+++ b/compiler/msg/errorda.msg
@@ -811,7 +811,7 @@ parser_e_threadvars_only_sg=03147_E_Trådvariabler kan kun erklæres static elle
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Direkte assembler er ikke understøttet i det binære udformat
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Inkludér ikke unit'en OBJPAS manuelt, brug i stedet {$mode objfpc} eller {$mode delphi}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1245,7 +1245,7 @@ type_w_signed_unsigned_always_true=04045_W_Sammenligning er altid sand, grundet
 type_w_instance_with_abstract=04046_W_Konstruerer klassen "$1" med abstrakte metoder
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Den venstre operand til IN-operatoren skal være én byte stor
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The  \var{in} operator
diff --git a/compiler/msg/errordu.msg b/compiler/msg/errordu.msg
index aa6fb95afe..0d4983c8d5 100644
--- a/compiler/msg/errordu.msg
+++ b/compiler/msg/errordu.msg
@@ -1547,7 +1547,7 @@ type_w_signed_unsigned_always_true=04045_W_Wegen des Bereichs der Werte ist das
 type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Grösse haben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index e46c0b67c0..4ef2f4c3a6 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -576,7 +576,7 @@ parser_e_cant_access_private_member=03063_E_Cannot access a private field of an
 % Fields that are declared in a \var{private} section of an object or class
 % declaration cannot be accessed outside the module where the class is
 % defined.
-parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overriden by "$1" which has another return type
+parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overridden by "$1" which has another return type
 % If you declare overridden methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
@@ -1538,7 +1538,7 @@ type_w_signed_unsigned_always_true=04045_W_Comparison is always true due to rang
 type_w_instance_with_abstract=04046_W_Constructing a class "$1" with abstract method "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_The left operand of the IN operator should be byte sized
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
@@ -2539,7 +2539,7 @@ unit_u_ppu_invalid_version=10008_U_PPU Invalid Version $1
 unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor
 % This unit file was compiled for a different processor type, and
 % cannot be read.
-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target
+unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target
 % This unit file was compiled for a different target, and
 % cannot be read.
 unit_u_ppu_source=10011_U_PPU Source: $1
diff --git a/compiler/msg/errores.msg b/compiler/msg/errores.msg
index cf572e85a4..5ee5fd7c34 100644
--- a/compiler/msg/errores.msg
+++ b/compiler/msg/errores.msg
@@ -788,7 +788,7 @@ parser_e_threadvars_only_sg=03147_E_Threadvars s
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1195,7 +1195,7 @@ type_w_signed_unsigned_always_true=04045_W_La comparaci
 type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene m�todos abstractos
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tama�o un byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorf.msg b/compiler/msg/errorf.msg
index a62362c209..1304a66107 100644
--- a/compiler/msg/errorf.msg
+++ b/compiler/msg/errorf.msg
@@ -814,11 +814,11 @@ parser_e_threadvars_only_sg=03147_E_THREADVARS peuvent seulement 
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non support� pour la sortie binaire
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unit� OBJPAS manuellement, utilisez {$mode objfpc} ou {$mode delphi}
 % You're trying to load the ObjPas unit manual from a uses clause. This is
 % not a good idea to do, you can better use the {$mode objfpc} or {$mode delphi}
-% directives which load the unit automaticly
+% directives which load the unit automatically
 parser_e_no_object_override=03150_E_OVERRIDE nepeut �tre utilis� pour des objets
 % Override isn't support for objects, use VIRTUAL instead to override
 % a method of an anchestor object
@@ -1548,10 +1548,10 @@ unit_u_ppu_invalid_header=10007_U_PPU Invalid Header (no PPU at the begin)
 unit_u_ppu_invalid_version=10008_U_PPU Invalid Version $1
 % This unit file was compiled with a different version of the compiler, and
 % cannot be read.
-unit_u_ppu_invalid_processor=10009_U_PPU is compiled for an other processor
+unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor
 % This unit file was compiled for a different processor type, and
 % cannot be read
-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target
+unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target
 % This unit file was compiled for a different processor type, and
 % cannot be read
 unit_u_ppu_source=10011_U_PPU Source: $1
diff --git a/compiler/msg/errorfi.msg b/compiler/msg/errorfi.msg
index 080bfab97c..01a36b4c7a 100644
--- a/compiler/msg/errorfi.msg
+++ b/compiler/msg/errorfi.msg
@@ -816,7 +816,7 @@ parser_e_threadvars_only_sg=03147_E_Les variables de Threads peuvent seulement 
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non support� pour la sortie binaire
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unit� OBJPAS manuellement, utilisez de pr�f�rence \{\$mode Objfpc\} ou \{\$mode Delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1270,7 +1270,7 @@ type_w_signed_unsigned_always_true=04045_W_La comparaison est toujours VRAIE du
 type_w_instance_with_abstract=04046_W_Construction d�une classe "$1" avec des m�thodes abstraites
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=L�op�rande � gauche de l�op�rateur IN doit avoir la longueur d�un octet (8 bits)
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorhe.msg b/compiler/msg/errorhe.msg
index 33c3aa1399..a2e0c062a5 100644
--- a/compiler/msg/errorhe.msg
+++ b/compiler/msg/errorhe.msg
@@ -829,7 +829,7 @@ parser_e_threadvars_only_sg=03147_E_Threadvars 
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_������ ����� ������ ���� ���� ���� ������ ��������
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_���� ����� ������ OBJPAS ������, �� ������ � \{\$mode objfpc\} �� � \{\$mode delphi\} �����
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1336,7 +1336,7 @@ type_w_signed_unsigned_always_true=04045_W_
 type_w_instance_with_abstract=04046_W_����� �� ������ "$1" �� ������ �� �������
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_���� ������ �� ������� IN ���� ����� ����� �� ���
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorheu.msg b/compiler/msg/errorheu.msg
index b4647fcc79..a5f6928965 100644
--- a/compiler/msg/errorheu.msg
+++ b/compiler/msg/errorheu.msg
@@ -829,7 +829,7 @@ parser_e_threadvars_only_sg=03147_E_Threadvars חייבים להיות סטטי
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_השימוש במאסף הנוכחי אינו תומך בוסג התוצאה הבינארית
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_אסור לקרוא ליחידת OBJPAS ישירות, יש להשתמש ב \{\$mode objfpc\} או ב \{\$mode delphi\} במקום
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1336,7 +1336,7 @@ type_w_signed_unsigned_always_true=04045_W_ההשוואה תמיד תחזיר ע
 type_w_instance_with_abstract=04046_W_מאתחל את המחלקה "$1" עם מתודות לא ממומשות
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_הערך השמאלי של האופרנד IN צריך להיות בגודל של בית
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorn.msg b/compiler/msg/errorn.msg
index cf46e0f686..8ce7d8def2 100644
--- a/compiler/msg/errorn.msg
+++ b/compiler/msg/errorn.msg
@@ -815,7 +815,7 @@ parser_e_threadvars_only_sg=03147_E_Threadvariabelen kunnen alleen globaal of st
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Directe assemblercode wordt niet ondersteund door de interne assembler.
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Laad de OBJPAS unit niet manueel, gebruik {$mode objfpc} of {$mode delphi}.
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1243,7 +1243,7 @@ type_w_signed_unsigned_always_true=04045_W_e vergelijking is steeds  waar omwill
 type_w_instance_with_abstract=04046_W_Constructie van een klasse "$1" met abstracte methoden
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_De linker operand van de IN operator moet de grootte van een byte hebben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorpl.msg b/compiler/msg/errorpl.msg
index 58eb3c15fb..d5bbde1f4c 100644
--- a/compiler/msg/errorpl.msg
+++ b/compiler/msg/errorpl.msg
@@ -791,7 +791,7 @@ parser_e_threadvars_only_sg=03147_E_Zmienne threadvar mog
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedost�pne gdy wyj�ciowym formatem jest wbudowane zapisywanie binarne
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Nie �aduj modu�u OBJPAS bezpo�rednio - u�yj trybu obiektowego (objfpc, delphi)
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1200,7 +1200,7 @@ type_w_signed_unsigned_always_true=04045_W_To por
 type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj�cej metody abstrakcyjne
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Lewy operand operatora IN powinien by� wielko�ci jednego bajta
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorpli.msg b/compiler/msg/errorpli.msg
index f6410ee013..d9b816e87a 100644
--- a/compiler/msg/errorpli.msg
+++ b/compiler/msg/errorpli.msg
@@ -791,7 +791,7 @@ parser_e_threadvars_only_sg=03147_E_Zmienne threadvar mog
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedost�pne gdy wyj�ciowym formatem jest wbudowane zapisywanie binarne
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Nie �aduj modu�u OBJPAS bezpo�rednio - u�yj trybu obiektowego (objfpc, delphi)
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1200,7 +1200,7 @@ type_w_signed_unsigned_always_true=04045_W_To por
 type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj�cej metody abstrakcyjne
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Lewy operand operatora IN powinien by� wielko�ci jednego bajta
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorpt.msg b/compiler/msg/errorpt.msg
index dae6e1ce3a..5bfffae4ca 100644
--- a/compiler/msg/errorpt.msg
+++ b/compiler/msg/errorpt.msg
@@ -1528,7 +1528,7 @@ type_w_signed_unsigned_always_true=04045_W_Compara
 type_w_instance_with_abstract=04046_W_Construindo uma classe "$1" com m�todo abstrato "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_O operador esquerdo em um operador 'IN' deve ser tamanho byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorptu.msg b/compiler/msg/errorptu.msg
index 8d0becd3ff..1da9423531 100644
--- a/compiler/msg/errorptu.msg
+++ b/compiler/msg/errorptu.msg
@@ -1528,7 +1528,7 @@ type_w_signed_unsigned_always_true=04045_W_Comparação será sempre verdadeira
 type_w_instance_with_abstract=04046_W_Construindo uma classe "$1" com método abstrato "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_O operador esquerdo em um operador 'IN' deve ser tamanho byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
diff --git a/compiler/msg/errorues.msg b/compiler/msg/errorues.msg
index f8b8ac7201..a305571f86 100644
--- a/compiler/msg/errorues.msg
+++ b/compiler/msg/errorues.msg
@@ -782,7 +782,7 @@ parser_e_threadvars_only_sg=03147_E_Threadvars sólo pueden ser globales o está
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1189,7 +1189,7 @@ type_w_signed_unsigned_always_true=04045_W_La comparación es siempre verdadera
 type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene métodos abstractos
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tamaño un byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 7b95a874f5..d397b89419 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -182,681 +182,681 @@ const msgtxt : array[0..000240,1..240] of char=(
   '03062_E_Cannot access a protected field of an object here'#000+
   '03063_E_Cannot access a private field of an object here'#000+
   '03066_E_Overridden methods must have the same return type: "$2','" is o'+
-  'verriden by "$1" which has another return type'#000+
+  'verridden by "$1" which has another return type'#000+
   '03067_E_EXPORT declared functions can'#039't be nested'#000+
   '03068_E_Methods can'#039't be EXPORTed'#000+
   '03069_E_Call by var for arg no. $1 has to match exactly: Got "$2" expe'+
   'cted "$3"'#000+
-  '03070_E_Class isn'#039't a p','arent class of the current class'#000+
+  '03070_E_Class isn'#039't a ','parent class of the current class'#000+
   '03071_E_SELF is only allowed in methods'#000+
   '03072_E_Methods can be only in other methods called direct with type i'+
   'dentifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#000+
-  '03074_E_range check error in set constructor or',' duplicate set elemen'+
+  '03074_E_range check error in set constructor o','r duplicate set elemen'+
   't'#000+
   '03075_E_Pointer to object expected'#000+
   '03076_E_Expression must be constructor call'#000+
   '03077_E_Expression must be destructor call'#000+
   '03078_E_Illegal order of record elements'#000+
-  '03079_E_Expression type must be class or record type'#000+
-  '0','3080_E_Procedures can'#039't return a value'#000+
+  '03079_E_Expression type must be class or record type'#000,
+  '03080_E_Procedures can'#039't return a value'#000+
   '03081_E_constructors and destructors must be methods'#000+
   '03082_E_Operator is not overloaded'#000+
   '03083_E_Impossible to overload assignment for equal types'#000+
   '03084_E_Impossible operator overload'#000+
-  '03085_E_Re-raise i','sn'#039't possible there'#000+
+  '03085_E_Re-raise ','isn'#039't possible there'#000+
   '03086_E_The extended syntax of new or dispose isn'#039't allowed for a '+
   'class'#000+
   '03088_E_Procedure overloading is switched off'#000+
   '03089_E_It is not possible to overload this operator. Related overload'+
-  'able operators (if any) are: $1'#000,
+  'able operators (if any) are: $1',#000+
   '03090_E_Comparative operator must return a boolean value'#000+
   '03091_E_Only virtual methods can be abstract'#000+
   '03092_F_Use of unsupported feature!'#000+
   '03093_E_The mix of different kind of objects (class, object, interface'+
   ', etc) isn'#039't allowed'#000+
-  '03094_W_Unk','nown procedure directive had to be ignored: "$1"'#000+
+  '03094_W_Un','known procedure directive had to be ignored: "$1"'#000+
   '03095_E_absolute can only be associated to one variable'#000+
   '03096_E_absolute can only be associated with a var or const'#000+
   '03097_E_Only one variable can be initialized'#000+
-  '03098_E_Abstract methods shoul','dn'#039't have any definition (with fun'+
+  '03098_E_Abstract methods shou','ldn'#039't have any definition (with fun'+
   'ction body)'#000+
   '03099_E_This overloaded function can'#039't be local (must be exported)'+
   #000+
   '03100_W_Virtual methods are used without a constructor in "$1"'#000+
   '03101_CL_Macro defined: $1'#000+
   '03102_CL_Macro undefined: $1'#000+
-  '03103_CL','_Macro $1 set to $2'#000+
+  '03103_C','L_Macro $1 set to $2'#000+
   '03104_I_Compiling $1'#000+
   '03105_UL_Parsing interface of unit $1'#000+
   '03106_UL_Parsing implementation of $1'#000+
   '03107_DL_Compiling $1 for the second time'#000+
   '03109_E_No property found to override'#000+
-  '03110_E_Only one default property is allowe','d'#000+
+  '03110_E_Only one default property is allow','ed'#000+
   '03111_E_The default property must be an array property'#000+
   '03112_E_Virtual constructors are only supported in class object model'#000+
   '03113_E_No default property available'#000+
   '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
   'itch'#000+
-  '0311','5_E_Forward declaration of class "$1" must be resolved here to u'+
+  '031','15_E_Forward declaration of class "$1" must be resolved here to u'+
   'se the class as ancestor'#000+
   '03116_E_Local operators not supported'#000+
   '03117_E_Procedure directive "$1" not allowed in interface section'#000+
-  '03118_E_Procedure directive "$1" not allowed in',' implementation secti'+
+  '03118_E_Procedure directive "$1" not allowed i','n implementation secti'+
   'on'#000+
   '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+
   '03120_E_Function is already declared Public/Forward "$1"'#000+
   '03121_E_Can'#039't use both EXPORT and EXTERNAL'#000+
-  '03123_W_"$1" not yet supported inside inline pro','cedure/function'#000+
+  '03123_W_"$1" not yet supported inside inline pr','ocedure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
   '03126_H_may be pointer dereference is missing'#000+
   '03127_F_Selected assembler reader not supported'#000+
   '03128_E_Procedure directive "$1" has conflicts with other directives'#000+
-  '0312','9_E_Calling convention doesn'#039't match forward'#000+
+  '031','29_E_Calling convention doesn'#039't match forward'#000+
   '03131_E_Property can'#039't have a default value'#000+
   '03132_E_The default value of a property must be constant'#000+
   '03133_E_Symbol can'#039't be published, can be only a class'#000+
-  '03134_E_This kind of property can'#039't be ','published'#000+
+  '03134_E_This kind of property can'#039't be',' published'#000+
   '03136_E_An import name is required'#000+
   '03138_E_Division by zero'#000+
   '03139_E_Invalid floating point operation'#000+
   '03140_E_Upper bound of range is less than lower bound'#000+
   '03141_W_string "$1" is longer than "$2"'#000+
-  '03142_E_string length is larger tha','n array of char length'#000+
+  '03142_E_string length is larger th','an array of char length'#000+
   '03143_E_Illegal expression after message directive'#000+
   '03144_E_Message handlers can take only one call by ref. parameter'#000+
   '03145_E_Duplicate message label: "$1"'#000+
-  '03146_E_Self can only be an explicit parameter in methods whic','h are '+
+  '03146_E_Self can only be an explicit parameter in methods whi','ch are '+
   'message handlers'#000+
   '03147_E_Threadvars can be only static or global'#000+
   '03148_F_Direct assembler not supported for binary output format'#000+
   '03149_W_Don'#039't load OBJPAS unit manually, use \{\$mode objfpc\} or '+
   '\{\$mode delphi\} instead'#000+
-  '03150_E_OVERR','IDE can'#039't be used in objects'#000+
+  '03150_E_OVER','RIDE can'#039't be used in objects'#000+
   '03151_E_Data types which require initialization/finalization can'#039't'+
   ' be used in variant records'#000+
   '03152_E_Resourcestrings can be only static or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
-  '03154_E_The type o','f the storage symbol must be boolean'#000+
+  '03154_E_The type ','of the storage symbol must be boolean'#000+
   '03155_E_This symbol isn'#039't allowed as storage symbol'#000+
   '03156_E_Only classes which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
-  '03158_E_The value for a property index must b','e of an ordinal type'#000+
+  '03158_E_The value for a property index must ','be of an ordinal type'#000+
   '03159_E_Procedure name too short to be exported'#000+
   '03160_E_No DEFFILE entry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
   '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
-  'ule',#000+
+  'ul','e'#000+
   '03163_E_Can'#039't export with index under $1'#000+
   '03164_E_Exporting of variables is not supported under $1'#000+
   '03165_E_Improper GUID syntax'#000+
   '03168_W_Procedure named "$1" not found that is suitable for implementi'+
   'ng the $2.$3'#000+
-  '03169_E_interface identifier ','expected'#000+
+  '03169_E_interface identifier',' expected'#000+
   '03170_E_Type "$1" can'#039't be used as array index type'#000+
   '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000+
   '03172_E_Access specifiers can'#039't be used in INTERFACEs and OBJCPROT'+
   'OCOLs'#000+
-  '03173_E_An interface or Objective-C protocol or c','ategory cannot cont'+
+  '03173_E_An interface or Objective-C protocol or ','category cannot cont'+
   'ain fields'#000+
   '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+
   '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+
   '03176_E_Some fields coming before "$1" weren'#039't initialized'#000+
-  '03177_W_Some fields coming after "$1" were','n'#039't initialized'#000+
+  '03177_W_Some fields coming after "$1" wer','en'#039't initialized'#000+
   '03178_E_VarArgs directive (or '#039'...'#039' in MacPas) without CDecl/C'+
   'PPDecl/MWPascal and External'#000+
   '03179_E_Self must be a normal (call-by-value) parameter'#000+
   '03180_E_Interface "$1" has no interface identification'#000+
-  '03181_E_Unknown class ','field or method identifier "$1"'#000+
+  '03181_E_Unknown class',' field or method identifier "$1"'#000+
   '03182_W_Overriding calling convention "$1" with "$2"'#000+
   '03183_E_Typed constants of the type "procedure of object" can only be '+
   'initialized with NIL'#000+
   '03184_E_Default value can only be assigned to one parameter'#000+
-  '0318','5_E_Default parameter required for "$1"'#000+
+  '031','85_E_Default parameter required for "$1"'#000+
   '03186_W_Use of unsupported feature!'#000+
   '03187_H_C arrays are passed by reference'#000+
   '03188_E_C array of const must be the last argument'#000+
   '03189_H_Type "$1" redefinition'#000+
-  '03190_W_cdecl'#039'ared functions have no high',' parameter'#000+
+  '03190_W_cdecl'#039'ared functions have no hig','h parameter'#000+
   '03191_W_cdecl'#039'ared functions do not support open strings'#000+
   '03192_E_Cannot initialize variables declared as threadvar'#000+
   '03193_E_Message directive is only allowed in Classes'#000+
   '03194_E_Procedure or Function expected'#000+
-  '03195_W_Calling conven','tion directive ignored: "$1"'#000+
+  '03195_W_Calling conve','ntion directive ignored: "$1"'#000+
   '03196_E_REINTRODUCE can'#039't be used in objects'#000+
   '03197_E_Each argument must have its own location'#000+
   '03198_E_Each argument must have an explicit location'#000+
   '03199_E_Unknown argument location'#000+
-  '03200_E_32 Bit-Integer or poin','ter variable expected'#000+
+  '03200_E_32 Bit-Integer or poi','nter variable expected'#000+
   '03201_E_Goto statements aren'#039't allowed between different procedure'+
   's'#000+
   '03202_F_Procedure too complex, it requires too many registers'#000+
   '03203_E_Illegal expression'#000+
   '03204_E_Invalid integer expression'#000+
-  '03205_E_Illegal qualifier'#000,
+  '03205_E_Illegal qualifier',#000+
   '03206_E_High range limit < low range limit'#000+
   '03207_E_Exit'#039's parameter must be the name of the procedure it is u'+
   'sed in'#000+
   '03208_E_Illegal assignment to for-loop variable "$1"'#000+
   '03209_E_Can'#039't declare local variable as EXTERNAL'#000+
-  '03210_E_Procedure is a','lready declared EXTERNAL'#000+
+  '03210_E_Procedure is ','already declared EXTERNAL'#000+
   '03211_W_Implicit uses of Variants unit'#000+
   '03212_E_Class and static methods can'#039't be used in INTERFACES'#000+
   '03213_E_Overflow in arithmetic operation'#000+
   '03214_E_Protected or private expected'#000+
-  '03215_E_SLICE can'#039't be used outside ','of parameter list'#000+
+  '03215_E_SLICE can'#039't be used outside',' of parameter list'#000+
   '03216_E_A DISPINTERFACE can'#039't have a parent class'#000+
   '03217_E_A DISPINTERFACE needs a guid'#000+
   '03218_W_Overridden methods must have a related return type. This code '+
-  'may crash, it depends on a Delphi parser bug ("$2" is overridden ','by '+
+  'may crash, it depends on a Delphi parser bug ("$2" is overridden',' by '+
   '"$1" which has another return type)'#000+
   '03219_E_Dispatch IDs must be ordinal constants'#000+
   '03220_E_The range of the array is too large'#000+
   '03221_E_The address cannot be taken of bit packed array elements and r'+
   'ecord fields'#000+
-  '03222_E_Dynamic arrays cann','ot be packed'#000+
+  '03222_E_Dynamic arrays can','not be packed'#000+
   '03223_E_Bit packed array elements and record fields cannot be used as '+
   'loop variables'#000+
   '03224_E_VAR, TYPE and CONST are allowed only in generics and classes'#000+
   '03225_E_This type can'#039't be a generic'#000+
-  '03226_W_Don'#039't load LINEINFO unit man','ually, Use the -gl compiler '+
+  '03226_W_Don'#039't load LINEINFO unit ma','nually, Use the -gl compiler '+
   'switch instead'#000+
   '03227_E_No function result type specified for function "$1"'#000+
   '03228_E_Specialization is only supported for generic types'#000+
   '03229_E_Generics can'#039't be used as parameters when specializing gen'+
   'erics'#000+
-  '03230_','E_Constants of objects containing a VMT aren'#039't allowed'#000+
+  '03230','_E_Constants of objects containing a VMT aren'#039't allowed'#000+
   '03231_E_Taking the address of labels defined outside the current scope'+
   ' isn'#039't allowed'#000+
   '03233_E_Cannot initialize variables declared as external'#000+
   '03234_E_Illegal function result type'#000+
-  '03235_','E_No common type possible between "$1" and "$2"'#000+
+  '03235','_E_No common type possible between "$1" and "$2"'#000+
   '03236_E_Generics without specialization cannot be used as a type for a'+
   ' variable'#000+
   '03237_W_Register list is ignored for pure assembler routines'#000+
-  '03238_E_Implements property must have class or inte','rface type'#000+
+  '03238_E_Implements property must have class or int','erface type'#000+
   '03239_E_Implements-property must implement interface of correct type, '+
   'found "$1" expected "$2"'#000+
   '03240_E_Implements-property must have read specifier'#000+
   '03241_E_Implements-property must not have write-specifier'#000+
-  '03242_E_Implements-prop','erty must not have stored-specifier'#000+
+  '03242_E_Implements-pro','perty must not have stored-specifier'#000+
   '03243_E_Implements-property used on unimplemented interface: "$1"'#000+
   '03244_E_Floating point not supported for this target'#000+
   '03245_E_Class "$1" does not implement interface "$2"'#000+
-  '03246_E_Type used by implements ','must be an interface'#000+
+  '03246_E_Type used by implements',' must be an interface'#000+
   '03247_E_Variables cannot be exported with a different name on this tar'+
   'get, add the name to the declaration using the "export" directive (var'+
   'iable name: $1, declared export name: $2)'#000+
-  '03248_E_Weak external symbols are not',' supported for the current targ'+
+  '03248_E_Weak external symbols are no','t supported for the current targ'+
   'et'#000+
   '03249_E_Forward type definition does not match'#000+
   '03250_N_Virtual method "$1" has a lower visibility ($2) than parent cl'+
   'ass $3 ($4)'#000+
   '03251_E_Fields cannot appear after a method or property definition, st'+
-  'art a n','ew visibility section first'#000+
+  'art a ','new visibility section first'#000+
   '03252_E_Parameters cannot contain local type definitions. Use a separa'+
   'te type definition in a type block.'#000+
   '03253_E_ABSTRACT and SEALED conflict'#000+
   '03254_E_Cannot create a descendant of the sealed class "$1"'#000+
-  '03255_E_S','EALED class cannot have an ABSTRACT method'#000+
+  '03255_E_','SEALED class cannot have an ABSTRACT method'#000+
   '03256_E_Only virtual methods can be final'#000+
   '03257_E_Final method cannot be overridden: "$1"'#000+
   '03258_E_Only one message can be used per method.'#000+
   '03259_E_Invalid enumerator identifier: "$1"'#000+
-  '03260_E_Enumer','ator identifier required'#000+
+  '03260_E_Enume','rator identifier required'#000+
   '03261_E_Enumerator MoveNext pattern method is not valid. Method must b'+
   'e a function with the Boolean return type and no required arguments.'#000+
   '03262_E_Enumerator Current pattern property is not valid. Property mus'+
-  't have',' a getter.'#000+
+  't hav','e a getter.'#000+
   '03263_E_Only one enumerator MoveNext method is allowed per class/objec'+
   't'#000+
   '03264_E_Only one enumerator Current property is allowed per class/obje'+
   'ct'#000+
   '03265_E_For in loop cannot be used for the type "$1"'#000+
-  '03266_E_Objective-C messages re','quire their Objective-C selector name'+
+  '03266_E_Objective-C messages r','equire their Objective-C selector name'+
   ' to be specified using the "message" directive.'#000+
   '03267_E_Objective-C does not have formal constructors nor destructors.'+
   ' Use the alloc, initXXX and dealloc messages.'#000+
-  '03268_E_Message name is too long (max. ','255 characters)'#000+
+  '03268_E_Message name is too long (max.',' 255 characters)'#000+
   '03269_E_Objective-C message symbol name for "$1" is too long'#000+
   '03270_H_Defining a new Objective-C root class. To derive from another '+
   'root class (e.g., NSObject), specify it as the parent class.'#000+
-  '03271_E_Objective-C classes cann','ot have published sections.'#000+
+  '03271_E_Objective-C classes can','not have published sections.'#000+
   '03272_F_This module requires an Objective-C mode switch to be compiled'+
   #000+
   '03273_E_Inherited methods can only be overridden in Objective-C, add "'+
   'override" (inherited method defined in $1)'#000+
-  '03274_H_Inherited methods ca','n only be overridden in Objective-C, add'+
+  '03274_H_Inherited methods c','an only be overridden in Objective-C, add'+
   ' "override" (inherited method defined in $1).'#000+
   '03275_E_Message name "$1" in inherited class is different from message'+
   ' name "$2" in current class.'#000+
-  '03276_E_It is not yet possible to make unique copies of',' Objective-C '+
+  '03276_E_It is not yet possible to make unique copies o','f Objective-C '+
   'types'#000+
   '03277_E_Objective-C categories cannot be used as types'#000+
   '03278_E_Categories do not override, but replace methods. Use "reintrod'+
   'uce" instead.'#000+
   '03279_E_Replaced methods can only be reintroduced in Objective-C, add '+
-  '"reintroduce','" (replaced method defined in $1).'#000+
+  '"reintroduc','e" (replaced method defined in $1).'#000+
   '03280_H_Replaced methods can only be reintroduced in Objective-C, add '+
   '"reintroduce" (replaced method defined in $1).'#000+
   '03281_E_Getter for implements interface must use the target'#039's defa'+
-  'ult calling convention','.'#000+
+  'ult calling conventio','n.'#000+
   '03282_E_Typed files cannot contain reference-counted types.'#000+
   '03283_E_Operator is not overloaded: $2 "$1"'#000+
   '03284_E_Operator is not overloaded: "$1" $2 "$3"'#000+
   '03285_E_Expected another $1 array elements'#000+
-  '03286_E_String constant too long while ans','istrings are disabled'#000+
+  '03286_E_String constant too long while an','sistrings are disabled'#000+
   '03287_E_Type cannot be used as univ parameter because its size is unkn'+
   'own at compile time: "$1"'#000+
   '03288_E_Only one class constructor can be declared in class: "$1"'#000+
-  '03289_E_Only one class destructor can be declared in cla','ss: "$1"'#000+
+  '03289_E_Only one class destructor can be declared in cl','ass: "$1"'#000+
   '03290_E_Class constructors can'#039't have parameters'#000+
   '03291_E_Class destructors can'#039't have parameters'#000+
   '03292_F_This construct requires the \{\$modeswitch objectivec1\} mode '+
   'switch to be active'#000+
-  '03293_E_Unicodechar/string constants cannot ','be converted to ansi/sho'+
+  '03293_E_Unicodechar/string constants cannot',' be converted to ansi/sho'+
   'rtstring at compile-time'#000+
   '03294_E_For-in Objective-Pascal loops require \{\$modeswitch Objective'+
   'C2\} to be active'#000+
   '03295_E_The compiler cannot find the NSFastEnumerationProtocol or NSFa'+
-  'stEnumerationState type in the Co','coaAll unit'#000+
+  'stEnumerationState type in the C','ocoaAll unit'#000+
   '03296_E_Typed constants of the type '#039'procedure is nested'#039' can '+
   'only be initialized with NIL and global procedures/functions'#000+
   '04000_E_Type mismatch'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismatch between "$','1" and "$2"'#000+
+  '04002_E_Type mismatch between "','$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
   '04006_E_Boolean expression expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
-  '04008_E_pointer type e','xpected, but got "$1"'#000+
+  '04008_E_pointer type ','expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
   '04011_E_Can'#039't evaluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
   '04013_E_Operation not implemented for sets'#000+
-  '04014_W_Automatic type conversion from floating ty','pe to COMP which i'+
+  '04014_W_Automatic type conversion from floating t','ype to COMP which i'+
   's an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
   '04016_E_String types have to match exactly in $V+ mode'#000+
   '04017_E_succ or pred on enums with assignments not possible'#000+
-  '04018_E_Can'#039't read or write variables of',' this type'#000+
+  '04018_E_Can'#039't read or write variables o','f this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
   '04020_E_Can'#039't use read or write on untyped file.'#000+
   '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  '04023_E_Integer or real e','xpression expected'#000+
+  '04023_E_Integer or real ','expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
   '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal constant passed to inter','nal math function'#000+
+  '04027_E_Illegal constant passed to inte','rnal math function'#000+
   '04028_E_Can'#039't take the address of constant expressions'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
   '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
   'e'#000+
   '04031_E_Can'#039't assign values to an address'#000+
-  '04032_E_Can'#039't assig','n values to const variable'#000+
+  '04032_E_Can'#039't assi','gn values to const variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
   '04035_H_Mixing signed expressions and longwords gives a 64bit result'#000+
-  '04036_W_Mixing signed expressions and cardinals here may cause a range',
-  ' check error'#000+
+  '04036_W_Mixing signed expressions and cardinals here may cause a rang',
+  'e check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '04038_E_enums with assignments can'#039't be used as array index'#000+
   '04039_E_Class or Object types "$1" and "$2" are not related'#000+
-  '04040_W_Class types "$1" and "$2" are not rela','ted'#000+
+  '04040_W_Class types "$1" and "$2" are not rel','ated'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
   '04042_E_Type "$1" is not completely defined'#000+
   '04043_W_String literal has more characters than short string length'#000+
   '04044_W_Comparison is always false due to range of values'#000+
-  '04045_W_Com','parison is always true due to range of values'#000+
+  '04045_W_Co','mparison is always true due to range of values'#000+
   '04046_W_Constructing a class "$1" with abstract method "$2"'#000+
   '04047_H_The left operand of the IN operator should be byte sized'#000+
-  '04048_W_Type size mismatch, possible loss of data / range check error',
+  '04048_W_Type size mismatch, possible loss of data / range check erro','r'+
   #000+
   '04049_H_Type size mismatch, possible loss of data / range check error'#000+
   '04050_E_The address of an abstract method can'#039't be taken'#000+
   '04051_E_Assignments to formal parameters and open arrays are not possi'+
   'ble'#000+
-  '04052_E_Constant Expression expected'#000+
-  '0','4053_E_Operation "$1" not supported for types "$2" and "$3"'#000+
+  '04052_E_Constant Expression expected'#000,
+  '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+
   '04054_E_Illegal type conversion: "$1" to "$2"'#000+
   '04055_H_Conversion between ordinals and pointers is not portable'#000+
   '04056_W_Conversion between ordinals and pointers is not portable'#000+
-  '0405','7_E_Can'#039't determine which overloaded function to call'#000+
+  '040','57_E_Can'#039't determine which overloaded function to call'#000+
   '04058_E_Illegal counter variable'#000+
   '04059_W_Converting constant real value to double for C variable argume'+
   'nt, add explicit typecast to prevent this.'#000+
-  '04060_E_Class or COM interface type expe','cted, but got "$1"'#000+
+  '04060_E_Class or COM interface type exp','ected, but got "$1"'#000+
   '04061_E_Constant packed arrays are not yet supported'#000+
   '04062_E_Incompatible type for arg no. $1: Got "$2" expected "(Bit)Pack'+
   'ed Array"'#000+
   '04063_E_Incompatible type for arg no. $1: Got "$2" expected "(not pack'+
   'ed) Array"'#000+
-  '04064_E','_Elements of packed arrays cannot be of a type which need to '+
+  '04064_','E_Elements of packed arrays cannot be of a type which need to '+
   'be initialised'#000+
   '04065_E_Constant packed records and objects are not yet supported'#000+
   '04066_W_Arithmetic "$1" on untyped pointer is unportable to {$T+}, sug'+
   'gest typecast'#000+
-  '04076_E_Can'#039't ','take address of a subroutine marked as local'#000+
+  '04076_E_Can'#039't',' take address of a subroutine marked as local'#000+
   '04077_E_Can'#039't export subroutine marked as local from a unit'#000+
   '04078_E_Type is not automatable: "$1"'#000+
   '04079_H_Converting the operands to "$1" before doing the add could pre'+
   'vent overflow errors.'#000+
-  '04080','_H_Converting the operands to "$1" before doing the subtract co'+
+  '0408','0_H_Converting the operands to "$1" before doing the subtract co'+
   'uld prevent overflow errors.'#000+
   '04081_H_Converting the operands to "$1" before doing the multiply coul'+
   'd prevent overflow errors.'#000+
-  '04082_W_Converting pointers to signed integers may ','result in wrong c'+
+  '04082_W_Converting pointers to signed integers may',' result in wrong c'+
   'omparison results and range errors, use an unsigned type instead.'#000+
   '04083_E_Interface type $1 has no valid GUID'#000+
   '04084_E_Invalid selector name "$1"'#000+
   '04085_E_Expected Objective-C method, but got $1'#000+
-  '04086_E_Expected Objective-C m','ethod or constant method name'#000+
+  '04086_E_Expected Objective-C ','method or constant method name'#000+
   '04087_E_No type info available for this type'#000+
   '04088_E_Ordinal or string expression expected'#000+
   '04089_E_String expression expected'#000+
   '04090_W_Converting 0 to NIL'#000+
-  '04091_E_Objective-C protocol type expected, but got "$1"',#000+
+  '04091_E_Objective-C protocol type expected, but got "$1','"'#000+
   '04092_E_The type "$1" is not supported for interaction with the Object'+
   'ive-C runtime.'#000+
   '04093_E_Class or objcclass type expected, but got "$1"'#000+
   '04094_E_Objcclass type expected'#000+
-  '04095_W_Coerced univ parameter type in procedural variable may caus','e'+
+  '04095_W_Coerced univ parameter type in procedural variable may cau','se'+
   ' crash or memory corruption: $1 to $2'#000+
   '04096_E_Type parameters of specializations of generics cannot referenc'+
   'e the currently specialized type'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Duplicate iden','tifier "$1"'#000+
+  '05002_E_Duplicate ide','ntifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
   '05007_E_Error in type definition'#000+
   '05009_E_Forward type not resolved "$1"'#000+
-  '05010_E_Only static variable','s can be used in static methods or outsi'+
+  '05010_E_Only static variabl','es can be used in static methods or outsi'+
   'de methods'#000+
   '05012_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
   't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
-  '05015_E_Label used but not defined "$1"'#000,
+  '05015_E_Label used but not defined "$1"',#000+
   '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forw','ard class definition not resolved "$1"'#000+
+  '05022_E_For','ward class definition not resolved "$1"'#000+
   '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
-  '05027_N_Local variable "$1" is assigned but',' never used'#000+
+  '05027_N_Local variable "$1" is assigned bu','t never used'#000+
   '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
-  '05033_W_Function result d','oes not seem to be set'#000+
+  '05033_W_Function result ','does not seem to be set'#000+
   '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
-  '05037_W_Variable "$1" does not seem to be ini','tialized'#000+
+  '05037_W_Variable "$1" does not seem to be in','itialized'#000+
   '05038_E_identifier idents no member "$1"'#000+
   '05039_H_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
   '05042_E_No matching implementation for interface method "$1" found'#000+
   '05043_W_Symbol "$1" is deprecated'#000+
-  '05044_W_Symbol "$1" is not p','ortable'#000+
+  '05044_W_Symbol "$1" is not ','portable'#000+
   '05055_W_Symbol "$1" is not implemented'#000+
   '05056_E_Can'#039't create unique type from this type'#000+
   '05057_H_Local variable "$1" does not seem to be initialized'#000+
   '05058_H_Variable "$1" does not seem to be initialized'#000+
-  '05059_W_Function result variabl','e does not seem to initialized'#000+
+  '05059_W_Function result variab','le does not seem to initialized'#000+
   '05060_H_Function result variable does not seem to be initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
   '05062_H_Found abstract method: $1'#000+
   '05063_W_Symbol "$1" is experimental'#000+
-  '05064_W_Forward declaratio','n "$1" not resolved, assumed external'#000+
+  '05064_W_Forward declarati','on "$1" not resolved, assumed external'#000+
   '05065_W_Symbol "$1" is belongs to a library'#000+
   '05066_W_Symbol "$1" is deprecated: "$2"'#000+
   '05067_E_Cannot find an enumerator for the type "$1"'#000+
   '05068_E_Cannot find a "MoveNext" method in enumerator "$1"'#000+
-  '05069_E','_Cannot find a "Current" property in enumerator "$1"'#000+
+  '05069_','E_Cannot find a "Current" property in enumerator "$1"'#000+
   '05070_E_Mismatch between number of declared parameters and number of c'+
   'olons in message string.'#000+
   '05071_N_Private type "$1.$2" never used'#000+
   '05072_N_Private const "$1.$2" never used'#000+
-  '05073_N_Pri','vate property "$1.$2" never used'#000+
+  '05073_N_Pr','ivate property "$1.$2" never used'#000+
   '05074_W_Unit "$1" is deprecated'#000+
   '05075_W_Unit "$1" is deprecated: "$2"'#000+
   '05076_W_Unit "$1" is not portable'#000+
   '05077_W_Unit "$1" is belongs to a library'#000+
   '05078_W_Unit "$1" is not implemented'#000+
-  '05079_W_Unit "$1" is exp','erimental'#000+
+  '05079_W_Unit "$1" is ex','perimental'#000+
   '05080_E_No complete definition of the formally declared objcclass "$1"'+
   ' is in scope'#000+
   '05081_E_Gotos into initialization or finalization blocks of units are '+
   'not allowed'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '06012_E_File type','s must be var parameters'#000+
+  '06012_E_File typ','es must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
-  '060','20_E_Abstract methods can'#039't be called directly'#000+
+  '06','020_E_Abstract methods can'#039't be called directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
-  '06033_E_No code for inline procedure s','tored'#000+
+  '06033_E_No code for inline procedure ','stored'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
   'sed, use (set)length instead'#000+
   '06037_E_Constructors or destructors cannot be called inside a '#039'wit'+
   'h'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
-  '06039_E_Ju','mp in or outside of an exception block'#000+
+  '06039_E_J','ump in or outside of an exception block'#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
-  '06043_E_Local variab','les size exceeds supported limit'#000+
+  '06043_E_Local varia','bles size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
   '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
   'me library.'#000+
-  '06047_F_Cannot find system type "$1". Check if you use the correct run',
-  ' time library.'#000+
+  '06047_F_Cannot find system type "$1". Check if you use the correct ru',
+  'n time library.'#000+
   '06048_H_Inherited call to abstract method ignored'#000+
   '06049_E_Goto label "$1" not defined or optimized away'#000+
   '06050_F_Cannot find type "$1" in unit "$2". Check if you use the corre'+
   'ct run time library.'#000+
-  '06051_E_Interprocedural gotos ','are allowed only to outer subroutines'#000+
+  '06051_E_Interprocedural gotos',' are allowed only to outer subroutines'#000+
   '06052_E_Label must be defined in the same scope as it is declared'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
   '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
-  '07004_E','_Error building record offset'#000+
+  '07004_','E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
-  '07010_E_Cannot use mul','tiple relocatable symbols'#000+
+  '07010_E_Cannot use mu','ltiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You cannot reach $1 from that code'#000+
-  '07016_E_Local s','ymbols/labels aren'#039't allowed as references'#000+
+  '07016_E_Local ','symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
-  '07021_E_Invalid operand type',#000+
+  '07021_E_Invalid operand typ','e'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
-  '07028_E','_Invalid symbol reference'#000+
+  '07028_','E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
-  '070','33_E_Unsupported symbol type for operand'#000+
+  '07','033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
-  '07039_H_$1 transl','ated to $2'#000+
+  '07039_H_$1 trans','lated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
-  '0704','5_E_Size suffix and destination or source size do not match'#000+
+  '070','45_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_Assembler syntax error in ','operand'#000+
+  '07049_E_Assembler syntax error in',' operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid comb','ination of prefix and opcode: $1'#000+
+  '07055_E_Invalid com','bination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
-  '07062_E_U','nknown label identifier $1'#000+
+  '07062_E_','Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069_E_Wrong symbol typ','e'#000+
+  '07069_E_Wrong symbol ty','pe'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
-  '07075_E_assembl','er code not returned to text section'#000+
+  '07075_E_assemb','ler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is ta','rget specific, use .balign or .p2align'#000+
+  '07080_N_.align is t','arget specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
-  '07084_E_Cannot use',' RESULT in this function'#000+
+  '07084_E_Cannot us','e RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
-  '07090_E_Char > not',' allowed here'#000+
+  '07090_E_Char > no','t allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
-  '07098_W_No size specified and unable to determine th','e size of the op'+
+  '07098_W_No size specified and unable to determine t','he size of the op'+
   'erands, using DWORD as default'#000+
   '07099_E_Syntax error while trying to parse a shifter operand'#000+
   '07100_E_Address of packed component is not at a byte boundary'#000+
-  '07101_W_No size specified and unable to determine the size of the oper',
-  'ands, using BYTE as default'#000+
+  '07101_W_No size specified and unable to determine the size of the ope',
+  'rands, using BYTE as default'#000+
   '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
   '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
   'ess'#000+
-  '07105_W_Us','e of -offset(%esp), access may cause a crash or value may '+
+  '07105_W_U','se of -offset(%esp), access may cause a crash or value may '+
   'be lost'#000+
   '07106_E_VMTOffset must be used in combination with a virtual method, a'+
   'nd "$1" is not virtual'#000+
   '07107_E_Generating PIC, but reference is not PIC-safe'#000+
-  '07108_E_All registers in a ','register set must be of the same kind and'+
+  '07108_E_All registers in a',' register set must be of the same kind and'+
   ' width'#000+
   '07109_E_A register set cannot be empty'#000+
   '07110_W_@GOTPCREL is useless and potentially dangereous for local symb'+
   'ols'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output not supporte','d'#000+
+  '08001_F_Selected assembler output not support','ed'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_Asm: $1 invalid combination o','f opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination ','of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
-  '08013_','E_Asm: Undefined label $1'#000+
+  '08013','_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
-  '08019_E_','Asm: Invalid register $1'#000+
+  '08019_E','_Asm: Invalid register $1'#000+
   '08020_E_Asm: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
-  '09003_E_Ca','n'#039't create object file: $1'#000+
+  '09003_E_C','an'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
   '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error',' $1 switching to external'+
+  '09008_E_Can'#039't call the assembler, erro','r $1 switching to external'+
   ' assembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't ca','ll the linker, switching to external linking'#000+
+  '09014_E_Can'#039't c','all the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not su','pported'#000+
+  '09019_E_Creation of Dynamic/Shared Libraries not s','upported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler "$1" not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
-  '09024_T_unit $1 can'#039't be smart linke','d, switching to static linki'+
+  '09024_T_unit $1 can'#039't be smart link','ed, switching to static linki'+
   'ng'#000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
-  '09028_D_Calling resource compiler "$1" with ','"$2" as command line'#000+
+  '09028_D_Calling resource compiler "$1" with',' "$2" as command line'#000+
   '09029_E_Error while compiling resources'#000+
   '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
   'al mode'#000+
   '09031_E_Can'#039't open resource file "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
-  '09128_F_Can'#039't post process e','xecutable $1'#000+
+  '09128_F_Can'#039't post process ','executable $1'#000+
   '09129_F_Can'#039't open executable $1'#000+
   '09130_X_Size of Code: $1 bytes'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
   '09132_X_Size of uninitialized data: $1 bytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
-  '09134_X_Stack space committed: $1 by','tes'#000+
+  '09134_X_Stack space committed: $1 b','ytes'#000+
   '09200_F_Executable image size is too big for $1 target.'#000+
   '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
   ' "$2".'#000+
@@ -864,13 +864,13 @@ const msgtxt : array[0..000240,1..240] of char=(
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
-  '10004_U_PPU Cr','c: $1'#000+
+  '10004_U_PPU C','rc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
-  '10010_U_PPU is compiled for an other target'#000+
+  '10010_U_PPU is compiled for another target'#000+
   '10011_U_PPU Sour','ce: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
diff --git a/compiler/ncal.pas b/compiler/ncal.pas
index 25e03e0b9d..a361a147af 100644
--- a/compiler/ncal.pas
+++ b/compiler/ncal.pas
@@ -2216,7 +2216,7 @@ implementation
             (tabstractvarsym(tloadnode(realassignmenttarget).symtableentry).varregable in [vr_none,vr_addr])
            ) then
           begin
-            { If the funcret is also used as a parameter we can't optimize becuase the funcret
+            { If the funcret is also used as a parameter we can't optimize because the funcret
               and the parameter will point to the same address. That means that a change of the result variable
               will result also in a change of the parameter value }
             result:=not foreachnodestatic(left,@check_funcret_used_as_para,tloadnode(realassignmenttarget).symtableentry);
@@ -2434,7 +2434,7 @@ implementation
         end;
         { now all parents are in the correct order
           insert all abstract methods in the list, and remove
-          those which are overriden by parent classes.
+          those which are overridden by parent classes.
         }
         objectinfo:=tobjectinfoitem(parents.first);
         while assigned(objectinfo) do
diff --git a/compiler/ncgbas.pas b/compiler/ncgbas.pas
index d926f25f57..a8625aa749 100644
--- a/compiler/ncgbas.pas
+++ b/compiler/ncgbas.pas
@@ -261,7 +261,7 @@ interface
                   ait_instruction :
                      begin
                        { remove cached insentry, because the new code can
-                         require an other less optimized instruction }
+                         require another less optimized instruction }
 {$ifdef i386}
 {$ifndef NOAG386BIN}
                        taicpu(hp2).ResetPass1;
@@ -306,7 +306,7 @@ interface
                   ait_instruction :
                      begin
                        { remove cached insentry, because the new code can
-                         require an other less optimized instruction }
+                         require another less optimized instruction }
 {$ifdef i386}
 {$ifndef NOAG386BIN}
                        taicpu(hp).ResetPass1;
diff --git a/compiler/ncgmat.pas b/compiler/ncgmat.pas
index 77d36abeb8..0c87c84792 100644
--- a/compiler/ncgmat.pas
+++ b/compiler/ncgmat.pas
@@ -35,7 +35,7 @@ interface
            floating point value in the floating point
            register r.
 
-           This routine should be overriden, since
+           This routine should be overridden, since
            the generic version is not optimal at all. The
            generic version assumes that floating
            point values are stored in the register
@@ -277,7 +277,7 @@ implementation
     procedure tcgmoddivnode.emit64_div_reg_reg(signed: boolean; denum,num:tregister64);
       begin
         { handled in pass_1 already, unless pass_1 is
-          overriden
+          overridden
         }
         { should be handled in pass_1 (JM) }
         internalerror(200109052);
diff --git a/compiler/ncgrtti.pas b/compiler/ncgrtti.pas
index 3b83cbf6b9..a2ef23c504 100644
--- a/compiler/ncgrtti.pas
+++ b/compiler/ncgrtti.pas
@@ -257,7 +257,7 @@ implementation
              propaccesslist:=hpropsym.propaccesslist[pap];
              if not propaccesslist.empty then
                break;
-             hpropsym:=hpropsym.overridenpropsym;
+             hpropsym:=hpropsym.overriddenpropsym;
            until not assigned(hpropsym);
            if not(assigned(propaccesslist) and assigned(propaccesslist.firstsym))  then
              begin
diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas
index 2165de290d..39bda6123a 100644
--- a/compiler/ncgutil.pas
+++ b/compiler/ncgutil.pas
@@ -2532,7 +2532,7 @@ implementation
                     LOC_REFERENCE instead for all none register variables. This is
                     required because we can't store an asmsymbol in the localloc because
                     the asmsymbol is invalid after an unit is compiled. This gives
-                    problems when this procedure is inlined in an other unit (PFV) }
+                    problems when this procedure is inlined in another unit (PFV) }
                   if vs.is_regvar(false) then
                     begin
                       vs.initialloc.loc:=tvarregable2tcgloc[vs.varregable];
diff --git a/compiler/ninl.pas b/compiler/ninl.pas
index 9216f5c02d..b2f7759d97 100644
--- a/compiler/ninl.pas
+++ b/compiler/ninl.pas
@@ -47,7 +47,7 @@ interface
 
           { All the following routines currently
             call compilerprocs, unless they are
-            overriden in which case, the code
+            overridden in which case, the code
             generator handles them.
           }
           function first_pi: tnode ; virtual;
diff --git a/compiler/nld.pas b/compiler/nld.pas
index 251ca2d55b..b317c8be5e 100644
--- a/compiler/nld.pas
+++ b/compiler/nld.pas
@@ -667,7 +667,7 @@ implementation
 
          { Optimize the reuse of the destination of the assingment in left.
            Allow the use of the left inside the tree generated on the right.
-           This is especially usefull for string routines where the destination
+           This is especially useful for string routines where the destination
            is pushed as a parameter. Using the final destination of left directly
            save a temp allocation and copy of data (PFV) }
          oldassignmentnode:=aktassignmentnode;
diff --git a/compiler/nutils.pas b/compiler/nutils.pas
index 8c06cdba74..6fa1a14200 100644
--- a/compiler/nutils.pas
+++ b/compiler/nutils.pas
@@ -1016,7 +1016,7 @@ implementation
       hpropsym : tpropertysym;
     begin
       result:=false;
-      { find property in the overriden list }
+      { find property in the overridden list }
       hpropsym:=propsym;
       repeat
         propaccesslist:=hpropsym.propaccesslist[pap];
@@ -1025,7 +1025,7 @@ implementation
             result:=true;
             exit;
           end;
-        hpropsym:=hpropsym.overridenpropsym;
+        hpropsym:=hpropsym.overriddenpropsym;
       until not assigned(hpropsym);
     end;
 
diff --git a/compiler/paramgr.pas b/compiler/paramgr.pas
index e497d160b4..9de9460142 100644
--- a/compiler/paramgr.pas
+++ b/compiler/paramgr.pas
@@ -36,7 +36,7 @@ unit paramgr;
 
     type
        {# This class defines some methods to take care of routine
-          parameters. It should be overriden for each new processor
+          parameters. It should be overridden for each new processor
        }
 
        { tparamanager }
diff --git a/compiler/pdecvar.pas b/compiler/pdecvar.pas
index b698a77e30..1a266f020c 100644
--- a/compiler/pdecvar.pas
+++ b/compiler/pdecvar.pas
@@ -299,7 +299,7 @@ implementation
          sym : tsym;
          srsymtable: tsymtable;
          p : tpropertysym;
-         overriden : tsym;
+         overridden : tsym;
          varspez : tvarspez;
          hdef : tdef;
          arraytype : tdef;
@@ -410,7 +410,7 @@ implementation
               if paranr>0 then
                 include(p.propoptions,ppo_hasparameters);
            end;
-         { overriden property ?                                 }
+         { overridden property ?                                 }
          { force property interface
              there is a property parameter
              a global property }
@@ -451,18 +451,18 @@ implementation
          else
            begin
               { do an property override }
-              overriden:=search_class_member(aclass.childof,p.name);
-              if assigned(overriden) and
-                 (overriden.typ=propertysym) and
+              overridden:=search_class_member(aclass.childof,p.name);
+              if assigned(overridden) and
+                 (overridden.typ=propertysym) and
                  not(is_dispinterface(aclass)) then
                 begin
-                  p.overridenpropsym:=tpropertysym(overriden);
+                  p.overriddenpropsym:=tpropertysym(overridden);
                   { inherit all type related entries }
-                  p.indexdef:=tpropertysym(overriden).indexdef;
-                  p.propdef:=tpropertysym(overriden).propdef;
-                  p.index:=tpropertysym(overriden).index;
-                  p.default:=tpropertysym(overriden).default;
-                  p.propoptions:=tpropertysym(overriden).propoptions;
+                  p.indexdef:=tpropertysym(overridden).indexdef;
+                  p.propdef:=tpropertysym(overridden).propdef;
+                  p.index:=tpropertysym(overridden).index;
+                  p.default:=tpropertysym(overridden).default;
+                  p.propoptions:=tpropertysym(overridden).propoptions;
                   if ppo_indexed in p.propoptions then
                     add_index_parameter(paranr,p,readprocdef,writeprocdef,storedprocdef);
                 end
@@ -581,8 +581,8 @@ implementation
 
          if assigned(aclass) and not(is_dispinterface(aclass)) and not is_classproperty then
            begin
-             { ppo_stored is default on for not overriden properties }
-             if not assigned(p.overridenpropsym) then
+             { ppo_stored is default on for not overridden properties }
+             if not assigned(p.overriddenpropsym) then
                include(p.propoptions,ppo_stored);
              if try_to_consume(_STORED) then
               begin
diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas
index 5b4e21959a..0669873610 100644
--- a/compiler/pmodules.pas
+++ b/compiler/pmodules.pas
@@ -1688,7 +1688,7 @@ implementation
       { read all entries until the end and write them also to the new ppu }
         repeat
           b:=inppu.readentry;
-        { don't write ibend, that's written automaticly }
+        { don't write ibend, that's written automatically }
           if b<>ibend then
            begin
              if b=iblinkothersharedlibs then
diff --git a/compiler/psub.pas b/compiler/psub.pas
index 38fe521728..102302fec6 100644
--- a/compiler/psub.pas
+++ b/compiler/psub.pas
@@ -1667,7 +1667,7 @@ implementation
          old_current_objectdef:=current_objectdef;
 
          { reset current_procinfo.procdef to nil to be sure that nothing is writing
-           to an other procdef }
+           to another procdef }
          current_procinfo:=nil;
          current_objectdef:=nil;
 
diff --git a/compiler/rgobj.pas b/compiler/rgobj.pas
index 19db219406..c045efa87d 100644
--- a/compiler/rgobj.pas
+++ b/compiler/rgobj.pas
@@ -124,7 +124,7 @@ unit rgobj;
       code generator to allocate and free registers which might be valid
       across nodes. It also contains utility routines related to registers.
 
-      Some of the methods in this class should be overriden
+      Some of the methods in this class should be overridden
       by cpu-specific implementations.
 
       --------------------------------------------------------------------}
@@ -164,7 +164,7 @@ unit rgobj;
         { default subregister used }
         defaultsub        : tsubregister;
         live_registers:Tsuperregisterworklist;
-        { can be overriden to add cpu specific interferences }
+        { can be overridden to add cpu specific interferences }
         procedure add_cpu_interferences(p : tai);virtual;
         procedure add_constraints(reg:Tregister);virtual;
         function  get_alias(n:Tsuperregister):Tsuperregister;
@@ -1974,7 +1974,7 @@ unit rgobj;
           exit;
 
 {$ifdef x86}
-        { Try replacing the register with the spilltemp. This is usefull only
+        { Try replacing the register with the spilltemp. This is useful only
           for the i386,x86_64 that support memory locations for several instructions }
         for counter := 0 to pred(regindex) do
           with regs[counter] do
diff --git a/compiler/symsym.pas b/compiler/symsym.pas
index 36d8950654..9fc2d08640 100644
--- a/compiler/symsym.pas
+++ b/compiler/symsym.pas
@@ -233,8 +233,8 @@ interface
 
        tpropertysym = class(Tstoredsym)
           propoptions   : tpropertyoptions;
-          overridenpropsym : tpropertysym;
-          overridenpropsymderef : tderef;
+          overriddenpropsym : tpropertysym;
+          overriddenpropsymderef : tderef;
           propdef       : tdef;
           propdefderef  : tderef;
           indexdef      : tdef;
@@ -906,7 +906,7 @@ implementation
       begin
          inherited ppuload(propertysym,ppufile);
          ppufile.getsmallset(propoptions);
-         ppufile.getderef(overridenpropsymderef);
+         ppufile.getderef(overriddenpropsymderef);
          ppufile.getderef(propdefderef);
          index:=ppufile.getlongint;
          default:=ppufile.getlongint;
@@ -930,7 +930,7 @@ implementation
       var
         pap : tpropaccesslisttypes;
       begin
-        overridenpropsymderef.build(overridenpropsym);
+        overriddenpropsymderef.build(overriddenpropsym);
         propdefderef.build(propdef);
         indexdefderef.build(indexdef);
         for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do
@@ -942,7 +942,7 @@ implementation
       var
         pap : tpropaccesslisttypes;
       begin
-        overridenpropsym:=tpropertysym(overridenpropsymderef.resolve);
+        overriddenpropsym:=tpropertysym(overriddenpropsymderef.resolve);
         indexdef:=tdef(indexdefderef.resolve);
         propdef:=tdef(propdefderef.resolve);
         for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do
@@ -962,7 +962,7 @@ implementation
       begin
         inherited ppuwrite(ppufile);
         ppufile.putsmallset(propoptions);
-        ppufile.putderef(overridenpropsymderef);
+        ppufile.putderef(overriddenpropsymderef);
         ppufile.putderef(propdefderef);
         ppufile.putlongint(index);
         ppufile.putlongint(default);
diff --git a/compiler/symtable.pas b/compiler/symtable.pas
index cdeca6a93c..b403e2aaf6 100644
--- a/compiler/symtable.pas
+++ b/compiler/symtable.pas
@@ -1281,7 +1281,7 @@ implementation
             exit;
           end;
 
-        { check also parasymtable, this needs to be done here becuase
+        { check also parasymtable, this needs to be done here because
           of the special situation with the funcret sym that needs to be
           hidden for tp and delphi modes }
         hsym:=tsym(tabstractprocdef(defowner).parast.FindWithHash(hashedid));
diff --git a/compiler/systems/t_nwl.pas b/compiler/systems/t_nwl.pas
index 9826223a13..024c5c69f0 100644
--- a/compiler/systems/t_nwl.pas
+++ b/compiler/systems/t_nwl.pas
@@ -423,7 +423,7 @@ begin
    begin
      While not SharedLibFiles.Empty do
       begin
-        {becuase of upper/lower case mix, we may get duplicate
+        {because of upper/lower case mix, we may get duplicate
          names but nlmconv ignores that.
          Here we are setting the import-files for nlmconv. I.e. for
          the module libc or libc.nlm we add IMPORT @libc.imp and also
diff --git a/compiler/systems/t_nwm.pas b/compiler/systems/t_nwm.pas
index f36d8ee643..c7e9324abb 100644
--- a/compiler/systems/t_nwm.pas
+++ b/compiler/systems/t_nwm.pas
@@ -405,7 +405,7 @@ begin
    begin
      While not SharedLibFiles.Empty do
       begin
-        {becuase of upper/lower case mix, we may get duplicate
+        {because of upper/lower case mix, we may get duplicate
          names but nlmconv ignores that.
          Here we are setting the import-files for nlmconv. I.e. for
          the module clib or clib.nlm we add IMPORT @clib.imp and also
diff --git a/compiler/utils/ppumove.pp b/compiler/utils/ppumove.pp
index 9448cf5af6..8649ba1779 100644
--- a/compiler/utils/ppumove.pp
+++ b/compiler/utils/ppumove.pp
@@ -385,7 +385,7 @@ begin
 { read all entries until the end and write them also to the new ppu }
   repeat
     b:=inppu.readentry;
-  { don't write ibend, that's written automaticly }
+  { don't write ibend, that's written automatically }
     if b<>ibend then
      begin
        if b=iblinkothersharedlibs then
diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas
index 3fde43f3c0..fa0629dc4a 100644
--- a/compiler/x86/aasmcpu.pas
+++ b/compiler/x86/aasmcpu.pas
@@ -2231,7 +2231,7 @@ implementation
               begin
                 { these are dissambler hints or 32 bit prefixes which
                   are not needed
-                  It's usefull to write rex :) (FK) }
+                  It's useful to write rex :) (FK) }
 {$ifdef x86_64}
                 maybewriterex;
 {$endif x86_64}
diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas
index c5cade30fb..2898a33414 100644
--- a/compiler/x86/rax86int.pas
+++ b/compiler/x86/rax86int.pas
@@ -1570,7 +1570,7 @@ Unit Rax86int;
                   case oper.opr.typ of
                     OPR_LOCAL :
                       begin
-                        { don't allow direct access to fields of parameters, becuase that
+                        { don't allow direct access to fields of parameters, because that
                           will generate buggy code. Allow it only for explicit typecasting
                           and when the parameter is in a register (delphi compatible) }
                         if (not oper.hastype) and
diff --git a/ide/fpswitch.pas b/ide/fpswitch.pas
index 851e125478..85bb27cee3 100644
--- a/ide/fpswitch.pas
+++ b/ide/fpswitch.pas
@@ -210,7 +210,7 @@ resourcestring
 {$else}
 const
 {$endif}
-      msg_automaticallycreateddontedit = 'Automaticly created file, don''t edit.';
+      msg_automaticallycreateddontedit = 'Automatically created file, don''t edit.';
 
       { Compiler options }
       opt_objectpascal = 'Object pascal support';
diff --git a/ide/whlpview.pas b/ide/whlpview.pas
index 5217e1beb7..967a240493 100644
--- a/ide/whlpview.pas
+++ b/ide/whlpview.pas
@@ -211,7 +211,7 @@ type
         procedure   ShowTopic(SourceFileID: word; Context: THelpCtx); virtual;
         procedure   HandleEvent(var Event: TEvent); virtual;
         procedure   Close; virtual;
-        function    GetPalette: PPalette; virtual; { needs to be overriden }
+        function    GetPalette: PPalette; virtual; { needs to be overridden }
       end;
 
 implementation
diff --git a/ide/whtmlhlp.pas b/ide/whtmlhlp.pas
index 2cc3d38df8..7df67af3ab 100644
--- a/ide/whtmlhlp.pas
+++ b/ide/whtmlhlp.pas
@@ -724,7 +724,7 @@ begin
 end;
 
 Function  THTMLTopicRenderer.CanonicalizeURL(const Base,Relative:String):string;
-// uses info from filesystem (curdir) -> overriden for CHM.
+// uses info from filesystem (curdir) -> overridden for CHM.
 begin
  CanonicalizeURL:=CompleteURL(Base,relative);
 end;
diff --git a/packages/amunits/src/coreunits/colorwheel.pas b/packages/amunits/src/coreunits/colorwheel.pas
index 646c2c36eb..31bbac9cdc 100644
--- a/packages/amunits/src/coreunits/colorwheel.pas
+++ b/packages/amunits/src/coreunits/colorwheel.pas
@@ -67,7 +67,7 @@ const
     WHEEL_Green          = (WHEEL_Dummy+6) ;  { set/get Green     }
     WHEEL_Blue           = (WHEEL_Dummy+7) ;  { set/get Blue              }
     WHEEL_RGB            = (WHEEL_Dummy+8) ;  { set/get ColorWheelRGB     }
-    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/enviroment    }
+    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/environment    }
     WHEEL_Abbrv          = (WHEEL_Dummy+10);  { "GCBMRY" if English       }
     WHEEL_Donation       = (WHEEL_Dummy+11);  { colors donated by app     }
     WHEEL_BevelBox       = (WHEEL_Dummy+12);  { inside a bevel box        }
diff --git a/packages/cocoaint/utils/iphone/pascocoa_parser.php b/packages/cocoaint/utils/iphone/pascocoa_parser.php
index cb1b9bd87d..1b201a3f65 100644
--- a/packages/cocoaint/utils/iphone/pascocoa_parser.php
+++ b/packages/cocoaint/utils/iphone/pascocoa_parser.php
@@ -1382,7 +1382,7 @@ end;";
 		
 		if ($struct["param_array"] != null) $struct["has_params"] = true;
 		
-		// determine if the method can be overriden
+		// determine if the method can be overridden
 		// (!eregi("^(set|get|is)+", $name))
 		if ($kind != "constructor") $struct["can_override"] = true;
 		
diff --git a/packages/cocoaint/utils/pascocoa_parser.php b/packages/cocoaint/utils/pascocoa_parser.php
index cb1b9bd87d..1b201a3f65 100644
--- a/packages/cocoaint/utils/pascocoa_parser.php
+++ b/packages/cocoaint/utils/pascocoa_parser.php
@@ -1382,7 +1382,7 @@ end;";
 		
 		if ($struct["param_array"] != null) $struct["has_params"] = true;
 		
-		// determine if the method can be overriden
+		// determine if the method can be overridden
 		// (!eregi("^(set|get|is)+", $name))
 		if ($kind != "constructor") $struct["can_override"] = true;
 		
diff --git a/packages/fcl-base/examples/testez.pp b/packages/fcl-base/examples/testez.pp
index 4c901ba659..48070f4cbf 100644
--- a/packages/fcl-base/examples/testez.pp
+++ b/packages/fcl-base/examples/testez.pp
@@ -73,7 +73,7 @@ end;
 // To determine how many environment variables have been stored you can
 // use the VariableCount property.
 //
-// The following procedure loops through all of the enviroment variables
+// The following procedure loops through all of the environment variables
 // and prints them back to the client. This is a good CGI example to
 // show you exactly what information you have to work with.
 
diff --git a/packages/fcl-db/src/sqldb/interbase/ibconnection.pp b/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
index f2fb35a694..b4320bcecb 100644
--- a/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
+++ b/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
@@ -870,7 +870,7 @@ begin
 {$R-}
     x := FieldBinding[FieldDef.FieldNo-1];
 
-    // Joost, 5 jan 2006: I disabled the following, since it's usefull for
+    // Joost, 5 jan 2006: I disabled the following, since it's useful for
     // debugging, but it also slows things down. In principle things can only go
     // wrong when FieldDefs is changed while the dataset is opened. A user just
     // shoudn't do that. ;) (The same is done in PQConnection)
diff --git a/packages/fcl-db/src/sqldb/odbc/odbcconn.pas b/packages/fcl-db/src/sqldb/odbc/odbcconn.pas
index 42c36fecfe..657e474e29 100644
--- a/packages/fcl-db/src/sqldb/odbc/odbcconn.pas
+++ b/packages/fcl-db/src/sqldb/odbc/odbcconn.pas
@@ -1227,8 +1227,8 @@ begin
     ODBCCheckResult(
       SQLStatistics(
         StmtHandle,
-        nil, 0, // catalog unkown; request for all catalogs
-        nil, 0, // schema unkown; request for all schemas
+        nil, 0, // catalog unknown; request for all catalogs
+        nil, 0, // schema unknown; request for all schemas
         PChar(TableName), Length(TableName), // request information for TableName
         SQL_INDEX_ALL,
         SQL_QUICK
diff --git a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
index 66729cd077..07802f674e 100644
--- a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
+++ b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
@@ -697,7 +697,7 @@ begin
     begin
     x := FieldBinding[FieldDef.FieldNo-1];
 
-    // Joost, 5 jan 2006: I disabled the following, since it's usefull for
+    // Joost, 5 jan 2006: I disabled the following, since it's useful for
     // debugging, but it also slows things down. In principle things can only go
     // wrong when FieldDefs is changed while the dataset is opened. A user just
     // shoudn't do that. ;) (The same is done in IBConnection)
diff --git a/packages/fcl-image/src/bmpcomn.pp b/packages/fcl-image/src/bmpcomn.pp
index ced42b8bcf..e1866fa650 100644
--- a/packages/fcl-image/src/bmpcomn.pp
+++ b/packages/fcl-image/src/bmpcomn.pp
@@ -65,7 +65,7 @@ type
       YPelsPerMeter:Longint;
 {46+04 : Number of colors used}
       ClrUsed:longint;
-{50+04 : Number of imprtant colors used : usefull for displaying on VGA256}
+{50+04 : Number of imprtant colors used : useful for displaying on VGA256}
       ClrImportant:longint;
    end;
    PBitMapInfoHeader = ^TBitMapInfoHeader;
diff --git a/packages/fcl-web/src/base/ezcgi.pp b/packages/fcl-web/src/base/ezcgi.pp
index 08c2f21fb6..27a97fca4e 100644
--- a/packages/fcl-web/src/base/ezcgi.pp
+++ b/packages/fcl-web/src/base/ezcgi.pp
@@ -104,12 +104,12 @@ end;
 
 procedure TEZcgi.DoPost;
 begin
-  // Must be overriden by child class
+  // Must be overridden by child class
 end;
 
 procedure TEZcgi.DoGet;
 begin
-  // Must be overriden by child class
+  // Must be overridden by child class
 end;
 
 procedure TEZcgi.WriteContent(ctype : String);
diff --git a/packages/fcl-xml/src/htmlwriter.pp b/packages/fcl-xml/src/htmlwriter.pp
index 95de568c56..2b19e83acf 100644
--- a/packages/fcl-xml/src/htmlwriter.pp
+++ b/packages/fcl-xml/src/htmlwriter.pp
@@ -62,7 +62,7 @@ type
     function FormButton (aname, caption, aOnClick: DOMstring) : THTML_Input;
     function FormHidden (aname, aValue: DOMstring) : THTML_Input;
     function FormFile (aname, aValue:DOMstring) : THTML_Input;
-    { Other usefull links to elements }
+    { Other useful links to elements }
     function Meta (aname, ahtpequiv,acontent: DOMString) : THTML_meta;
     function Link (arel, ahref, athetype, amedia: DOMString) : THTML_link;
     function Script (s, athetype, asrc: DOMString) : THTML_script;
diff --git a/packages/gtk2/src/glib/gutils.inc b/packages/gtk2/src/glib/gutils.inc
index 67e29324e0..fcd05a69fb 100644
--- a/packages/gtk2/src/glib/gutils.inc
+++ b/packages/gtk2/src/glib/gutils.inc
@@ -105,7 +105,7 @@
        must not be freed.  }
     function g_getenv(variable:Pgchar):Pgchar;cdecl;external gliblib name 'g_getenv';
 
-    { we try to provide a usefull equivalent for ATEXIT if it is
+    { we try to provide a useful equivalent for ATEXIT if it is
        not defined, but use is actually abandoned. people should
        use g_atexit() instead.
       }
diff --git a/packages/gtk2/src/gtk+/gtk/gtkrc.inc b/packages/gtk2/src/gtk+/gtk/gtkrc.inc
index f5b08f0a5d..ad585c2e6b 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkrc.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkrc.inc
@@ -41,7 +41,7 @@
      of brackets. Returns G_TOKEN_NONE if succesful, otherwise returns
      the token it expected but didn't get.
     }
-{ Combine RC style data from src into dest. If overriden, this
+{ Combine RC style data from src into dest. If overridden, this
      function should chain to the parent.
     }
 { Create an empty style suitable to this RC style
diff --git a/packages/httpd13/src/http_main.inc b/packages/httpd13/src/http_main.inc
index 10547159a7..c0a9b5406d 100644
--- a/packages/httpd13/src/http_main.inc
+++ b/packages/httpd13/src/http_main.inc
@@ -114,7 +114,7 @@ char *ap_init_mutex_method(char *t);}
 
 {$ifndef NO_OTHER_CHILD}
 {
- * register an other_child -- a child which the main loop keeps track of
+ * register another_child -- a child which the main loop keeps track of
  * and knows it is different than the rest of the scoreboard.
  *
  * pid is the pid of the child.
@@ -149,7 +149,7 @@ const
 					 * us knowing ... buggy os? }
 
 {
- * unregister an other_child.  Note that the data pointer is used here, and
+ * unregister another_child.  Note that the data pointer is used here, and
  * is assumed to be unique' per other_child.  This is because the pid and
  * write_fd are possibly killed off separately.
  }
diff --git a/packages/httpd20/src/apr/apr_pools.inc b/packages/httpd20/src/apr/apr_pools.inc
index 6ffc3c10c0..ef0e804b07 100644
--- a/packages/httpd20/src/apr/apr_pools.inc
+++ b/packages/httpd20/src/apr/apr_pools.inc
@@ -88,7 +88,7 @@ type
  * <pre>
  * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
  * ---------------------------------
- * |   |   |   |   |   |   |   | x |  General debug code enabled (usefull in
+ * |   |   |   |   |   |   |   | x |  General debug code enabled (useful in
  *                                    combination with --with-efence).
  *
  * |   |   |   |   |   |   | x |   |  Verbose output on stderr (report
diff --git a/packages/httpd20/src/apr/apr_portable.inc b/packages/httpd20/src/apr/apr_portable.inc
index 415e969c89..78c1b65f33 100644
--- a/packages/httpd20/src/apr/apr_portable.inc
+++ b/packages/httpd20/src/apr/apr_portable.inc
@@ -144,7 +144,7 @@ type
   apr_os_file_t: Integer;        {< native file }
 typedef DIR                   apr_os_dir_t;         {< native dir }
   apr_os_sock_t: Integer;        {< native dir }
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native proces
+typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native process
                                                           *   mutex
                                                           }
 {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)}
diff --git a/packages/httpd20/src/apr/apr_thread_proc.inc b/packages/httpd20/src/apr/apr_thread_proc.inc
index 51d0d48a90..fadc5cd669 100644
--- a/packages/httpd20/src/apr/apr_thread_proc.inc
+++ b/packages/httpd20/src/apr/apr_thread_proc.inc
@@ -679,7 +679,7 @@ const
 // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4;
 
 {
- * Register an other_child -- a child associated to its registered 
+ * Register another_child -- a child associated to its registered 
  * maintence callback.  This callback is invoked when the process
  * dies, is disconnected or disappears.
  * @param proc The child process to register.
diff --git a/packages/httpd22/src/apr/apr_portable.inc b/packages/httpd22/src/apr/apr_portable.inc
index b8bc09c9ca..c6ee1661b0 100644
--- a/packages/httpd22/src/apr/apr_portable.inc
+++ b/packages/httpd22/src/apr/apr_portable.inc
@@ -144,7 +144,7 @@ type
   apr_os_file_t: Integer;        {< native file }
 typedef DIR                   apr_os_dir_t;         {< native dir }
   apr_os_sock_t: Integer;        {< native dir }
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native proces
+typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native process
                                                           *   mutex
                                                           }
 {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)}
diff --git a/packages/httpd22/src/apr/apr_thread_proc.inc b/packages/httpd22/src/apr/apr_thread_proc.inc
index eb5ae019d0..99e0b777dc 100644
--- a/packages/httpd22/src/apr/apr_thread_proc.inc
+++ b/packages/httpd22/src/apr/apr_thread_proc.inc
@@ -716,7 +716,7 @@ const
 // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4;
 
 {
- * Register an other_child -- a child associated to its registered 
+ * Register another_child -- a child associated to its registered 
  * maintence callback.  This callback is invoked when the process
  * dies, is disconnected or disappears.
  * @param proc The child process to register.
diff --git a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp
index 11b1e3b454..03b46c2ef0 100644
--- a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp
+++ b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp
@@ -88,7 +88,7 @@ begin
   //load our ball pcx file into an image
   loadPCX(pcuint8(ball_pcx), @ball);
 
-  //tile it so it is usefull as sprite data
+  //tile it so it is useful as sprite data
   imageTileData(@ball);
 
   // Sprite initialisation
diff --git a/packages/libxml/src/schemasInternals.inc b/packages/libxml/src/schemasInternals.inc
index 995eb569c2..48f994aa2b 100644
--- a/packages/libxml/src/schemasInternals.inc
+++ b/packages/libxml/src/schemasInternals.inc
@@ -556,7 +556,7 @@
 (**
  * XML_SCHEMAS_TYPE_REDEFINING:
  *
- * The type redefines an other type.
+ * The type redefines another type.
  *)
 (*   XML_SCHEMAS_TYPE_REDEFINING    = (1 shl 31); *)
 {$ENDIF}
@@ -872,7 +872,7 @@
 (**
  * XML_SCHEMAS_INCLUDING_CONVERT_NS:
  *
- * the schema is currently including an other schema with
+ * the schema is currently including another schema with
  * no target namespace.
  *)
   XML_SCHEMAS_INCLUDING_CONVERT_NS            = (1 shl 9);
diff --git a/packages/numlib/tests/intge1te.pas b/packages/numlib/tests/intge1te.pas
index 2e87054d5b..910814819f 100644
--- a/packages/numlib/tests/intge1te.pas
+++ b/packages/numlib/tests/intge1te.pas
@@ -368,7 +368,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
       4:
@@ -378,7 +378,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
@@ -866,7 +866,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
       4:
@@ -876,7 +876,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
diff --git a/packages/numlib/tests/intge2te.pas b/packages/numlib/tests/intge2te.pas
index df8d41f07e..d9135ba242 100644
--- a/packages/numlib/tests/intge2te.pas
+++ b/packages/numlib/tests/intge2te.pas
@@ -258,7 +258,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
       4:
@@ -268,7 +268,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
@@ -684,7 +684,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
       4:
@@ -694,7 +694,7 @@ var
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
diff --git a/packages/os2units/readme.txt b/packages/os2units/readme.txt
index 05f057c290..91fc91bfb0 100644
--- a/packages/os2units/readme.txt
+++ b/packages/os2units/readme.txt
@@ -81,7 +81,7 @@ b) Add support for IBM Multimedia Classes and CWMM Classes for WPS (as fast as
    SOM and WPS toolkits will be presented)
 c) SEAL library interface (seal.pas) www.netlabs.org/hobbes.nmsu.edu
    SEAL is module player library. At the present time SEAL not developing
-   anymore (for all platforms), but still very usefull for mudule music fans.
+   anymore (for all platforms), but still very useful for mudule music fans.
 d) DualMode Library (dual.pas) www.netlabs.org
    DualMode library allows to use common access method as for fullscreen (MGL)
    as for windowed (DIVE) video modes.
diff --git a/packages/os2units/src/lvm.pas b/packages/os2units/src/lvm.pas
index 7f284494f3..607c931a92 100644
--- a/packages/os2units/src/lvm.pas
+++ b/packages/os2units/src/lvm.pas
@@ -4982,7 +4982,7 @@ CARDINAL32 * Error);
 //*          exception to this is if ProcessItem sets *Error to       */
 //*          DLIST_SEARCH_COMPLETE, in which case ForEachItem         */
 //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
-//*          usefull for using ForEachItem to search a list and then  */
+//*          useful for using ForEachItem to search a list and then  */
 //*          terminating the search once the desired item is found.   */
 //*                                                                   */
 //*          A word about the Parameters parameter.  This parameter   */
@@ -5083,7 +5083,7 @@ CARDINAL32 * Error);
 //*          exception to this is if KillItem sets *Error to          */
 //*          DLIST_SEARCH_COMPLETE, in which case KillItem            */
 //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
-//*          usefull for using KillItem to search a list and then     */
+//*          useful for using KillItem to search a list and then     */
 //*          terminating the search once the desired item is found.   */
 //*                                                                   */
 //*          A word about the Parameters parameter.  This parameter   */
diff --git a/packages/univint/src/AppleEvents.pas b/packages/univint/src/AppleEvents.pas
index 702bb7c88e..5d2fcf40c8 100644
--- a/packages/univint/src/AppleEvents.pas
+++ b/packages/univint/src/AppleEvents.pas
@@ -552,7 +552,7 @@ procedure AEDisposeRemoteProcessResolver( ref: AERemoteProcessResolverRef ); ext
  *  
  *  Discussion:
  *    Returns a CFArrayRef containing CFDictionary objects containing
- *    information about processses running on a remote machine.  If the
+ *    information about processes running on a remote machine.  If the
  *    result array is NULL, the query failed and the error out
  *    parameter will contain information about the failure.  If the
  *    resolver had not been previously scheduled for execution, this
diff --git a/packages/univint/src/AudioHardware.pas b/packages/univint/src/AudioHardware.pas
index ebaa547a5a..071ae8a5e1 100644
--- a/packages/univint/src/AudioHardware.pas
+++ b/packages/univint/src/AudioHardware.pas
@@ -1054,7 +1054,7 @@ const
     @constant       kAudioHardwarePropertyPlugInForBundleID
                         Using an AudioValueTranslation structure, this property translates the input
                         CFString containing a bundle ID into the AudioObjectID of the AudioPlugIn
-                        that corresponds to it. This property will return kAudioObjectUnkown if the
+                        that corresponds to it. This property will return kAudioObjectUnknown if the
                         given bundle ID doesn't match any AudioPlugIns.
     @constant       kAudioHardwarePropertyUserSessionIsActiveOrHeadless
                         A UInt32 where a value other than 0 indicates that the login session of the
diff --git a/packages/univint/src/Authorization.pas b/packages/univint/src/Authorization.pas
index 7eed34e25b..5f1dbf3b45 100644
--- a/packages/univint/src/Authorization.pas
+++ b/packages/univint/src/Authorization.pas
@@ -395,7 +395,7 @@ type AuthorizationEnvironmentPtr = ^AuthorizationEnvironment;
 		The reason for passing in this flag is to provide correct audit trail information and to avoid unnecessary user interaction.
 
     @param rights (input/optional) An AuthorizationItemSet containing rights for which authorization is being requested.  If none are specified the resulting AuthorizationRef will authorize nothing at all.
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorization (output optional) A pointer to an AuthorizationRef to be returned.  When the returned AuthorizationRef is no longer needed AuthorizationFree should be called to prevent anyone from using the aquired rights.  If NULL is specified no new rights are returned, but the system will attempt to authorize all the requested rights and return the appropriate status.
 
@@ -450,7 +450,7 @@ function AuthorizationFree( authorization: AuthorizationRef; flags: Authorizatio
 
     @param authorization (input) The authorization object on which this operation is performed.
     @param rights (input) A rights set (see AuthorizationCreate).
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorizedRights (output/optional) A pointer to a newly allocated AuthorizationInfoSet in which the authorized subset of rights are returned (authorizedRights should be deallocated by calling AuthorizationFreeItemSet() when it is no longer needed).  If NULL the only information returned is the status.  Note that if the kAuthorizationFlagPreAuthorize flag was specified rights that could not be preauthorized are returned in authorizedRights, but their flags contains the kAuthorizationFlagCanNotPreAuthorize bit.
 
diff --git a/packages/univint/src/CFURL.pas b/packages/univint/src/CFURL.pas
index ab1cf1d647..ff2d7e9656 100644
--- a/packages/univint/src/CFURL.pas
+++ b/packages/univint/src/CFURL.pas
@@ -510,7 +510,7 @@ function CFURLCreateStringByReplacingPercentEscapesUsingEncoding( allocator: CFA
 { are not legal URL characters (based on RFC 2396), plus any characters }
 { in legalURLCharactersToBeEscaped, less any characters in }
 { charactersToLeaveUnescaped.  To simply correct any non-URL characters }
-{ in an otherwise correct URL string, do: }
+{ in anotherwise correct URL string, do: }
 
 { newString = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, origString, NULL, NULL, kCFStringEncodingUTF8); }
 function CFURLCreateStringByAddingPercentEscapes( allocator: CFAllocatorRef; originalString: CFStringRef; charactersToLeaveUnescaped: CFStringRef; legalURLCharactersToBeEscaped: CFStringRef; encoding: CFStringEncoding ): CFStringRef; external name '_CFURLCreateStringByAddingPercentEscapes';
diff --git a/packages/univint/src/CGImageDestination.pas b/packages/univint/src/CGImageDestination.pas
index 872e9788d1..c36e4e62d2 100644
--- a/packages/univint/src/CGImageDestination.pas
+++ b/packages/univint/src/CGImageDestination.pas
@@ -262,7 +262,7 @@ procedure CGImageDestinationAddImage( idst: CGImageDestinationRef; image: CGImag
 
 { Set the next image in the image destination `idst' to be the image at
  * `index' in the image source `isrc'.  The index is zero-based. The
- * properties of the source image can be added to or overriden by supplying
+ * properties of the source image can be added to or overridden by supplying
  * additional keys/values in `properties'.  If a key in `properties' has
  * the value kCFNull, the corresponding property in the destination will be
  * removed. }
diff --git a/packages/univint/src/ColorSyncDeprecated.pas b/packages/univint/src/ColorSyncDeprecated.pas
index 7cc6d5d493..9f7237208e 100644
--- a/packages/univint/src/ColorSyncDeprecated.pas
+++ b/packages/univint/src/ColorSyncDeprecated.pas
@@ -3181,7 +3181,7 @@ function CMSetDeviceFactoryProfiles( deviceClass: CMDeviceClass; deviceID: CMDev
     @abstract    Returns all the device's factory profiles
     @discussion  This API allows the caller to retrieve the original profiles for a device.
                     These may differ from the profiles currently in use for that device in the
-                    case where factory profiles have been overriden with custom profiles.
+                    case where factory profiles have been overridden with custom profiles.
     @param       deviceClass    (in) Device class to query
     @param       deviceID       (in) Device id to query (can be cmDefaultDeviceID)
     @param       defaultProfID  (out) Returns id of default mode (optional)
diff --git a/packages/univint/src/ImageCompression.pas b/packages/univint/src/ImageCompression.pas
index 9f3a2badca..79c4f1a6ed 100644
--- a/packages/univint/src/ImageCompression.pas
+++ b/packages/univint/src/ImageCompression.pas
@@ -6380,7 +6380,7 @@ const
  *    performed (kQTPropertyClass_Visual /
  *    kQTVisualPropertyID_ApertureMode). When a movie is in clean,
  *    production or encoded pixels aperture mode, each track's
- *    dimensions are overriden by special dimensions for that mode. The
+ *    dimensions are overridden by special dimensions for that mode. The
  *    original track dimensions are preserved and can be restored by
  *    setting the movie into classic aperture mode. Aperture modes are
  *    not saved in movies. 
diff --git a/packages/univint/src/Movies.pas b/packages/univint/src/Movies.pas
index ca964d3ce6..ce7e8b1b96 100644
--- a/packages/univint/src/Movies.pas
+++ b/packages/univint/src/Movies.pas
@@ -8785,7 +8785,7 @@ const
 type
 	QTParamComponentPropertyRecord = record
 		component: ComponentInstance;              { component to call for get/set properties}
-		defaultClass: OSType;           { default property class if not overriden by a given parameter}
+		defaultClass: OSType;           { default property class if not overridden by a given parameter}
 	end;
 type
 	QTParamSampleTimeRecordPtr = ^QTParamSampleTimeRecord;
@@ -10568,7 +10568,7 @@ const
    * performed. The values for this property have the prefix
    * kQTApertureMode_ and are in ImageCompression.h. 
    * When a movie is in clean, production or encoded pixels aperture
-   * mode, each track's dimensions are overriden by special dimensions
+   * mode, each track's dimensions are overridden by special dimensions
    * for that mode. The original track dimensions are preserved and can
    * be restored by setting the movie into classic aperture mode.
    }
diff --git a/packages/utmp/src/utmp.pp b/packages/utmp/src/utmp.pp
index d6f8af1c55..f4f9c35caf 100644
--- a/packages/utmp/src/utmp.pp
+++ b/packages/utmp/src/utmp.pp
@@ -18,7 +18,7 @@ type
   tDevice_name = String[Device_name_length];
   tUser_name = String[User_name_length];
   tHost_name = String[Host_name_length];
-  tLogin_type = (Unkown, Run_level, Boot_time, New_time, Old_time,
+  tLogin_type = (Unknown, Run_level, Boot_time, New_time, Old_time,
     Init_process, Login_process, User_process, Dead_process);
   tLogin_types = set of tLogin_type;
   tParameter_type = (Include, Exclude);
@@ -38,9 +38,9 @@ type
 Const
   DefaultLoginType : TLogin_Types = [User_Process];
   Login_type_names : array [TLogin_type] of string[20] =
-  ('Unkown', 'Run level', 'Boot time','New time', 'Old time',
+  ('Unknown', 'Run level', 'Boot time','New time', 'Old time',
     'Init process', 'Login process', 'User process', 'Dead process');
- All_Login_types : TLogin_types = [Unkown, Run_level, Boot_time, New_time, Old_time,
+ All_Login_types : TLogin_types = [Unknown, Run_level, Boot_time, New_time, Old_time,
     Init_process, Login_process, User_process, Dead_process];
 
 procedure Read_logged_users;
diff --git a/packages/winunits-jedi/src/ModuleLoader.pas b/packages/winunits-jedi/src/ModuleLoader.pas
index d5033fc328..f94b1b6306 100644
--- a/packages/winunits-jedi/src/ModuleLoader.pas
+++ b/packages/winunits-jedi/src/ModuleLoader.pas
@@ -90,7 +90,7 @@ function WriteModuleData(Module: TModuleHandle; SymbolName: string; var Buffer;
 // Simple DLL loading class. The idea is to use it to dynamically load
 // a DLL at run-time using the GetProcedure method. Another (better) use is to derive a
 // new class for each DLL you are interested in and explicitly call GetProcedure for
-// each function in an overriden Load method. You would then add procedure/function
+// each function in an overridden Load method. You would then add procedure/function
 // aliases to the new class that maps down to the internally managed function pointers.
 // This class is built from an idea I read about in Delphi Magazine a while ago but
 // I forget who was the originator. If you know, let me know and I'll put it in the credits
@@ -384,7 +384,7 @@ end;
 
 procedure TModuleLoader.Error(ErrorCode: Cardinal);
 begin
-  // overriden classes should handle this
+  // overridden classes should handle this
 end;
 
 function TModuleLoader.GetExportedSymbol(const AName: string; var Buffer;
diff --git a/packages/winunits-jedi/src/jwabluetoothapis.pas b/packages/winunits-jedi/src/jwabluetoothapis.pas
index 0067cc9b93..eb3bf28ced 100644
--- a/packages/winunits-jedi/src/jwabluetoothapis.pas
+++ b/packages/winunits-jedi/src/jwabluetoothapis.pas
@@ -584,7 +584,7 @@ function BluetoothRemoveDevice(var pAddress: BLUETOOTH_ADDRESS): DWORD; stdcall;
 //              if ( pbtdi->fAuthenticated || pbtdi->fRemembered )
 //              {
 //                  //
-//                  //  TODO:   Do something usefull with the device info
+//                  //  TODO:   Do something useful with the device info
 //                  //
 //              }
 //
diff --git a/packages/winunits-jedi/src/jwantquery.pas b/packages/winunits-jedi/src/jwantquery.pas
index a59d5430d9..1fac7912e5 100644
--- a/packages/winunits-jedi/src/jwantquery.pas
+++ b/packages/winunits-jedi/src/jwantquery.pas
@@ -66,7 +66,7 @@ uses
 type
   // TODO STUBS  see CmdTree.h (cmdtree.idl)
   IFilter = Pointer;
-  IUnkown = Pointer;
+  IUnknown = Pointer;
   ICommand = Pointer;
   {$IFNDEF JWA_INCLUDEMODE}
   PPWCHAR = ^PWCHAR;
@@ -115,7 +115,7 @@ function LoadIFilterEx(pwcsPath: PWCHAR; dwFlags: DWORD; const riid: REFIID; out
 function BindIFilterFromStorage(pStg: IStorage; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall;
 {$EXTERNALSYM BindIFilterFromStorage}
 
-function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnkown; out ppIUnk: IFilter): HRESULT; stdcall;
+function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall;
 {$EXTERNALSYM BindIFilterFromStream}
 
 function LocateCatalogsW(pwszScope: PWCHAR; iBmk: ULONG; pwszMachine: PWCHAR;
diff --git a/packages/xforms/examples/borderwidth.pp b/packages/xforms/examples/borderwidth.pp
index 6388e31f1e..31eda03b8b 100644
--- a/packages/xforms/examples/borderwidth.pp
+++ b/packages/xforms/examples/borderwidth.pp
@@ -81,7 +81,7 @@ begin
 end;
 
 begin
-   { application default. Can be overriden by the command line options }
+   { application default. Can be overridden by the command line options }
    fl_set_border_width(-2);
 
    fl_initialize(@argc, argv, 'FormDemo', nil, 0);
diff --git a/packages/xforms/examples/yesno.pp b/packages/xforms/examples/yesno.pp
index 52ae3e93bf..ed1a2e49b2 100644
--- a/packages/xforms/examples/yesno.pp
+++ b/packages/xforms/examples/yesno.pp
@@ -1,7 +1,7 @@
 Program yesno;
 {
   A box with two buttons and a string. Simple boxes like this
-   are very usefull for asking questions
+   are very useful for asking questions
 }
 
 Uses xforms;
diff --git a/rtl/emx/sysutils.pp b/rtl/emx/sysutils.pp
index 7ab0550974..62c6f989ad 100644
--- a/rtl/emx/sysutils.pp
+++ b/rtl/emx/sysutils.pp
@@ -227,7 +227,7 @@ type
   PgmInputs:PChar;            {Command parameters (nil allowed).}
   TermQ:PChar;                {System queue. (nil allowed).}
   Environment:PChar;          {Environment to pass (nil allowed).}
-  InheritOpt:word;            {Inherit enviroment from shell/
+  InheritOpt:word;            {Inherit environment from shell/
                                inherit environment from parent (0/1).}
   SessionType:word;           {Auto/full screen/window/presentation
                                manager/full screen Dos/windowed Dos
diff --git a/rtl/inc/dynarr.inc b/rtl/inc/dynarr.inc
index 9f5234a982..33fca66d96 100644
--- a/rtl/inc/dynarr.inc
+++ b/rtl/inc/dynarr.inc
@@ -213,7 +213,7 @@ procedure fpc_dynarray_setlength(var p : pointer;pti : pointer;
                  int_addref(pointer(newp)+sizeof(tdynarray)+elesize*i,eletype);
 
                { a declock(ref. count) isn't enough here }
-               { it could be that the in MT enviroments  }
+               { it could be that the in MT environments  }
                { in the mean time the refcount was       }
                { decremented                             }
 
diff --git a/rtl/inc/fexpand.inc b/rtl/inc/fexpand.inc
index 3aaf4017ee..8c8eda04fe 100644
--- a/rtl/inc/fexpand.inc
+++ b/rtl/inc/fexpand.inc
@@ -556,7 +556,7 @@ end;
    parent directory and so on (Amiga). Please, note that you can decide
    to support both '..' and DirectorySeparator as references to the parent
    directory at the same time for compatibility reasons - however this
-   support makes it impossible to use an otherwise possibly valid name
+   support makes it impossible to use anotherwise possibly valid name
    of '..'.
 
    FPC_FEXPAND_DIRSEP_IS_CURDIR - DirectorySeparator at the beginning of
diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index 2dd46542c8..3b97d83acc 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -1143,7 +1143,7 @@ end;
 Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
diff --git a/rtl/inc/text.inc b/rtl/inc/text.inc
index a78f01f692..ad7c8a8a1a 100644
--- a/rtl/inc/text.inc
+++ b/rtl/inc/text.inc
@@ -334,7 +334,7 @@ Begin
   { restore file position if not working with a device }
   if not isdevice then
     { if we didn't modify the buffer, simply restore the BufPos and BufEnd  }
-    { (the latter becuase it's now probably set to zero because nothing was }
+    { (the latter because it's now probably set to zero because nothing was }
     {  was read anymore)                                                    }
     if (reads = 0) then
       begin
diff --git a/rtl/linux/oldlinux.pp b/rtl/linux/oldlinux.pp
index c2d170add4..97d17bfebd 100644
--- a/rtl/linux/oldlinux.pp
+++ b/rtl/linux/oldlinux.pp
@@ -5176,7 +5176,7 @@ end;
 Function StringToPPChar(Var S:String):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
   Note that the string S is destroyed by this call.
 }
 
@@ -5188,7 +5188,7 @@ end;
 Function StringToPPChar(Var S:AnsiString):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
diff --git a/rtl/netware/README.txt b/rtl/netware/README.txt
index 00ac6be350..171598c2c0 100644
--- a/rtl/netware/README.txt
+++ b/rtl/netware/README.txt
@@ -77,7 +77,7 @@
 #ENDIF
 
     This adds the search path for the rtl-units as well as for the needed import-files.
-    You can use the import files from the rtl/netware directory, they are automaticly
+    You can use the import files from the rtl/netware directory, they are automatically
     installed. If you want to use import files from novell, be aware that you have to
     convert the files to unix format (i.e. with dos2unix).
 
@@ -138,7 +138,7 @@
       searching import files via the specified library path (-Fl). If you plan to use
       import files from novell be aware that they have to be converted from CR/LF to
       LF only. The script 'convertimp' in rtl/netware/nwimp will do that.
-      If a module name is specified in an import, the module is automaticly
+      If a module name is specified in an import, the module is automatically
       declared as autoload by FreePascal.
 
       I.e. the following declaration needs nlmlib.imp and sets nlmlib.nlm as autoload:
diff --git a/rtl/netware/demos/check.pp b/rtl/netware/demos/check.pp
index 836a591789..46d05ed4ab 100644
--- a/rtl/netware/demos/check.pp
+++ b/rtl/netware/demos/check.pp
@@ -18,7 +18,7 @@
 {$Copyright (c) 2002 the FreePascal development team}
 
 
-{ using crt automaticly calls _SetAutoScreenDestructionMode (TRUE);
+{ using crt automatically calls _SetAutoScreenDestructionMode (TRUE);
   so no "Press any key to close screeen" will be shown by netware }
 uses crt;
 
diff --git a/rtl/objpas/freebidi.pp b/rtl/objpas/freebidi.pp
index 8eac40bd1a..df36376d5f 100644
--- a/rtl/objpas/freebidi.pp
+++ b/rtl/objpas/freebidi.pp
@@ -37,9 +37,9 @@ function VPos(const Src:TString; lp:Integer; pDir, cDir:TDirection):Cardinal;
 function VPos(UTF8Char:PChar; Len:integer; BytePos:integer):Cardinal;
 {Returns character at a given visual position according to paragraph direction}
 function VCharOf(Src:TString; vp:Integer; dir:TDirection):TCharacter;
-{Inserts a string into an other paying attention of RTL/LTR direction}
+{Inserts a string into another paying attention of RTL/LTR direction}
 procedure VInsert(const Src:TString; var Dest:TString; vp:Integer; pDir:TDirection);
-{Deletes a string into an other paying attention of RTL/LTR direction}
+{Deletes a string into another paying attention of RTL/LTR direction}
 procedure VDelete(var str:TString; vp, len:Integer; pDir:TDirection);
 {Resturns a sub string of source string}
 //function VCopy(const Src:TString; vStart, vWidth:Integer):TString;
diff --git a/rtl/objpas/utf8bidi.pp b/rtl/objpas/utf8bidi.pp
index dab62fc0e5..a7ade14ede 100644
--- a/rtl/objpas/utf8bidi.pp
+++ b/rtl/objpas/utf8bidi.pp
@@ -47,9 +47,9 @@ function VLength(const Src:TUTF8String; pDir:TDirection):Cardinal;
 function VPos(const UTF8Str:TUTF8String; lp:Integer; pDir, cDir:TDirection):Cardinal;
 {Returns character at a given visual position according to paragraph direction}
 function VCharOf(UTF8Str:TUTF8String; vp:Integer; dir:TDirection):TUTF8Char;
-{Inserts a string into an other paying attention of RTL/LTR direction}
+{Inserts a string into another paying attention of RTL/LTR direction}
 procedure VInsert(const Src:TUTF8String; var Dest:TUTF8String; vp:Integer; pDir:TDirection);
-{Deletes a string into an other paying attention of RTL/LTR direction}
+{Deletes a string into another paying attention of RTL/LTR direction}
 procedure VDelete(var str:TUTF8String; vp, len:Integer; pDir:TDirection);
 {****************************Helper routines***********************************}
 {Returns direction of a character}
diff --git a/rtl/os2/doscalls.pas b/rtl/os2/doscalls.pas
index 0c75ba9870..d58f047dc1 100644
--- a/rtl/os2/doscalls.pas
+++ b/rtl/os2/doscalls.pas
@@ -2860,7 +2860,7 @@ type    TStatusData=record
             PgmInputs:PChar;            {Command parameters (nil allowed).}
             TermQ:PChar;                {System queue. (nil allowed).}
             Environment:PChar;          {Environment to pass (nil allowed).}
-            InheritOpt:word;            {Inherit enviroment from shell/
+            InheritOpt:word;            {Inherit environment from shell/
                                          inherit environment from parent
                                          (0/1).}
             SessionType:word;           {Auto/full screen/window/presentation
diff --git a/rtl/os2/sysutils.pp b/rtl/os2/sysutils.pp
index d326360c32..b5e6248ed7 100644
--- a/rtl/os2/sysutils.pp
+++ b/rtl/os2/sysutils.pp
@@ -264,7 +264,7 @@ type
   PgmInputs:PChar;            {Command parameters (nil allowed).}
   TermQ:PChar;                {System queue. (nil allowed).}
   Environment:PChar;          {Environment to pass (nil allowed).}
-  InheritOpt:word;            {Inherit enviroment from shell/
+  InheritOpt:word;            {Inherit environment from shell/
                                inherit environment from parent (0/1).}
   SessionType:word;           {Auto/full screen/window/presentation
                                manager/full screen Dos/windowed Dos
diff --git a/rtl/unix/unixutil.pp b/rtl/unix/unixutil.pp
index 5f142867c7..a32e87cf30 100644
--- a/rtl/unix/unixutil.pp
+++ b/rtl/unix/unixutil.pp
@@ -114,7 +114,7 @@ end;
 Function StringToPPChar(Var S:String;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
   Note that the string S is destroyed by this call.
 }
 
@@ -126,7 +126,7 @@ end;
 Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
diff --git a/rtl/win/sysos.inc b/rtl/win/sysos.inc
index 05daca97ab..36d66162fb 100644
--- a/rtl/win/sysos.inc
+++ b/rtl/win/sysos.inc
@@ -191,7 +191,7 @@ threadvar
    function GetStdHandle(nStdHandle:DWORD):THANDLE;
      stdcall;external KernelDLL name 'GetStdHandle';
 
-   { command line/enviroment functions }
+   { command line/environment functions }
    function GetCommandLine : pchar;
      stdcall;external KernelDLL name 'GetCommandLineA';
 
diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp
index d42b9efbd4..bc1917764d 100644
--- a/rtl/win/sysutils.pp
+++ b/rtl/win/sysutils.pp
@@ -109,7 +109,7 @@ function CheckWin32Version(Major,Minor: Integer): Boolean;
 
 function GetFileVersion(const AFileName:string):Cardinal;
   var
-    { usefull only as long as we don't need to touch different stack pages }
+    { useful only as long as we don't need to touch different stack pages }
     buf : array[0..3071] of byte;
     bufp : pointer;
     fn : string;
diff --git a/rtl/win/wininc/Makefile b/rtl/win/wininc/Makefile
index 5814632be3..ae60cf237f 100644
--- a/rtl/win/wininc/Makefile
+++ b/rtl/win/wininc/Makefile
@@ -54,7 +54,7 @@ WINDOWS_DIR:=c\:/windows
 	sed -n -e "s/Addr:\(.*\)Ord:\(.*\)Name: \(.*\)/@\3@/p" $*.tmp > $*.exd
 #	-rm $*.tmp
 
-# list of usefull dll's for windows.pp
+# list of useful dll's for windows.pp
 dllexps : gdi32.exp kernel32.exp advapi32.exp user32.exp mapi32.exp  \
 	comdlg32.exp shell32.exp mpr.exp comctl32.exp version.exp \
 	opengl32.exp spoolss.exp winspool.exd
diff --git a/rtl/wince/system.pp b/rtl/wince/system.pp
index 77d9cb1834..04b4d56dd8 100644
--- a/rtl/wince/system.pp
+++ b/rtl/wince/system.pp
@@ -101,7 +101,7 @@ function RemoveDirectory(name:pointer):longbool;
 
 
 {$ifdef CPUARM}
-{ the external directive isn't really necessary here because it is overriden by external (FK) }
+{ the external directive isn't really necessary here because it is overridden by external (FK) }
 
 function addd(d1,d2 : double) : double; compilerproc;
    cdecl;external 'coredll' name '__addd';
diff --git a/tests/readme.txt b/tests/readme.txt
index 8fbef8a435..278de333ce 100644
--- a/tests/readme.txt
+++ b/tests/readme.txt
@@ -105,7 +105,7 @@ Controling testing in more detail
 Calling "make full" will perform tests in a standard manner. To have
 more control of the test process one must distinguish between:
 
-* Driver enviroment: compiler/rtl etc. to be used by the tools which
+* Driver environment: compiler/rtl etc. to be used by the tools which
   runs and analyze the tests. All normal options to make, like FPC
   OS_TARGET, OPT etc. controls this.
 
@@ -125,7 +125,7 @@ TEST_OPT               defaults to ""
 TEST_FPC_VERSION       defaults to version of TEST_FPC
 TEST_CCOMPILER         defaults to installed gcc compiler, but only
                        if driver and test full-targets are the same.
-TEST_VERBOSE           let dotest be more verbose, only usefull for debugging
+TEST_VERBOSE           let dotest be more verbose, only useful for debugging
 TEST_DELTEMP           delete temporary executable/object/ppu file,
                        default is off
 TEST_TIMEOUT           use timeout wrapper for (remote) execution
@@ -162,7 +162,7 @@ TEST_DELBEFORE       delete remote executable before uploading
 TEST_DELTEMP         delete executable after running, so the remote system
                      doesn't need much free disk space
 TEST_REMOTEPW        pass a password with -pw to remote tools,
-                     mainly usefull for putty
+                     mainly useful for putty
 
 
 Examples:
diff --git a/tests/tbs/tb0271.pp b/tests/tbs/tb0271.pp
index 5ec84de359..840c7f0cc5 100644
--- a/tests/tbs/tb0271.pp
+++ b/tests/tbs/tb0271.pp
@@ -2,7 +2,7 @@
 
 { Old file: tbs0317.pp }
 
-{ This shouldn't give a warning, because it can be used in an other program }
+{ This shouldn't give a warning, because it can be used in another program }
 var
   exportedc : longint;cvar;public;
 begin
diff --git a/tests/test/cg/obj/stdint.h b/tests/test/cg/obj/stdint.h
index 3c53b2f45e..afb4a090fb 100644
--- a/tests/test/cg/obj/stdint.h
+++ b/tests/test/cg/obj/stdint.h
@@ -62,7 +62,7 @@
  *       ANSI C standard makes this an impossibility right from the
  *       very get go. Its really only meant to be useful for the vast
  *       majority of platforms that possess the capability of
- *       implementing usefully and precisely defined, standard sized
+ *       implementing usefuly and precisely defined, standard sized
  *       integer scalars.  Systems which are not intrinsically 2s
  *       complement may produce invalid constants.
  *
diff --git a/tests/test/cg/tcalcla1.pp b/tests/test/cg/tcalcla1.pp
index a92042fdd6..07a4d22195 100644
--- a/tests/test/cg/tcalcla1.pp
+++ b/tests/test/cg/tcalcla1.pp
@@ -201,11 +201,11 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;abstract;
    procedure method_dynamic_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);dynamic;
-   procedure method_dynamic_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_dynamic_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);dynamic;abstract;
    class procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -217,7 +217,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -231,7 +231,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
    procedure method_dynamic_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
-   procedure method_dynamic_call_overriden_params_mixed(
+   procedure method_dynamic_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
    procedure method_dynamic_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
@@ -246,7 +246,7 @@ type
  theritedvmtclass = class(tvmtclass)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -254,9 +254,9 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override;
-   procedure method_dynamic_overriden_params_mixed(
+   procedure method_dynamic_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override;
 
    { normal methods which call other methods }
@@ -264,7 +264,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
@@ -537,10 +537,10 @@ procedure tvmtclass.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtclass.method_virtual_call_overriden_params_mixed(
+procedure tvmtclass.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -585,10 +585,10 @@ procedure tvmtclass.method_dynamic_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtclass.method_dynamic_call_overriden_params_mixed(
+procedure tvmtclass.method_dynamic_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -636,7 +636,7 @@ constructor theritedvmtclass.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtclass.constructor_params_mixed_call_overriden(
+constructor theritedvmtclass.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    inherited create;
@@ -645,7 +645,7 @@ constructor theritedvmtclass.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtclass.constructor_params_mixed_call_static(
@@ -684,7 +684,7 @@ constructor theritedvmtclass.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-procedure theritedvmtclass.method_virtual_overriden_params_mixed(
+procedure theritedvmtclass.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -694,7 +694,7 @@ procedure theritedvmtclass.method_virtual_overriden_params_mixed(
    object_s64bit := s64;
  end;
 
-procedure theritedvmtclass.method_dynamic_overriden_params_mixed(
+procedure theritedvmtclass.method_dynamic_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -717,10 +717,10 @@ procedure theritedvmtclass.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtclass.method_normal_call_overriden_params_mixed(
+procedure theritedvmtclass.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1166,7 +1166,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1195,7 +1195,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1407,7 +1407,7 @@ var
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...');
-    vmtclass.method_dynamic_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_dynamic_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1437,7 +1437,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_dynamic_overriden_params_mixed(value_u8bit,
+    vmtclass.method_dynamic_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1493,7 +1493,7 @@ var
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtclass.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1523,7 +1523,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtclass.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1712,10 +1712,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtclass.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1745,7 +1745,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtclass.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2048,10 +2048,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtclass.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2081,7 +2081,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtclass.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2643,7 +2643,7 @@ procedure testwith;
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2672,7 +2672,7 @@ procedure testwith;
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2884,7 +2884,7 @@ procedure testwith;
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...');
-    method_dynamic_overriden_params_mixed(RESULT_U8BIT,
+    method_dynamic_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2914,7 +2914,7 @@ procedure testwith;
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_dynamic_overriden_params_mixed(value_u8bit,
+    method_dynamic_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2970,7 +2970,7 @@ procedure testwith;
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3000,7 +3000,7 @@ procedure testwith;
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_virtual_overriden_params_mixed(value_u8bit,
+    method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3189,10 +3189,10 @@ procedure testwith;
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3222,7 +3222,7 @@ procedure testwith;
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_normal_call_overriden_params_mixed(value_u8bit,
+    method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3525,10 +3525,10 @@ procedure testwith;
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3558,7 +3558,7 @@ procedure testwith;
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_virtual_call_overriden_params_mixed(value_u8bit,
+    method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
diff --git a/tests/test/cg/tcalobj1.pp b/tests/test/cg/tcalobj1.pp
index 601fa6e100..c7185243fa 100644
--- a/tests/test/cg/tcalobj1.pp
+++ b/tests/test/cg/tcalobj1.pp
@@ -197,7 +197,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;
@@ -209,7 +209,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -224,7 +224,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -232,7 +232,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
 
    { normal methods which call other methods }
@@ -240,7 +240,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
@@ -458,8 +458,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
     RunError(211);
@@ -499,10 +499,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -543,7 +543,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -551,7 +551,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -587,8 +587,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -610,10 +610,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1056,7 +1056,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1085,7 +1085,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1272,7 +1272,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1302,7 +1302,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1491,10 +1491,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1524,7 +1524,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1827,10 +1827,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1860,7 +1860,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2226,7 +2226,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2255,7 +2255,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2442,7 +2442,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2472,7 +2472,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2661,10 +2661,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2694,7 +2694,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2997,10 +2997,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3030,7 +3030,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj2.pp b/tests/test/cg/tcalobj2.pp
index 62f0c0e258..46865dd1a8 100644
--- a/tests/test/cg/tcalobj2.pp
+++ b/tests/test/cg/tcalobj2.pp
@@ -197,7 +197,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;pascal;
@@ -209,7 +209,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
@@ -224,7 +224,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -232,7 +232,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
 
    { normal methods which call other methods }
@@ -240,7 +240,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
@@ -459,8 +459,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
  begin
     RunError(211);
@@ -500,10 +500,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -544,7 +544,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -552,7 +552,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -588,8 +588,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
  begin
    object_u8bit := u8;
@@ -611,10 +611,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1057,7 +1057,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1086,7 +1086,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1273,7 +1273,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1303,7 +1303,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1492,10 +1492,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1525,7 +1525,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1828,10 +1828,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1861,7 +1861,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2229,7 +2229,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2258,7 +2258,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2445,7 +2445,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2475,7 +2475,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2664,10 +2664,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2697,7 +2697,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3000,10 +3000,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3033,7 +3033,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj3.pp b/tests/test/cg/tcalobj3.pp
index d7326f2b98..3c6a41f016 100644
--- a/tests/test/cg/tcalobj3.pp
+++ b/tests/test/cg/tcalobj3.pp
@@ -197,7 +197,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;cdecl;
@@ -209,7 +209,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -224,7 +224,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -232,7 +232,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
 
    { normal methods which call other methods }
@@ -240,7 +240,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
@@ -459,8 +459,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
     RunError(211);
@@ -500,10 +500,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -544,7 +544,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -552,7 +552,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -588,8 +588,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -611,10 +611,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1057,7 +1057,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1086,7 +1086,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1273,7 +1273,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1303,7 +1303,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1492,10 +1492,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1525,7 +1525,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1828,10 +1828,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1861,7 +1861,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2228,7 +2228,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2257,7 +2257,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2444,7 +2444,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2474,7 +2474,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2663,10 +2663,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2696,7 +2696,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2999,10 +2999,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3032,7 +3032,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj4.pp b/tests/test/cg/tcalobj4.pp
index 034e7766f2..234055c157 100644
--- a/tests/test/cg/tcalobj4.pp
+++ b/tests/test/cg/tcalobj4.pp
@@ -199,7 +199,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;oldfpccall;
@@ -211,7 +211,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
@@ -226,7 +226,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -234,7 +234,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
 
    { normal methods which call other methods }
@@ -242,7 +242,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
@@ -461,8 +461,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
  begin
     RunError(211);
@@ -502,10 +502,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -546,7 +546,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -554,7 +554,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -590,8 +590,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
  begin
    object_u8bit := u8;
@@ -613,10 +613,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1059,7 +1059,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1088,7 +1088,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1275,7 +1275,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1305,7 +1305,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1494,10 +1494,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1527,7 +1527,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1830,10 +1830,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1863,7 +1863,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2230,7 +2230,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2259,7 +2259,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2446,7 +2446,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2476,7 +2476,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2665,10 +2665,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2698,7 +2698,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3001,10 +3001,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3034,7 +3034,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj6.pp b/tests/test/cg/tcalobj6.pp
index 53513f565b..37e65a876b 100644
--- a/tests/test/cg/tcalobj6.pp
+++ b/tests/test/cg/tcalobj6.pp
@@ -197,7 +197,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;register;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;register;
@@ -209,7 +209,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
@@ -224,7 +224,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -232,7 +232,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
 
    { normal methods which call other methods }
@@ -240,7 +240,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
@@ -459,8 +459,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
  begin
     RunError(211);
@@ -500,10 +500,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -544,7 +544,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -552,7 +552,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -588,8 +588,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
  begin
    object_u8bit := u8;
@@ -611,10 +611,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1057,7 +1057,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1086,7 +1086,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1273,7 +1273,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1303,7 +1303,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1492,10 +1492,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1525,7 +1525,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1828,10 +1828,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1861,7 +1861,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2229,7 +2229,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2258,7 +2258,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2445,7 +2445,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2475,7 +2475,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2664,10 +2664,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2697,7 +2697,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3000,10 +3000,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3033,7 +3033,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj7.pp b/tests/test/cg/tcalobj7.pp
index 110cde9db0..f6320de7ed 100644
--- a/tests/test/cg/tcalobj7.pp
+++ b/tests/test/cg/tcalobj7.pp
@@ -197,7 +197,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;stdcall;
@@ -209,7 +209,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
@@ -224,7 +224,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -232,7 +232,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
 
    { normal methods which call other methods }
@@ -240,7 +240,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
@@ -459,8 +459,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
  begin
     RunError(211);
@@ -500,10 +500,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -544,7 +544,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -552,7 +552,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -588,8 +588,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
  begin
    object_u8bit := u8;
@@ -611,10 +611,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1057,7 +1057,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1086,7 +1086,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1273,7 +1273,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1303,7 +1303,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1492,10 +1492,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1525,7 +1525,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1828,10 +1828,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1861,7 +1861,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2229,7 +2229,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2258,7 +2258,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2445,7 +2445,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2475,7 +2475,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2664,10 +2664,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2697,7 +2697,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3000,10 +3000,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3033,7 +3033,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/cg/tcalobj8.pp b/tests/test/cg/tcalobj8.pp
index 52f3f067db..aae9993637 100644
--- a/tests/test/cg/tcalobj8.pp
+++ b/tests/test/cg/tcalobj8.pp
@@ -199,7 +199,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;saveregisters;
@@ -211,7 +211,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
@@ -226,7 +226,7 @@ type
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -234,7 +234,7 @@ type
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
 
    { normal methods which call other methods }
@@ -242,7 +242,7 @@ type
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
@@ -461,8 +461,8 @@ procedure tvmtobject.method_virtual_params_mixed(
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
  begin
     RunError(211);
@@ -502,10 +502,10 @@ procedure tvmtobject.method_virtual_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -546,7 +546,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_virtual(
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -554,7 +554,7 @@ constructor theritedvmtobject.constructor_params_mixed_call_overriden(
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -590,8 +590,8 @@ constructor theritedvmtobject.constructor_params_mixed_call_inherited
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -613,10 +613,10 @@ procedure theritedvmtobject.method_normal_call_virtual_params_mixed(
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1059,7 +1059,7 @@ var
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1088,7 +1088,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1275,7 +1275,7 @@ var
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1305,7 +1305,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1494,10 +1494,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1527,7 +1527,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1830,10 +1830,10 @@ var
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1863,7 +1863,7 @@ var
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2231,7 +2231,7 @@ var
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2260,7 +2260,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2447,7 +2447,7 @@ var
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2477,7 +2477,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2666,10 +2666,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2699,7 +2699,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3002,10 +3002,10 @@ var
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3035,7 +3035,7 @@ var
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
diff --git a/tests/test/twide3.pp b/tests/test/twide3.pp
index 2a9bed370a..940669df9c 100644
--- a/tests/test/twide3.pp
+++ b/tests/test/twide3.pp
@@ -1,5 +1,5 @@
 { %skiptarget=win32,win64,wince }
-{ This test is only usefull if the local codepage is utf-8 which
+{ This test is only useful if the local codepage is utf-8 which
   usually not the case on windows
 }
 {$codepage utf-8}
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index b58b75e56b..63bc50eed0 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1307,7 +1307,7 @@ const fpcmakeini : array[0..219,1..240] of char=(
   'endif'#010+
   #010+
   '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+
-  'uase'#010+
+  'ause'#010+
   '# upx uses that one ','itself (PFV)'#010+
   'ifndef UPXPROG'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index 6b9089f2c0..2af8bdcf36 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -1264,7 +1264,7 @@ else
 DATESTR=
 endif
 
-# Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
+# Look if UPX is found for go32v2 and win32. We can't use $UPX because
 # upx uses that one itself (PFV)
 ifndef UPXPROG
 ifeq ($(OS_TARGET),go32v2)
diff --git a/utils/fpcm/makefile.exm b/utils/fpcm/makefile.exm
index 7263e387d2..b5293d98d1 100644
--- a/utils/fpcm/makefile.exm
+++ b/utils/fpcm/makefile.exm
@@ -87,6 +87,6 @@ infofiles=0
 
 
 [rules]
-; here you can add your own rules, the general rules will automaticly
+; here you can add your own rules, the general rules will automatically
 ; remove the defaults which call fpc_<rule>.
 
diff --git a/utils/fppkg/pkgmessages.pp b/utils/fppkg/pkgmessages.pp
index 62c5a46651..c732e3f2bc 100644
--- a/utils/fppkg/pkgmessages.pp
+++ b/utils/fppkg/pkgmessages.pp
@@ -21,7 +21,7 @@ Resourcestring
   SErrMissingInstallPackage  = 'Could not find package "%s"';
   SErrNoPackageSpecified     = 'No package specified';
   SErrNoPackageAvailable     = 'Package %s %s is not available';
-  SErrOnlyLocalDir           = 'The speficied command "%s" works only on current dir, not on a (remote) package';
+  SErrOnlyLocalDir           = 'The specified command "%s" works only on current dir, not on a (remote) package';
   SErrExecutionFPMake        = 'Execution of FPMake %s failed';
   SErrException              = 'The FPC Package tool encountered the following error:';
   SErrActionAlreadyRegistered= 'Action "%s" is already registered';
diff --git a/utils/h2pas/h2pas.pas b/utils/h2pas/h2pas.pas
index c7dfb1ecc8..834b1e01d7 100644
--- a/utils/h2pas/h2pas.pas
+++ b/utils/h2pas/h2pas.pas
@@ -657,7 +657,7 @@ program h2pas;
                    write(outfile,'args:array of const');
                    (* if variable number of args we must allways pop *)
                    no_pop:=false;
-                   (* Needs 2 declarations, also one without args, becuase
+                   (* Needs 2 declarations, also one without args, because
                       in C you can omit the second parameter. Default parameter
                       doesn't help as that isn't possible with array of const *)
                    NeedEllipsisOverload:=true;