diff --git a/.gitattributes b/.gitattributes
index ac5875cb88..e07808602c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8892,6 +8892,8 @@ tests/test/tclass1.pp svneol=native#text/plain
 tests/test/tclass10.pp svneol=native#text/pascal
 tests/test/tclass11a.pp svneol=native#text/pascal
 tests/test/tclass11b.pp svneol=native#text/pascal
+tests/test/tclass12a.pp svneol=native#text/pascal
+tests/test/tclass12b.pp svneol=native#text/pascal
 tests/test/tclass2.pp svneol=native#text/plain
 tests/test/tclass3.pp svneol=native#text/plain
 tests/test/tclass4.pp svneol=native#text/plain
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 0cda9eaa3d..1cb9260194 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -1104,8 +1104,8 @@ parser_e_packed_element_no_loop=03223_E_Bit packed array elements and record fie
 % (or as \var{packed} in any mode with \var{\{\$bitpacking on\}}), it will
 % be packed at the bit level. For performance reasons, they cannot be
 % used as loop variables.
-parser_e_type_and_var_only_in_generics_and_classes=03224_E_VAR and TYPE are allowed only in generics and classes
-% The usage of VAR and TYPE to declare new types inside an object is allowed only inside
+parser_e_type_var_const_only_in_generics_and_classes=03224_E_VAR, TYPE and CONST are allowed only in generics and classes
+% The usage of VAR, TYPE and CONST to declare new types inside an object is allowed only inside
 % generics and classes.
 parser_e_cant_create_generics_of_this_type=03225_E_This type can't be a generic
 % Only Classes, Objects, Interfaces and Records are allowed to be used as generic.
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 5ffc9f1692..a7f65ef8e3 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -312,7 +312,7 @@ const
   parser_e_packed_element_no_var_addr=03221;
   parser_e_packed_dynamic_open_array=03222;
   parser_e_packed_element_no_loop=03223;
-  parser_e_type_and_var_only_in_generics_and_classes=03224;
+  parser_e_type_var_const_only_in_generics_and_classes=03224;
   parser_e_cant_create_generics_of_this_type=03225;
   parser_w_no_lineinfo_use_switch=03226;
   parser_e_no_funcret_specified=03227;
@@ -840,7 +840,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 55239;
+  MsgTxtSize = 55246;
 
   MsgIdxMax : array[1..20] of longint=(
     24,87,285,95,71,51,110,22,202,63,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index a472c74744..c02ffeaf41 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -356,470 +356,470 @@ const msgtxt : array[0..000230,1..240] of char=(
   '03222_E_Dynamic arrays cannot be packed'#000+
   '03223_E_Bit packed array elements and recor','d fields cannot be used a'+
   's loop variables'#000+
-  '03224_E_VAR and TYPE are allowed only in generics and classes'#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 manually, Use the -gl compiler sw'+
   'itch instead'#000+
-  '03227_E_No function ','result type specified for function "$1"'#000+
+  '03227_E_No fu','nction 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+
-  '03231_E_','Taking the address of labels defined outside the current sco'+
+  '0','3231_E_Taking the address of labels defined outside the current sco'+
   'pe 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+
-  '03236_E_Generic','s without specialization can not be used as a type fo'+
+  '03236_E_','Generics without specialization can not be used as a type fo'+
   'r a variable'#000+
   '03237_W_Register list is ignored for pure assembler routines'#000+
   '03238_E_Implements property must have class or interface type'#000+
-  '03239_E_Implements-property must implement interfac','e of correct type'+
+  '03239_E_Implements-property must implement i','nterface 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-property must not have stored-specifier'#000+
-  '03243_E_Implements-propert','y used on unimplemented interface: "$1"'#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+
-  '03247_E_Variables cannot be exported with',' a different name on this t'+
+  '03247_E_Variables cannot be export','ed with a different name on this t'+
   'arget, add the name to the declaration using the "export" directive (v'+
   'ariable name: $1, declared export name: $2)'#000+
   '03248_E_Weak external symbols are not supported for the current target'+
   #000+
-  '03249_E_Forward type definit','ion does not match'#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 new visibility section first'#000+
-  '03252_E_Parameters cannot contain ','local type definitions. Use a sepa'+
+  '03252_E_Parameters cannot c','ontain local type definitions. Use a sepa'+
   'rate type definition in a type block.'#000+
   '03253_E_ABSTRACT and SEALED conflict'#000+
   '03254_E_Can not create a descendant of the sealed class "$1"'#000+
   '03255_E_SEALED class can not have an ABSTRACT method'#000+
-  '03256_E_Only virt','ual methods can be final'#000+
+  '03256_E_On','ly virtual methods can be final'#000+
   '03257_E_Final method can not be overridden: "$1"'#000+
   '03258_E_Only one message can be used per method.'#000+
   '03259_E_Invalid enumerator identifier: "$1"'#000+
   '03260_E_Enumerator identifier required'#000+
-  '03261_E_Enumerator MoveNext patter','n method is not valid. Method must'+
+  '03261_E_Enumerator MoveNext',' pattern method is not valid. Method must'+
   ' be 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+
-  '03263_E_Only one enumerator MoveNext method is a','llowed per class/obj'+
+  '03263_E_Only one enumerator MoveNext meth','od is allowed per class/obj'+
   'ect'#000+
   '03264_E_Only one enumerator Current property is allowed per class/obje'+
   'ct'#000+
   '03265_E_For in loop can not be used for the type "$1"'#000+
   '03266_E_Objective-C messages require their Objective-C selector name t'+
-  'o be specified usin','g the "message" directive.'#000+
+  'o be specifi','ed 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+
-  '03269_E_Objective-C message symbol name fo','r "$1" is too long'#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 cannot have published sections.'#000+
-  '03272_F_This module requires a','n Objective-C mode switch to be compil'+
+  '03272_F_This module req','uires an Objective-C mode switch to be compil'+
   'ed'#000+
   '03273_E_Inherited methods can only be overridden in Objective-C, add "'+
   'override".'#000+
   '03274_H_Inherited methods can only be overridden in Objective-C, add "'+
   'override".'#000+
-  '03275_E_Message name "$1" in inherite','d class is different from messa'+
+  '03275_E_Message name "$1" in i','nherited class is different from messa'+
   'ge name "$2" in current class.'#000+
   '03276_E_It is not yet possible to make unique copies of Objective-C ty'+
   'pes'#000+
   '03277_E_Objective-C categories cannot be used as types'#000+
-  '03278_E_Categories do not override, but replace m','ethods. Use "reintr'+
+  '03278_E_Categories do not override, but re','place methods. Use "reintr'+
   'oduce" instead.'#000+
   '03279_E_Replaced methods can only be reintroduced in Objective-C, add '+
   '"reintroduce".'#000+
   '03280_H_Replaced methods can only be reintroduced in Objective-C, add '+
   '"reintroduce".'#000+
-  '03281_E_Getter for implements inter','face must use the target'#039's de'+
+  '03281_E_Getter for implement','s interface must use the target'#039's de'+
   'fault calling convention.'#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+
   '04000_E_Type mismatch'#000+
-  '04001_E_In','compatible types: got "$1" expected "$2"'#000+
+  '040','01_E_Incompatible types: got "$1" expected "$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+
+  '04006_E_Boolean expression e','xpected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#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 no','t implemented for sets'#000+
+  '04013_E_Opera','tion not implemented for sets'#000+
   '04014_W_Automatic type conversion from floating type to COMP which is '+
   '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 enu','ms with assignments not possible'#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+
   '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+
+  '04022_W','_lo/hi(dword/qword) returns the upper/lower word/dword'#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 Procedu','re (variable) are not compatibl'+
+  '04026_E_Method (variable) and ','Procedure (variable) are not compatibl'+
   'e'#000+
   '04027_E_Illegal constant passed to internal 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 procedu','re varia'+
+  '04030_E_Can'#039't assign local procedure/function to ','procedure varia'+
   'ble'#000+
   '04031_E_Can'#039't assign values to an address'#000+
   '04032_E_Can'#039't assign 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 resu','lt'+
+  '04035_H_Mixing signed expressions and longwords gives a 64b','it result'+
   #000+
   '04036_W_Mixing signed expressions and cardinals here may cause a range'+
   ' 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+
+  '04039_E_Class or Object ty','pes "$1" and "$2" are not related'#000+
   '04040_W_Class types "$1" and "$2" are not related'#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 len','gth'#000+
+  '04043_W_String literal has more characters than short str','ing length'#000+
   '04044_W_Comparison is always false due to range of values'#000+
   '04045_W_Comparison 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 si','zed'#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'#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 parameter','s and open arrays are not pos'+
+  '04051_E_Assignments to formal pa','rameters and open arrays are not pos'+
   'sible'#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 porta','ble'#000+
+  '04055_H_Conversion between ordinals and pointers is no','t portable'#000+
   '04056_W_Conversion between ordinals and pointers is not portable'#000+
   '04057_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 ex','plicit typecast to prevent this.'#000+
+  'nt,',' add explicit typecast to prevent this.'#000+
   '04060_E_Class or COM interface type expected, 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_Incompa','tible type for arg no. $1: Got "$2" expected "(not pa'+
+  '04063_E_','Incompatible type for arg no. $1: Got "$2" expected "(not pa'+
   'cked) Array"'#000+
   '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" o','n untyped pointer is unportable to {$T+}, s'+
+  '04066_W_Arithmetic',' "$1" on untyped pointer is unportable to {$T+}, s'+
   'uggest typecast'#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 o','perands to "$1" before doing the add could p'+
+  '04079_H_Convertin','g the operands to "$1" before doing the add could p'+
   'revent overflow errors.'#000+
   '04080_H_Converting the operands to "$1" before doing the subtract coul'+
   'd prevent overflow errors.'#000+
-  '04081_H_Converting the operands to "$1" before doing the multiply coul'+
-  'd pre','vent overflow errors.'#000+
+  '04081_H_Converting the operands to "$1" before doing the multiply co','u'+
+  'ld prevent overflow errors.'#000+
   '04082_W_Converting pointers to signed integers may result in wrong com'+
   'parison 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+
+  '04084_E_Invalid selector name "$1','"'#000+
+  '04085_E_Expected Objective-C method, but got $1'#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_Con','verting 0 to NIL'#000+
+  '0409','0_W_Converting 0 to NIL'#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 exp','ected'#000+
+  '04094_E_Objcclass t','ype expected'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$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+
+  '05005_E_Forward declaration not s','olved "$1"'#000+
   '05007_E_Error in type definition'#000+
   '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instances of classes or objects with an',' abstract method are '+
+  '05013_E_Instances of classes or objects ','with an abstract method are '+
   'not allowed'#000+
   '05014_W_Label 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 i','sn'#039't a label'#000+
+  '05019_E_ident','ifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
   '05022_E_Forward 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+
+  '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+
   '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+
+  '05030_N_Private field "$1.$2" is assign','ed but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#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+
-  '0','5036_W_Local variable "$1" does not seem to be initialized'#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 initialized'#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 imple','mentation for interface method "$1" found'#000+
+  '05042_E_No matchin','g implementation for interface method "$1" found'#000+
   '05043_W_Symbol "$1" is deprecated'#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+
+  '05057_H_Local variable "$1" does n','ot seem to be initialized'#000+
   '05058_H_Variable "$1" does not seem to be initialized'#000+
   '05059_W_Function result variable 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 a','ssigned'#000+
+  '05061_W_Variable "$1" read but no','where assigned'#000+
   '05062_H_Found abstract method: $1'#000+
   '05063_W_Symbol "$1" is experimental'#000+
   '05064_W_Forward declaration "$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_Can no','t find an enumerator for the type "$1"'#000+
+  '05067_E','_Can not find an enumerator for the type "$1"'#000+
   '05068_E_Can not find a "MoveNext" method in enumerator "$1"'#000+
   '05069_E_Can not find a "Current" property in enumerator "$1"'#000+
   '05070_E_Mismatch between number of declared parameters and number of c'+
-  'olons in m','essage string.'#000+
+  'olo','ns in message string.'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types 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+
+  '06016_W_Possible illegal ','call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_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+
+  '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 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 can not be called insid','e a '#039'w'+
+  '06037_E_Constructors or destructors can not be calle','d inside a '#039'w'+
   'ith'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump 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+
+  '06041_W_Parameters size exceeds limit for certa','in cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables 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'+
-  'm','e library.'#000+
+  '06046_F_Unknown compilerproc "$1". Check if you use the correct ','run '+
+  'time library.'#000+
   '06047_F_Cannot find system type "$1". Check if you use the correct run'+
   ' 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 cor'+
+  '06050_F_Cannot find type "$1" in ','unit "$2". Check if you use the cor'+
   'rect run time library.'#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+
-  '07005_E_OFFSET used wit','hout identifier'#000+
+  '07005_E_OFFSET u','sed 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 multiple relocatable symbols'#000+
-  '07011_E_Relocatable symbol ','can only be added'#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 can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '07017_E_I','nvalid base and index register usage'#000+
+  '07','017_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+
-  '07022_E_Invalid string as opcode operand: $1'#000+
-  '07023_','W_@CODE and @DATA not supported'#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+
-  '07029_W_Fwait can cause em','ulation problems with emu387'#000+
+  '07029_W_Fwait can c','ause 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+
   '07033_E_Unsupported symbol type for operand'#000+
-  '07034_E_Con','stant value out of bounds'#000+
+  '0703','4_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 translated to $2'#000+
-  '07040_W_$1 is associated to an overloaded',' function'#000+
+  '07040_W_$1 is associated to an ove','rloaded 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+
-  '07045_E_Size suffix and destination or source size do no','t match'#000+
+  '07045_E_Size suffix and destination or source siz','e 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+
-  '07050_E_Assembler syntax error in constant'#000+
-  '0','7051_E_Invalid String expression'#000+
+  '07050_E_Assembler syntax error in con','stant'#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 combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid com','bination of override and opcode: $1'#000+
+  '07056_E_Inva','lid 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_Unknown label identifier $1'#000+
-  '07063_E_Invalid register ','name'#000+
+  '07063_E_Invalid re','gister 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 type'#000+
-  '07070_E_Cannot index a local var or parameter with',' a register'#000+
+  '07070_E_Cannot index a local var or paramet','er 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_assembler code not returned to text section'#000+
-  '07076_E_Not a d','irective or local symbol $1'#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 target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't',' access fields directly for parameters'#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+
-  '07086_W_"$1" without operan','d translated into "$1 %st,%st(1)"'#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+
   '07093_W_ALIGN not supported'#000+
-  '07094_E_In','c and Dec cannot be together'#000+
+  '070','94_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 the size of the oper'+
-  'ands, using DWORD as default'#000+
-  '07099','_E_Syntax error while trying to parse a shifter operand'#000+
+  'ands, using DWORD as defaul','t'#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+
-  '07102_W_Use of +offset(%','ebp) for parameters invalid here'#000+
+  '07102_W_Use of +o','ffset(%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_Use of -offset(%esp), access may cause a crash or valu','e may '+
+  '07105_W_Use 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 w'+
-  'idth'#000+
-  '0710','9_E_A register set cannot be empty'#000+
+  'id','th'#000+
+  '07109_E_A register set cannot be empty'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#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 s','ection'#000+
+  '08004_E_Allocating of data is only allowed i','n 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 of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
-  '08010_E_Asm: Immedia','te or reference expected'#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+
   '08014_E_Asm: Comp type not supported for this target'#000+
-  '08015_E_Asm: Extended type not supported for th','is 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+
   '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+
+  '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_Can'#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 assembl','ing'#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 a'+
   'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
-  '09011_W_Object $1 not found',', Linking may fail !'#000+
+  '09011_W_Object $1 no','t 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 call 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+
+  '09016_E_Util $1 not found, switching to external linkin','g'#000+
+  '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler "$1" not found, switching to external mode'#000+
-  '09022_I_Compiling resou','rce $1'#000+
+  '09022_I_Compilin','g 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 linked, switching to static linking'+
   #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 sm','art or static linked'#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+
   '09029_E_Error while compiling resources'#000+
-  '09030_E_Can'#039't call the resource compiler "$1", switching to exter',
-  'nal mode'#000+
+  '09030_E_Can'#039't call the resource compiler "$1", switching t','o exte'+
+  'rnal 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 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+
+  '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 bytes'#000+
   '09200_F_Executable image size is too big for $1 target.'#000+
-  '09201_W_Object file "$1" contains 32-bit absolute relocation to sy','mb'+
+  '09201_W_Object file "$1" contains 32-bit absolute relocatio','n to symb'+
   'ol "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
@@ -829,161 +829,161 @@ const msgtxt : array[0..000230,1..240] of char=(
   '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 Ver','sion $1'#000+
+  '10008_U_PPU Inva','lid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
-  '10015_F_unexpected end of PPU-File'#000+
-  '10016','_F_Invalid PPU-File entry: $1'#000+
+  '10015_F_unexpected end of PPU-Fil','e'#000+
+  '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10022_F_Can'#039't find unit $','1 used by $2'#000+
+  '10022_F_Can'#039't find',' unit $1 used by $2'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load from $1 ($2) unit ','$3'#000+
+  '10027_U_Load from $1 ($2',') unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj',' and asm are older than ppufile'#000+
+  '10032_U_Recompiling un','it, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't recompile u','nit $1, but found modifed include files'+
+  '10040_W_Can'#039't reco','mpile unit $1, but found modifed include files'+
   #000+
   '10041_U_File $1 is newer than PPU file $2'#000+
   '10042_U_Trying to use a unit which was compiled with a different FPU m'+
   'ode'#000+
   '10043_U_Loading interface units from $1'#000+
-  '10044_U_Loading implementation units from $1',#000+
+  '10044_U_Loading implementation units ','from $1'#000+
   '10045_U_Interface CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
   '10048_U_Adding dependency: $1 depends on $2'#000+
   '10049_U_No reload, is caller: $1'#000+
-  '10050_U_No reload, already in second c','ompile: $1'#000+
+  '10050_U_No reload, already in s','econd compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
-  '10057_U_Registering new unit $1'#000+
-  '1','0058_U_Re-resolving unit $1'#000+
+  '10057_U_Registering new un','it $1'#000+
+  '10058_U_Re-resolving unit $1'#000+
   '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '10060_U_Unloading resource unit $1 (not needed)'#000+
   '10061_E_Unit $1 was compiled using a different whole program optimizat'+
-  'ion feedback input ($2, $3); r','ecompile it without wpo or use the sam'+
+  'ion feedback input ($2,',' $3); recompile it without wpo or use the sam'+
   'e wpo feedback input file for this compilation invocation'#000+
   '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file sup','ported, changing source file to comp'+
+  '11001_W_Only one source f','ile supported, changing source file to comp'+
   'ile from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
-  '11005_N_No option inside $1 config file'#000+
-  '11','006_E_Illegal parameter: $1'#000+
+  '11005_N_No option inside $1 config ','file'#000+
+  '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on D','OS platform, reverting to stat'+
+  '11012_W_Shared libs not support','ed on DOS platform, reverting to stat'+
   'ic'#000+
   '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
   'ntered'#000+
   '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+
   'tered'#000+
-  '11015_F_Open conditional at the end of the options fil','e'#000+
+  '11015_F_Open conditional at the end of the opti','ons file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
   '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembl','er to default source writing assembler'#000+
+  '11020_N_Switching ','assembler to default source writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
-  '11028_D_Handling op','tion "$1"'#000+
+  '11028_D_Hand','ling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
-  '11034_D_Re','ading config file "$1"'#000+
+  '110','34_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
   '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
   'ugging disabled'#000+
-  '11042_W_Use of ppc386.cfg is de','precated, please use fpc.cfg instead'#000+
+  '11042_W_Use of ppc386.cf','g is deprecated, please use fpc.cfg instead'#000+
   '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
   'var{\#IF(N)DEF} found'#000+
   '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
   't platform'#000+
-  '11045_F_The feature "$1" is no','t, or not yet, supported on the select'+
+  '11045_F_The feature "$1','" is not, or not yet, supported on the select'+
   'ed target platform'#000+
   '11046_N_DWARF debug information cannot be used with smart linking on t'+
   'his target, switching to static linking'#000+
   '11047_W_Option "$1" is ignored for the current target platform.'#000+
-  '11048_W_D','isabling external debug information because it is unsupport'+
+  '11','048_W_Disabling external debug information because it is unsupport'+
   'ed for the selected target/debug format combination.'#000+
   '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
-  '12001_D_Processing whole program optimization information in w','po fee'+
+  '12001_D_Processing whole program optimization informati','on in wpo fee'+
   'dback file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
   '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
   'ck file'#000+
-  '12004_W_No handler registered for whole pro','gram optimization section'+
+  '12004_W_No handler registered for wh','ole program optimization section'+
   ' "$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
   '12006_F_The selected whole program optimizations require a previously '+
-  'generated feedb','ack file (use -Fw to specify)'#000+
+  'generate','d feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
   '12008_F_Specify a whole program optimization feedback file to store th'+
   'e generated info in (using -FW)'#000+
-  '12009_E_Not gene','rating any whole program optimization information, y'+
+  '12009_E_N','ot generating any whole program optimization information, y'+
   'et a feedback file was specified (using -FW)'#000+
   '12010_E_Not performing any whole program optimizations, yet an input f'+
   'eedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping whole program opt','imization section "$1", because no'+
+  '12011_D_Skipping whole prog','ram optimization section "$1", because no'+
   't needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
   'input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liveness information ','from program when'+
+  '12013_E_Cannot extract symbol liveness infor','mation from program when'+
   ' stripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
   '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
   'n from linked program'#000+
-  '12016_E_Error du','ring reading symbol liveness information produced by'+
+  '12016_E_E','rror during reading symbol liveness information produced by'+
   ' "$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
   '12018_E_Collection of symbol liveness information can only help when u'+
-  'sing smart linking',', use -CX -XX'#000+
+  'sing smart ','linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
   'Copyright (c) 1993-2009 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler ver','sion $FPCVERSION'#010+
+  '11024_Free Pascal Compi','ler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -997,7 +997,7 @@ const msgtxt : array[0..000230,1..240] of char=(
   'Supported FPU instruction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
-  'Supported ABI targets:',#010+
+  'Supported ABI t','argets:'#010+
   '  $ABITARGETS'#010+
   #010+
   'Supported Optimizations:'#010+
@@ -1010,8 +1010,8 @@ const msgtxt : array[0..000230,1..240] of char=(
   'Supported Microcontroller types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
-  'This program comes under the GNU General Public Licence'#010+
-  'For mor','e information read COPYING.FPC'#010+
+  'This program comes under the GNU General Public Licence'#010,
+  'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs, suggestions, etc. to:'#010+
   '                 http://bugs.freepascal.org'#010+
@@ -1019,61 +1019,61 @@ const msgtxt : array[0..000230,1..240] of char=(
   '                 bugs@freepascal.org'#000+
   '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
-  '**1a_The com','piler doesn'#039't delete the generated assembler file'#010+
+  '**1a_','The compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info',' in assembler file'#010+
+  '**2ar_List register allocation/relea','se info in assembler file'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
   '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_ELF32 (Linux) file usi','ng Nasm'#010+
+  '3*2Anasmelf_ELF32 (Linux) f','ile using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_Obj file using Tasm ','(Borland)'#010+
+  '3*2Atasm_Obj file usin','g Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
   '3*2Acoff_COFF (Go32v2) using internal writer'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '4*2Aas_Assemble using GNU AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola assembler'#010+
-  '6*','2Amit_MIT Syntax (old GAS)'#010+
+  '6*2Agas_GNU Motorola assem','bler'#010+
+  '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
   '**2bl_Generate local symbol info'#010+
-  '**1B_Build all modules'#010+
-  '**1C<x>','_Code generation options:'#010+
+  '**1B_Build all modules'#010,
+  '**1C<x>_Code generation options:'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
   '**2Cc<x>_Set default calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated fl','oating point opcodes'#010+
+  '**2Ce_Compilation with emul','ated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
   '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
   '**2Cg_Generate PIC code'#010+
-  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)',#010+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67','107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
   '**2Co_Check overflow of integer operations'#010+
   '**2CO_Check for possible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
-  '**2CP<x>=<y>_ packing settings'#010+
-  '**','3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+
-  '4 and 8'#010+
+  '**2CP<x>=<y>_ packing sett','ings'#010+
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
+  'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
-  '**2CX_Create',' also smartlinked library'#010+
+  '**2CX','_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
@@ -1081,54 +1081,54 @@ const msgtxt : array[0..000230,1..240] of char=(
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
-  '**1fPIC_Same as -Cg'#010+
-  '**1F<','x>_Set file names and paths:'#010+
+  '**1fPIC_Same as -C','g'#010+
+  '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2F','D<x>_Set the directory where to search for compiler utilities'#010+
+  '**2Fd_Disable the compiler'#039's internal directory cac','he'#010+
+  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
-  '**2Fl<x>_Add <x> ','to library path'#010+
+  '**2Fl<x>_A','dd <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
   'r'#010+
   '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
-  '**2FR<x>_Set resource (.res) linker to <x>'#010+
-  '**2Fu','<x>_Add <x> to unit path'#010+
+  '**2FR<x>_Set resource (.res) linker to <x','>'#010+
+  '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
-  '*g1g_Generate debu','g information (default format for target)'#010+
+  '*g1g_Genera','te debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
-  '*g2go<x>_Set debug information options'#010+
-  '*g','3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (b'+
-  'reaks gdb < 6.5)'#010+
+  '*g2go<x>_Set debug information opt','ions'#010+
+  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+  'aks gdb < 6.5)'#010+
   '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
   #010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
-  '*g2gp_Preserve case ','in stabs symbol names'#010+
+  '*g2gp_Preserv','e case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
   '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
-  '*g2gw2_Generate',' DWARFv2 debug information'#010+
+  '*g2gw2_G','enerate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2iSP_Return compiler host pr','ocessor'#010+
+  '**2iSP_Return compiler ','host processor'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
   '**1I<x>_Add <x> to include path'#010+
@@ -1136,65 +1136,65 @@ const msgtxt : array[0..000230,1..240] of char=(
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
-  '**2Mobjfpc_FPC mode with Ob','ject Pascal support'#010+
+  '**2Mobjfpc_FPC mode ','with Object Pascal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
   '**1N<x>_Node tree optimizations'#010+
-  '**2Nu_Unroll lo','ops'#010+
+  '**2Nu_Un','roll loops'#010+
   '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
   '**2O-_Disable optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
-  '**2O3_Level 3',' optimizations (-O2 + slow optimizations)'#010+
+  '**2O3_','Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
   '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
   'values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
-  '**2OW<x>_Generate whole','-program optimization feedback for optimizati'+
+  '**2OW<x>_Generat','e whole-program optimization feedback for optimizati'+
   'on <x>, see fpc -i for possible values'#010+
   '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
   'le values'#010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate profile code for gp','rof (defines FPC_PROFILE)'#010+
+  '**1pg_Generate profile code',' for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
-  '**1S<x>_Syntax options:'#010+
-  '**2','S2_Same as -Mobjfpc'#010+
+  '**1S<x>_Syntax optio','ns:'#010+
+  '**2S2_Same as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : Compiler halts after the <n> errors (default is 1',')'#010+
+  '**3*_<n> : Compiler halts after the <n> errors (defau','lt is 1)'#010+
   '**3*_w : Compiler also halts after warnings'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_h : Compiler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use ansistrings by default instead of shortstri','ngs'#010+
+  '**2Sh_Use ansistrings by default instead of sh','ortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_Support macros like ','C (global)'#010+
+  '**2Sm_Support macro','s like C (global)'#010+
   '**2So_Same as -Mtp'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Generate script to link on host'#010+
-  '**2st_G','enerate script to link on target'#010+
+  '**2sh_Generate script to link on host'#010,
+  '**2st_Generate script to link on target'#010+
   '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
-  '3*2','Tlinux_Linux'#010+
+  '3*2Tgo32v2_Version 2 of DJ Delorie DOS exten','der'#010+
+  '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
@@ -1202,7 +1202,7 @@ const msgtxt : array[0..000230,1..240] of char=(
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Twatcom_Watcom compatible DOS',' extender'#010+
+  '3*2Twatcom_Watcom compati','ble DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
@@ -1211,8 +1211,8 @@ const msgtxt : array[0..000230,1..240] of char=(
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
-  '6*2Tpalmos_PalmOS'#010+
-  'A*2Tlin','ux_Linux'#010+
+  '6*2Tpalmos_PalmOS'#010,
+  'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS on PowerPC'#010+
   'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
@@ -1220,84 +1220,82 @@ const msgtxt : array[0..000230,1..240] of char=(
   'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
-  '**1u<x>_Undefines the symbol <x>'#010+
-  '**1U_','Unit options:'#010+
+  '**1u<x>_Undefines the symbol <x','>'#010+
+  '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2','*_e : Show errors (default)       0 : Show nothing (except errors'+
-  ')'#010+
+  '**1v<x>_Be verbose. <x> is a combination of the following lette','rs:'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  c : Show conditio','nals'#010+
+  '**2*_h : Show hints                  c : Show c','onditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
   '**2*_s : Show time stamps            q : Show message numbers'#010+
-  '**2*_a : Show everything             x : Execu','table info (Win32 only'+
+  '**2*_a : Show everything             x ',': Executable info (Win32 only'+
   ')'#010+
   '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
   'e'#010+
   '**2*_    with full path              v : Write fpcdebug.txt with'#010+
   '**2*_                                    lots of debugging info'#010+
-  '**2*_m<x>,<y> :',' Don'#039't show messages numbered <x> and <y>'#010+
+  '**2*_m<x','>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
   '3*1W<x>_Target-specific options (targets)'#010+
   'A*1W<x>_Target-specific options (targets)'#010+
   'P*1W<x>_Target-specific options (targets)'#010+
   'p*1W<x>_Target-specific options (targets)'#010+
-  '3*2Wb_Create a bundle instead ','of a library (Darwin)'#010+
+  '3*2Wb_Create a bundle i','nstead of a library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
-  '3*2WC_Specify conso','le type application (EMX, OS/2, Windows)'#010+
+  '3*2WC_Specif','y console type application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  'A*2WD_Use DEFFILE to export func','tions of DLL or EXE (Windows)'#010+
+  'A*2WD_Use DEFFILE to expo','rt functions of DLL or EXE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
   'P*2We_Use external resources (Darwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic type application (E','MX, OS/2, Windows)'#010+
+  '3*2WG_Specify graphic type applica','tion (EMX, OS/2, Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
-  'p*2Wi_Use internal resources (Darwin)'#010+
-  '3*','2WN_Do not generate relocation code, needed for debugging (Windows'+
-  ')'#010+
+  'p*2Wi_Use internal resources (Dar','win)'#010+
+  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
-  'P*2WT_Specify MPW to','ol type application (Classic Mac OS)'#010+
+  'P*2WT_Specify',' MPW tool type application (Classic Mac OS)'#010+
   '3*2WX_Enable executable stack (Linux)'#010+
   'A*2WX_Enable executable stack (Linux)'#010+
   'p*2WX_Enable executable stack (Linux)'#010+
   'P*2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
-  '**2Xc_Pass --shared/-dynam','ic to the linker (BeOS, Darwin, FreeBSD, L'+
+  '**2Xc_Pass --shared','/-dynamic to the linker (BeOS, Darwin, FreeBSD, L'+
   'inux)'#010+
   '**2Xd_Do not use standard library search path (needed for cross compil'+
   'e)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
-  '**2XD_Try',' to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
+  '**','2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
   '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2','Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross co'+
-  'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XP<x>_Prepend the binutils names with the prefix ','<x>'#010+
+  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
+  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symbol','s from executable'#010+
+  '**2Xs_Strip all',' symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_Show this he','lp'#010+
+  '**1?_Show ','this help'#010+
   '**1h_Shows this help without waiting'
 );
diff --git a/compiler/ncon.pas b/compiler/ncon.pas
index da0da7c15d..9aebd2c290 100644
--- a/compiler/ncon.pas
+++ b/compiler/ncon.pas
@@ -291,15 +291,23 @@ implementation
         p1:=nil;
         case p.consttyp of
           constord :
-            p1:=cordconstnode.create(p.value.valueord,p.constdef,true);
+            begin
+              if p.constdef=nil then
+                internalerror(200403232);
+              p1:=cordconstnode.create(p.value.valueord,p.constdef,true);
+            end;
           conststring :
             begin
               len:=p.value.len;
+              if not(cs_ansistrings in current_settings.localswitches) and (len>255) then
+               len:=255;
               getmem(pc,len+1);
               move(pchar(p.value.valueptr)^,pc^,len);
               pc[len]:=#0;
               p1:=cstringconstnode.createpchar(pc,len);
             end;
+          constwstring :
+            p1:=cstringconstnode.createwstr(pcompilerwidestring(p.value.valueptr));
           constreal :
             p1:=crealconstnode.create(pbestreal(p.value.valueptr)^,pbestrealtype^);
           constset :
@@ -308,6 +316,8 @@ implementation
             p1:=cpointerconstnode.create(p.value.valueordptr,p.constdef);
           constnil :
             p1:=cnilnode.create;
+          constguid :
+            p1:=cguidconstnode.create(pguid(p.value.valueptr)^);
           else
             internalerror(200205103);
         end;
diff --git a/compiler/pdecl.pas b/compiler/pdecl.pas
index 09363b2bdc..f35bc9fc04 100644
--- a/compiler/pdecl.pas
+++ b/compiler/pdecl.pas
@@ -36,6 +36,7 @@ interface
     function  readconstant(const orgname:string;const filepos:tfileposinfo):tconstsym;
 
     procedure const_dec;
+    procedure consts_dec(in_class: boolean);
     procedure label_dec;
     procedure type_dec;
     procedure types_dec(in_class: boolean);
@@ -154,8 +155,13 @@ implementation
         readconstant:=hp;
       end;
 
-
     procedure const_dec;
+      begin
+        consume(_CONST);
+        consts_dec(false);
+      end;
+
+    procedure consts_dec(in_class: boolean);
       var
          orgname : TIDString;
          hdef : tdef;
@@ -168,7 +174,6 @@ implementation
          tclist : tasmlist;
          varspez : tvarspez;
       begin
-         consume(_CONST);
          old_block_type:=block_type;
          block_type:=bt_const;
          repeat
@@ -189,6 +194,7 @@ implementation
                      begin
                        sym.symoptions:=sym.symoptions+dummysymoptions;
                        sym.deprecatedmsg:=deprecatedmsg;
+                       sym.visibility:=symtablestack.top.currentvisibility;
                        symtablestack.top.insert(sym);
                      end
                    else
@@ -213,6 +219,7 @@ implementation
                    else
                      varspez:=vs_value;
                    sym:=tstaticvarsym.create(orgname,varspez,hdef,[]);
+                   sym.visibility:=symtablestack.top.currentvisibility;
                    current_tokenpos:=storetokenpos;
                    symtablestack.top.insert(sym);
                    { procvar can have proc directives, but not type references }
@@ -255,7 +262,7 @@ implementation
                 { generate an error }
                 consume(_EQUAL);
            end;
-         until token<>_ID;
+         until (token<>_ID)or(in_class and (idtoken in [_PRIVATE,_PROTECTED,_PUBLIC,_PUBLISHED,_STRICT]));
          block_type:=old_block_type;
       end;
 
diff --git a/compiler/pdecobj.pas b/compiler/pdecobj.pas
index 061460844c..72a74518e7 100644
--- a/compiler/pdecobj.pas
+++ b/compiler/pdecobj.pas
@@ -553,7 +553,7 @@ implementation
               begin
                 if (([df_generic,df_specialization]*current_objectdef.defoptions)=[]) and
                    (current_objectdef.objecttype<>odt_class) then
-                  Message(parser_e_type_and_var_only_in_generics_and_classes);
+                  Message(parser_e_type_var_const_only_in_generics_and_classes);
                  consume(_TYPE);
                  object_member_blocktype:=bt_type;
               end;
@@ -561,13 +561,21 @@ implementation
               begin
                 if (([df_generic,df_specialization]*current_objectdef.defoptions)=[]) and
                    (current_objectdef.objecttype<>odt_class) then
-                  Message(parser_e_type_and_var_only_in_generics_and_classes);
+                  Message(parser_e_type_var_const_only_in_generics_and_classes);
                 consume(_VAR);
                 fields_allowed:=true;
                 object_member_blocktype:=bt_general;
                 classfields:=is_classdef;
                 is_classdef:=false;
               end;
+            _CONST:
+              begin
+                if (([df_generic,df_specialization]*current_objectdef.defoptions)=[]) and
+                   (current_objectdef.objecttype<>odt_class) then
+                  Message(parser_e_type_var_const_only_in_generics_and_classes);
+                consume(_CONST);
+                object_member_blocktype:=bt_const;
+              end;
             _ID :
               begin
                 if is_objcprotocol(current_objectdef) and
@@ -671,7 +679,13 @@ implementation
                               read_record_fields([vd_object])
                           end
                         else
-                          types_dec(true);
+                        if object_member_blocktype=bt_type then
+                          types_dec(true)
+                        else
+                        if object_member_blocktype=bt_const then
+                          consts_dec(true)
+                        else
+                          internalerror(201001110);
                       end;
                 end;
               end;
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index b4d06d36c7..c00281c878 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -1252,7 +1252,12 @@ implementation
                    begin
                      p1:=ctypenode.create(ttypesym(sym).typedef);
                    end;
-                 else internalerror(16);
+                 constsym:
+                   begin
+                     p1:=genconstsymtree(tconstsym(sym));
+                   end
+                 else
+                   internalerror(16);
               end;
            end;
       end;
@@ -1559,44 +1564,14 @@ implementation
 
                 constsym :
                   begin
-                    case tconstsym(srsym).consttyp of
-                      constord :
-                        begin
-                          if tconstsym(srsym).constdef=nil then
-                            internalerror(200403232);
-                          p1:=cordconstnode.create(tconstsym(srsym).value.valueord,tconstsym(srsym).constdef,true);
-                        end;
-                      conststring :
-                        begin
-                          len:=tconstsym(srsym).value.len;
-                          if not(cs_ansistrings in current_settings.localswitches) and (len>255) then
-                           len:=255;
-                          getmem(pc,len+1);
-                          move(pchar(tconstsym(srsym).value.valueptr)^,pc^,len);
-                          pc[len]:=#0;
-                          p1:=cstringconstnode.createpchar(pc,len);
-                        end;
-                      constwstring :
-                        p1:=cstringconstnode.createwstr(pcompilerwidestring(tconstsym(srsym).value.valueptr));
-                      constreal :
-                        p1:=crealconstnode.create(pbestreal(tconstsym(srsym).value.valueptr)^,pbestrealtype^);
-                      constset :
-                        p1:=csetconstnode.create(pconstset(tconstsym(srsym).value.valueptr),tconstsym(srsym).constdef);
-                      constpointer :
-                        p1:=cpointerconstnode.create(tconstsym(srsym).value.valueordptr,tconstsym(srsym).constdef);
-                      constnil :
-                        p1:=cnilnode.create;
-                      constresourcestring:
-                        begin
-                          p1:=cloadnode.create(srsym,srsymtable);
-                          do_typecheckpass(p1);
-                          p1.resultdef:=cansistringtype;
-                        end;
-                      constguid :
-                        p1:=cguidconstnode.create(pguid(tconstsym(srsym).value.valueptr)^);
-                      else
-                        internalerror(200507181);
-                    end;
+                    if tconstsym(srsym).consttyp=constresourcestring then
+                      begin
+                        p1:=cloadnode.create(srsym,srsymtable);
+                        do_typecheckpass(p1);
+                        p1.resultdef:=cansistringtype;
+                      end
+                    else
+                      p1:=genconstsymtree(tconstsym(srsym));
                   end;
 
                 procsym :
diff --git a/tests/test/tclass12a.pp b/tests/test/tclass12a.pp
new file mode 100644
index 0000000000..0616ae210c
--- /dev/null
+++ b/tests/test/tclass12a.pp
@@ -0,0 +1,23 @@
+program tclass12a;
+{$ifdef fpc}
+  {$mode delphi}
+{$endif}
+{$apptype console}
+
+type
+  TSomeClass = class
+  strict private
+    const
+      PrivateConst = 3.14;
+  public
+    class procedure WritePrivateConst; static;
+  end;
+
+  class procedure TSomeClass.WritePrivateConst;
+  begin
+    WriteLn(PrivateConst);
+  end;
+
+begin
+  TSomeClass.WritePrivateConst;
+end.
\ No newline at end of file
diff --git a/tests/test/tclass12b.pp b/tests/test/tclass12b.pp
new file mode 100644
index 0000000000..f178c9a704
--- /dev/null
+++ b/tests/test/tclass12b.pp
@@ -0,0 +1,27 @@
+{ %FAIL}
+program tclass12b;
+{$ifdef fpc}
+  {$mode delphi}
+{$endif}
+{$apptype console}
+
+type
+  TSomeClass = class
+  strict private
+    const
+      PrivateConst = 3.14;
+  end;
+
+  TAnotherClass = class(TSomeClass)
+  public
+    class procedure WritePrivateConst; static;
+  end;
+
+  class procedure TAnotherClass.WritePrivateConst;
+  begin
+    WriteLn(PrivateConst)
+  end;
+
+begin
+  TAnotherClass.WritePrivateConst
+end.