diff --git a/compiler/i386/cpuinfo.pas b/compiler/i386/cpuinfo.pas
index a89f0bbe6b..da1ece5b65 100644
--- a/compiler/i386/cpuinfo.pas
+++ b/compiler/i386/cpuinfo.pas
@@ -51,7 +51,7 @@ Type
 
    tfputype =
      (fpu_none,
-      fpu_soft,
+//      fpu_soft,
       fpu_x87,
       fpu_sse,
       fpu_sse2,
@@ -84,7 +84,7 @@ Const
    );
 
    fputypestr : array[tfputype] of string[6] = ('',
-     'SOFT',
+//     'SOFT',
      'X87',
      'SSE',
      'SSE2',
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 16e69e733b..a02042e5f6 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -348,6 +348,8 @@ scan_e_only_packset=02080_E_Illegal set packing value
 scan_w_pic_ignored=02081_W_PIC directive ignored
 % Several targets like windows do not support the PIC directive and need it to be
 % ignored.
+scan_w_unsupported_switch_by_target=02082_W_The switch "$1" is not supported by the currently selected target
+% Some compiler switches like $E are not supported by all targets.
 % \end{description}
 #
 # Parser
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 07fdb678f5..990c532342 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -102,6 +102,7 @@ const
   scanner_e_illegal_warn_state=02079;
   scan_e_only_packset=02080;
   scan_w_pic_ignored=02081;
+  scan_w_unsupported_switch_by_target=02082;
   parser_e_syntax_error=03000;
   parser_e_dont_nest_interrupt=03004;
   parser_w_proc_directive_ignored=03005;
@@ -722,9 +723,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 43132;
+  MsgTxtSize = 43206;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,82,235,79,63,49,107,22,135,60,
+    24,83,235,79,63,49,107,22,135,60,
     42,1,1,1,1,1,1,1,1,1
   );
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index ed97ffee73..4287c2ba8f 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000179] of string[240]=(
+const msgtxt : array[0..000180] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000179,1..240] of char=(
+const msgtxt : array[0..000180,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -108,695 +108,696 @@ const msgtxt : array[0..000179,1..240] of char=(
   '02079_E_Illegal state for $WARN directive'#000+
   '02080_E_Illegal set packing value'#000+
   '02081_W_PIC directive ignored'#000+
-  '03000_E_Parser - Synta','x Error'#000+
+  '02082_W_The switch "$1','" is not supported by the currently selected t'+
+  'arget'#000+
+  '03000_E_Parser - Syntax Error'#000+
   '03004_E_INTERRUPT procedure can'#039't be nested'#000+
   '03005_W_Procedure type "$1" ignored'#000+
   '03006_E_Not all declarations of "$1" are declared with OVERLOAD'#000+
-  '03008_E_Duplicate exported function name "$1"'#000+
-  '03009_E_Duplicate exported function index ','$1'#000+
+  '03008_E_Duplic','ate exported function name "$1"'#000+
+  '03009_E_Duplicate exported function index $1'#000+
   '03010_E_Invalid index for exported function'#000+
   '03011_W_Relocatable DLL or executable $1 debug info does not work, dis'+
   'abled.'#000+
-  '03012_W_To allow debugging for win32 code you need to disable relocati'+
-  'on with -WN option'#000+
-  '03013_E_Constructor name mu','st be INIT'#000+
+  '03012_W_To allow debugging for win32 code ','you need to disable reloca'+
+  'tion with -WN option'#000+
+  '03013_E_Constructor name must be INIT'#000+
   '03014_E_Destructor name must be DONE'#000+
   '03016_E_Procedure type INLINE not supported'#000+
   '03018_W_Constructor should be public'#000+
   '03019_W_Destructor should be public'#000+
-  '03020_N_Class should have one destructor only'#000+
-  '03021_E_Local class definitio','ns are not allowed'#000+
+  '0','3020_N_Class should have one destructor only'#000+
+  '03021_E_Local class definitions are not allowed'#000+
   '03022_F_Anonymous class definitions are not allowed'#000+
   '03023_N_The object "$1" has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
-  '03026_E_Wrong number of parameters specified for call to "$1"'#000+
-  '03027_E_overloaded identifier "$1" isn'#039't ','a function'#000+
+  '03026_E_Wrong number of param','eters specified for call to "$1"'#000+
+  '03027_E_overloaded identifier "$1" isn'#039't a function'#000+
   '03028_E_overloaded functions have the same parameter list'#000+
   '03029_E_function header doesn'#039't match the forward declaration "$1"'+
   #000+
-  '03030_E_function header "$1" doesn'#039't match forward : var name chan'+
-  'ges $2 => $3'#000+
-  '03031_N_Values in enumera','tion types have to be ascending'#000+
+  '03030_E_function header "$1" d','oesn'#039't match forward : var name ch'+
+  'anges $2 => $3'#000+
+  '03031_N_Values in enumeration types have to be ascending'#000+
   '03033_E_With can not be used for variables in a different segment'#000+
   '03034_E_function nesting > 31'#000+
-  '03035_E_range check error while evaluating constants'#000+
+  '03035_E_range check error while evalua','ting constants'#000+
   '03036_W_range check error while evaluating constants'#000+
-  '03037_','E_duplicate case label'#000+
+  '03037_E_duplicate case label'#000+
   '03038_E_Upper bound of case range is less than lower bound'#000+
   '03039_E_typed constants of classes or interfaces are not allowed'#000+
-  '03040_E_functions variables of overloaded functions are not allowed'#000+
-  '03041_E_string length mus','t be a value from 1 to 255'#000+
+  '03040_E_functions v','ariables of overloaded functions are not allowed'#000+
+  '03041_E_string length must be a value from 1 to 255'#000+
   '03042_W_use extended syntax of NEW and DISPOSE for instances of object'+
   's'#000+
   '03043_W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
-  '03044_E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
-  '03045_E_','class identifier expected'#000+
+  '0','3044_E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
+  '03045_E_class identifier expected'#000+
   '03046_E_type identifier not allowed here'#000+
   '03047_E_method identifier expected'#000+
-  '03048_E_function header doesn'#039't match any method of this class "$1'+
-  '"'#000+
+  '03048_E_function header doesn'#039't match any method of this class "','$'+
+  '1"'#000+
   '03049_DL_procedure/function $1'#000+
-  '03050_E_Illegal floating point constant',#000+
+  '03050_E_Illegal floating point constant'#000+
   '03051_E_FAIL can be used in constructors only'#000+
   '03052_E_Destructors can'#039't have parameters'#000+
   '03053_E_Only class methods can be referred with class references'#000+
-  '03054_E_Only class methods can be accessed in class methods'#000+
-  '03055_E_Constant and CASE ','types do not match'#000+
+  '03054_E_Only',' class methods can be accessed in class methods'#000+
+  '03055_E_Constant and CASE types do not match'#000+
   '03056_E_The symbol can'#039't be exported from a library'#000+
   '03057_W_An inherited method is hidden by "$1"'#000+
-  '03058_E_There is no method in an ancestor class to be overridden: "$1"'+
-  #000+
+  '03058_E_There is no method in an ancestor class t','o be overridden: "$'+
+  '1"'#000+
   '03059_E_No member is provided to access property'#000+
-  '030','60_W_Stored property directive is not yet implemented'#000+
+  '03060_W_Stored property directive is not yet implemented'#000+
   '03061_E_Illegal symbol for property access'#000+
   '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 mu','st have the same return type: "$2" is o'+
-  'verriden by "$1" which has another return type'#000+
+  '03063_E_Can','not access a private field of an object here'#000+
+  '03066_E_Overridden methods must have the same return type: "$2" is ove'+
+  'rriden 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',
+  '03068_E_Methods can'#039't be EXPOR','Ted'#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 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+
+  '03072_E_Methods can be only in other methods called direct w','ith type'+
+  ' identifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#000+
-  '03074_E_range ','check error in set constructor or duplicate set elemen'+
-  't'#000+
+  '03074_E_range check error in set constructor or duplicate set element'#000+
   '03075_E_Pointer to object expected'#000+
   '03076_E_Expression must be constructor call'#000+
-  '03077_E_Expression must be destructor call'#000+
+  '03077_E_Expression must be dest','ructor call'#000+
   '03078_E_Illegal order of record elements'#000+
-  '03079_E_Expression ty','pe must be class or record type'#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 ope','rator overload'#000+
+  '03083_','E_Impossible to overload assignment for equal types'#000+
+  '03084_E_Impossible operator overload'#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 (overload = inst',
-  'ead)'#000+
+  '03088_E_Procedure overloading is switched',' off'#000+
+  '03089_E_It is not possible to overload this operator (overload = inste'+
+  'ad)'#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_Unknown procedure directive had to be ignored: "$1"'#000+
+  '03093_E_The mix of diff','erent kind of objects (class, object, interfa'+
+  'ce, etc) isn'#039't allowed'#000+
+  '03094_W_Unknown 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+
+  '03096_E_absolute can only be associated with a var or co','nst'#000+
   '03097_E_Only one variable can be initialized'#000+
-  '03098_E_Abstract methods ','shouldn'#039't have any definition (with fun'+
-  'ction body)'#000+
+  '03098_E_Abstract methods shouldn'#039't have any definition (with funct'+
+  'ion 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+
+  '03100_W_Virtual methods are used without a const','ructor in "$1"'#000+
   '03101_CL_Macro defined: $1'#000+
   '03102_CL_Macro undefined: $1'#000+
-  '031','03_CL_Macro $1 set to $2'#000+
+  '03103_CL_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 a','llowed'#000+
+  '03','109_E_No property found to override'#000+
+  '03110_E_Only one default property is allowed'#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+
+  '03113_E_No default property availa','ble'#000+
   '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
-  'itch',#000+
+  'itch'#000+
   '03115_E_Forward declaration of class "$1" must be resolved here to use'+
   ' 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 allow','ed in implementation secti'+
-  'on'#000+
+  '03117_E_Procedure directive "$1" n','ot allowed in interface section'#000+
+  '03118_E_Procedure directive "$1" not allowed in implementation section'+
+  #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 inlin','e procedure/function'#000+
+  '03121_E_Can'#039,'t use both EXPORT and EXTERNAL'#000+
+  '03123_W_"$1" not yet supported inside inline procedure/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+
+  '03127_F_Selected assembler reader not supp','orted'#000+
+  '03128_E_Procedure directive "$1" has conflicts with other directives'#000+
   '03129_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+
+  '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+
   '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+
+  '03140_E_Upper bound of range is less than lower bo','und'#000+
   '03141_W_string "$1" is longer than "$2"'#000+
-  '03142_E_string length is large','r than array of char length'#000+
+  '03142_E_string length is larger than 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',' which are '+
-  'message handlers'#000+
+  '03145_E_Duplicate mes','sage label: "$1"'#000+
+  '03146_E_Self can only be an explicit parameter in methods which are me'+
+  'ssage 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_','OVERRIDE can'#039't be used in objects'#000+
+  '03149_W_Don'#039't load OBJPAS ','unit manually, use \{\$mode objfpc\} o'+
+  'r \{\$mode delphi\} instead'#000+
+  '03150_E_OVERRIDE 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+
+  '03152_E_Resourcestrings can be only st','atic or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
-  '03154_E_The t','ype of 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 class which are compiled in $M+ mode can be published'#000+
-  '03157_E_Procedure directive expected'#000+
-  '03158_E_The value for a property index mus','t be of an ordinal type'#000+
+  '03157','_E_Procedure directive expected'#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',
+  '03161_E_Compile without -WD opt','ion'#000+
+  '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
   'ule'#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 identifi','er expected'#000+
+  '03168_W_Procedure named "$1" not fo','und that is suitable for implemen'+
+  'ting the $2.$3'#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'#000+
+  '03172_E_Access specifiers can'#039't be used in I','NTERFACES'#000+
   '03173_E_An interface can'#039't contain fields'#000+
-  '03174_E_Can'#039't declare ','local procedure as EXTERNAL'#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" weren'#039't initialized'#000+
-  '03178_E_VarArgs directive (or '#039'...'#039' ','in MacPas) without CDecl'+
-  '/CPPDecl/MWPascal and External'#000+
+  '03177_W_Some fields ','coming after "$1" weren'#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+
+  '03180_E_Interface "$1" has no interface identification'#000,
   '03181_E_Unknown class field or method identifier "$1"'#000+
-  '03182_W_Overriding c','alling convention "$1" with "$2"'#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+
+  '03184_E_Default value can only be assigned',' to one parameter'#000+
   '03185_E_Default parameter required for "$1"'#000+
-  '03186_W_Use ','of unsupported feature!'#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+
-  '03191_W_cdecl'#039'ared functions do not suppo','rt open strings'#000+
+  '03190_W_cdecl'#039'ared ','functions have no high 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+
+  '03194_E_Procedure or Function expected'#000,
   '03195_W_Calling convention directive ignored: "$1"'#000+
-  '03196_E_REINTRODUCE can',#039't be used in objects'#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 pointer variable expected'#000+
-  '03201_E_Goto statements aren'#039't',' allowed between different procedu'+
-  'res'#000+
+  '03200_E_','32 Bit-Integer or pointer 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+
+  '0320','5_E_Illegal qualifier'#000+
   '03206_E_High range limit < low range limit'#000+
-  '03207_E_E','xit'#039's parameter must be the name of the procedure it is'+
-  ' used in'#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+
+  '03209_E_Can'#039't declare local variable as EXTERNAL'#000,
   '03210_E_Procedure is already declared EXTERNAL'#000+
-  '03211_W_Implicit uses of Va','riants unit'#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+
-  '03216_E_A DISPINTERFACE can'#039't have',' a parent class'#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 "$'+
-  '1" which has another return type)'#000+
-  '03219_E_Dispa','tch IDs must be ordinal constants'#000+
+  'may crash, it depends on a Delphi parser bu','g ("$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 cannot be packed'#000+
-  '03223_E_Bit packed array elements and r','ecord fields cannot be used a'+
-  's loop variables'#000+
+  '03222','_E_Dynamic arrays cannot be packed'#000+
+  '03223_E_Bit packed array elements and record fields cannot be used as '+
+  'loop variables'#000+
   '03224_E_VAR and TYPE are allowed only in generics'#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 t','ype specified for function "$1"'#000+
+  '03226_W_Don'#039't load LINEINFO unit ','manually, 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 spezializing gen'+
   'erics'#000+
-  '03230_E_Constants of objects containing a VMT aren'#039't allowed'#000+
-  '03231_E_Taking t','he address of labels defined outside the current sco'+
-  'pe isn'#039't allowed'#000+
+  '032','30_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+
   '03232_F_Anonymous generic specializations are not allowed'#000+
-  '03233_E_Cannot initialize variables declared as external'#000+
+  '03233_E_Cannot initialize variables dec','lared as external'#000+
   '03234_E_Illegal function result type'#000+
-  '04000_E_Type mismat','ch'#000+
+  '04000_E_Type mismatch'#000+
   '04001_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+
+  '04004_E_Variable identifier expecte','d'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_Boolean expres','sion expected, but got "$1"'#000+
+  '04006_E_Boolean expression expected, 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+
+  '04011_E_Can'#039't ev','aluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
-  '04013_E','_Operation not implemented for sets'#000+
+  '04013_E_Operation 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+
+  '04015_H_use DIV instead to get an integer re','sult'#000+
   '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
-  '04017_E_succ ','or pred on enums 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,
+  '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 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 (variabl','e) and Procedure (variable) are not compatibl'+
-  'e'#000+
+  '04025_E_Incompa','tible 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 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/funct','ion to procedure varia'+
-  'ble'#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 assign values to const variable'#000+
   '04033_E_Array type required'#000+
-  '04034_E_interface type expected, but got "$1"'#000+
-  '04035_W_Mixing signed expressions and longwords give','s a 64bit result'+
-  #000+
+  '04034_E_interface type e','xpected, but got "$1"'#000+
+  '04035_W_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+
   '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 Ob','ject types "$1" and "$2" are not related'#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 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 sh','ort string length'#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_Comparison is always true due to range of values'#000+
-  '04046_W_Constructing a class "$1" with abstract methods'#000+
-  '04047_H_The left operand of the IN operator should ','be byte sized'#000+
+  '04046_W_Constructing a class "$1"',' with abstract methods'#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',' parameters and open arrays are not pos'+
-  'sible'#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+
   '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+
+  '04054_E_Illegal type co','nversion: "$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+
   '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',
+  '04058_E_Illegal counter varia','ble'#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 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_Incompatible type for arg no. $1: Got "$2" expected "(not pa'+
-  'cked) Array"'#000+
+  '04062_E_Inc','ompatible type for arg no. $1: Got "$2" expected "(Bit)Pa'+
+  'cked 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 be'+
   ' initialised'#000+
-  '04065_E_Constant packed records and objects are not yet supported'#000+
-  '04066_W_Arithme','tic "$1" on untyped pointer is unportable to {$T+}, s'+
-  'uggest typecast'#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+
-  '04077_E_Can'#039't export subroutine marked as local from a unit'#000+
+  '04077_E_Can'#039't export subroutine marked',' as local from a unit'#000+
   '04078_E_Type is not automatable: "$1"'#000+
-  '05000_E_Identi','fier not found "$1"'#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+
+  '05004_E_Unknown id','entifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
-  '05007_E_Error in',' type definition'#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',' '+
-  'not allowed'#000+
+  '05012_F_record or class type ex','pected'#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+
   '05016_E_Illegal label declaration'#000+
-  '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
+  '05017_E_GOTO and LABEL are not supported (use sw','itch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
-  '05020_E','_label already defined'#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+
+  '05024_H_Pa','rameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
-  '05026_H_Value p','arameter "$1" is assigned but never 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+
+  '05029_N_Private field "$1.$2" is nev','er used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
-  '05031_N_P','rivate method "$1.$2" 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+
+  '05034_W_Type "$1" is not aligned correctly in current recor','d for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
-  '05036_W_Local variabl','e "$1" does not seem to be initialized'#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 implementation for interf','ace method "$1" found'#000+
+  '05','040_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 portable'#000+
   '05055_W_Symbol "$1" is not implemented'#000+
-  '05056_E_Can'#039't create unique type from this type'#000+
+  '05056_E_Can'#039't create unique type fr','om this type'#000+
   '05057_H_Local variable "$1" does not seem to be initialized'#000+
-  '0','5058_H_Variable "$1" does not 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+
+  '05060_H_Function result variable does not seem to b','e initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
-  '05062_H_Foun','d abstract method: $1'#000+
+  '05062_H_Found abstract method: $1'#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+
+  '0','6015_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+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06027_DL_Register $1 weight $2 $3'#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 calle','d inside a '#039'w'+
-  'ith'#039' clause'#000+
+  'sed, us','e (set)length instead'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
+  'th'#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 certa','in cpu'#039's'#000+
+  '06040_E_Control flow statements aren'#039't ','allowed in a finally bloc'+
+  'k'#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 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 '+
-  'time library.'#000+
+  '06045_E_CONTINUE no','t 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+
   '06048_H_Inherited call to abstract method ignored'#000+
-  '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finished $1 styled assembler par','sing'#000+
+  '07000_DL_Star','ting $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 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,
+  '07007_E_Can','not 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+
   '07012_E_Invalid constant expression'#000+
-  '07013_E_Relocatable symbol is not allowed'#000+
+  '07013_E_Re','locatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
-  '07015_E_Y','ou can not reach $1 from that code'#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_Invalid base and index register usage'#000+
-  '07018_W_Possible error in object field handling'#000+
+  '07018_W_Possible error in o','bject field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
-  '07020_E_Multiple',' index register usage'#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+
-  '07024_E_Null label references are not allowed'#000+
+  '07024_E_Null label references ar','e not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
-  '07026_E_Illegal expr','ession'#000+
+  '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#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+
+  '07030_W_$1 without operand translat','ed into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '070','32_W_Calling an overload function in assembler'#000+
+  '07032_W_Calling an overload function in assembler'#000+
   '07033_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+
+  '07','036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
-  '07038_E','_Error converting hexadecimal $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+
   '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 an','y value in asm code'#000+
+  '07042_E_Canno','t 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 not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix and destination or source size do no','t match'#000+
   '07047_E_Assembler syntax error'#000+
-  '07048_E_Invalid combination of opco','de and operands'#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+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
+  '07052_W_constant with symbol $1',' for address which is not on a pointe'+
+  'r'#000+
   '07053_E_Unrecognized opcode $1'#000+
-  '0705','4_E_Invalid or missing opcode'#000+
+  '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on line'#000+
+  '07057_E_Too many operands on',' line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
-  '07060_E_Duplicate local sym','bol $1'#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+
   '07064_E_Invalid floating point register name'#000+
-  '07066_W_Modulo not supported'#000+
+  '07066_W_Modulo',' not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
-  '07068_E_Invalid ','floating point expression'#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+
   '07071_E_Invalid segment override expression'#000+
-  '07072_W_Identifier $1 supposed external'#000+
+  '07072_W_','Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '0','7074_No type of variable specified'#000+
+  '07074_No type of variable specified'#000+
   '07075_E_assembler 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+
+  '07077_E_Using a defined name as a lo','cal label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
-  '07079_W_32bit',' constant created for address'#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+
-  '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to det','ermine the size of the op'+
-  'erands'#000+
+  '07082_E_Can'#039't access fiel','ds 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 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,
+  '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_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
-  '07096_E_Reglist invalid for opcode'#000+
+  '0','7096_E_Reglist invalid for opcode'#000+
   '07097_E_Higher cpu mode required ($1)'#000+
-  '07','098_W_No size specified and unable to determine the size of the op'+
-  'erands, using DWORD as default'#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+
-  '07100_E_Address of packed component is not at a byte boundary'#000+
-  '07101_W_No size spec','ified and unable to determine the size of the op'+
-  'erands, using BYTE as default'#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+
-  '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
-  #000+
-  '07104_W_Use of -offset(%ebp) is no','t recommended for local variable a'+
-  'ccess'#000+
+  '07103_W_Use of +offset(%ebp) is',' not compatible with regcall conventi'+
+  'on'#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 value may be'+
   ' lost'#000+
-  '07106_E_VMTOffset must be used in combination with a virtual method, a'+
-  'nd "$1" is not virtual'#000+
-  '08000_F_Too many assembler file','s'#000+
+  '07106_E_VMTOffset must be used in combination with',' a virtual method,'+
+  ' and "$1" is not virtual'#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 section'#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 no','t in table'#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: Immediate or reference expected'#000+
+  '08010_E_Asm:',' Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '0','8012_E_Asm: Short jump is out of range $1'#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 this target'#000+
+  '08015_E_Asm: Extended type not supporte','d for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
-  '08017_E_Asm: Redefined l','abel $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+
+  '08021_E_Asm: 64 Bit operands not supported',#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
-  '09','002_E_Can'#039't create assembler file: $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 assembling'#000+
+  '09005_E_Assembler $1 not found, switching to external',' assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_E_Error while assembling exi','tcode $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+
-  '09012_W_Library $1 not found, Linking may fai','l !'#000+
+  '09011_W_Object $1 n','ot 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+
+  '09016_E_Util $1 not found, switching to external linki','ng'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '090','19_E_Creation of Dynamic/Shared Libraries not supported'#000+
+  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler 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 l','i'+
-  'nking'#000+
+  '09022_I_Compiling re','source $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 smart 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+
-  '0','9028_D_Calling resource compiler "$1" with "$2" as command line'#000+
+  '09028_D_Calling resource compiler "$1" with "$2" as command line'#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+
+  '09130_X_Size of Code: $1 byt','es'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
-  '09132_X_Size of uninitialize','d 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+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
-  '10003_U_PPU Flags: $1'#000+
+  '100','03_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU Fi','le too short'#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',' an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't W','rite PPU-File'#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+
   '10017_F_PPU Dbx count problem'#000+
-  '10018_E_Illegal unit name: $1'#000+
+  '10018_E_Illegal unit ','name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1',' and $2'#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+
   '10023_W_Unit $1 was not found but $2 exists'#000+
-  '10024_F_Unit $1 searched but $2 found'#000+
+  '10024_F_Unit $1 searched',' but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10','026_F_There were $1 errors compiling module, stopping'#000+
+  '10026_F_There were $1 errors compiling module, stopping'#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+
+  '10029_U_Recompiling $1, source',' found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '100','31_U_Recompiling unit, shared 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+
   '10033_U_Recompiling unit, obj is older than asm'#000+
-  '10034_U_Parsing interface of $1'#000+
+  '1','0034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_','U_Second load for unit $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 unit $1, but found modifed include files'#000+
-  '10041_U_File $1 is newer than PPU file $2'#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+
+  'ode'#000+
   '10043_U_Loading interface 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+
+  '10046_U_Implementation CRC changed for',' unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
-  '10048_U_Add dependency of $1 t','o $2'#000+
+  '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
-  '10053_U_Previous state of $1: $2'#000+
+  '10053_U_Previous state of ','$1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
-  '10055_U_Loadin','g unit $1'#000+
+  '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
+  '10059_U_Skipping re-resolving unit $1, still loading used unit','s'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file ','supported'#000+
+  '11001_W_Only one source file supported'#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+
+  '11005_N_No option ','inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
-  '11007_H_-? writes help',' pages'#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 DOS platform, reverting to static'+
-  #000+
-  '11013_F_too many ','IF(N)DEFs'#000+
+  '11012_W_Shared',' libs not supported on DOS platform, reverting to stat'+
+  'ic'#000+
+  '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
-  '11017_H_Try recompiling with -dGDB'#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+
+  '11019_W_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11021_W_Assembler output selected "$1" is not c','ompatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11026_T_Reading opti','ons from file $1'#000+
+  '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
-  '11031_H_End of reading config file $1'#000+
+  '11031_H_E','nd of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
-  '11036_D_inte','rpreting firstpass option "$1"'#000+
+  '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
   '11034_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, d'+
-  'ebugging disabled'#000+
+  '11','040_F_Config file $1 is a directory'#000+
+  '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
+  'ugging disabled'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copyright (c) 1993-2007 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-2007 by Florian Klaempfl'#000,
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
-  'Compiler Date      : $FPCD','ATE'#010+
+  'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
@@ -806,245 +807,245 @@ const msgtxt : array[0..000179,1..240] of char=(
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
-  '  $FPUINSTRUCTIONSETS'#010+
+  '  $FPUINSTRUCTI','ONSETS'#010+
   #010+
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
-  'This program comes unde','r the GNU General Public Licence'#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+
   '                 bugs@freepascal.org'#000+
-  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
-  'ble it'#010+
-  '**1a_the compiler does','n'#039't delete the generated assembler file'#010+
+  '11025_**0*_put + after a ','boolean switch option to enable it, - to di'+
+  'sable it'#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 assemb','ler file'#010+
+  '*L2ap_use pipes instead of creating tempo','rary assembler files'#010+
+  '**2ar_list register allocation/release 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*2Anasmcoff_','coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
-  '3*','2Anasmwin32_Win32 object file 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*2Ama','sm_obj file using Masm (Microsoft)'#010+
+  '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Aelf_elf32 (Linux) using internal writer'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '4*2Aas_assemble using GNU AS'#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*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+
+  '**1b_generate browser inf','o'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
-  '**1C<x>_code gen','eration options:'#010+
+  '**1C<x>_code generation options:'#010+
   '**2Cc<x>_set default calling convention to <x>'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating point opcodes'#010+
+  '**2Ce_Compilation with emulated floating point opcod','es'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
-  'l','ues'#010+
+  'lues'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
-  '**2Co_check overflow of integer operations'#010+
+  '**2Co_check overflow of integer operations'#010,
   '**2Cp<x>_select instruction set, see fpc -i for possible values'#010+
-  '**2CP<x>=<','y>_ packing settings'#010+
+  '**2CP<x>=<y>_ packing settings'#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 size to <n>'#010+
+  '**2Cs<n','>_set stack size to <n>'#010+
   '**2Ct_stack checking'#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+
   '**2Dv<x>_set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_set path to executable'#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+
+  '**1F<x>_set file names and paths:'#010+
   '**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
   ' parsed'#010+
   '**2Fc<x>_sets input codepage to <x>'#010+
-  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
+  '**2FD<x>_sets the directory where to sea','rch for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
-  '**2FE<x>_','set exe/unit output path to <x>'#010+
+  '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '**2FL<x>_uses <x> as dynamic linker'#010+
-  '**2Fm<x>_load unicode conversion table from <x>.txt in the compiler di'+
-  'r'#010+
-  '**2Fo<x>_adds <x> to object path',#010+
+  '**2Fm<x>_load unicode conversi','on table from <x>.txt in the compiler '+
+  'dir'#010+
+  '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
-  '*g2gc_generate checks for pointers'#010+
+  '*g2gc_gen','erate checks for pointers'#010+
   '*g2gd_use dbx'#010+
   '*g2gg_use gsym'#010+
-  '*g2gh_use heap trac','e unit (for memory leak debugging)'#010+
+  '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gp_preserve case in stabs symbol names'#010+
-  '*g2gt_trash local variables (to detect uninitialized uses)'#010+
-  '*g2gv_generates programs traceable with valgri','nd'#010+
+  '*g2gt_trash local variables (to',' detect uninitialized uses)'#010+
+  '*g2gv_generates programs traceable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
   '**2iW_return full compiler version'#010+
-  '**2iSO_return compiler OS'#010+
+  '**2iSO_return comp','iler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
-  '**2iTP_re','turn target processor'#010+
+  '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1M<x>_set language mode to <x>'#010+
-  '**2Mfpc_free pascal dialect (default)'#010+
+  '**2Mfpc_free pascal dialect (de','fault)'#010+
   '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
-  '**2Mdelphi_tries to b','e Delphi compatible'#010+
+  '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
   '**2Mgpc_tries to be gpc compatible'#010+
   '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
-  '**1n_don'#039't read the default config file'#010+
+  '**1n','_don'#039't read the default config file'#010+
   '**1N<x>_node tree optimizations'#010+
-  '**2Nu_','unroll loops'#010+
+  '**2Nu_unroll 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+
+  '**2O1_level 1 optimizations (quick and debug','ger friendly)'#010+
   '**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
-  '**2O','3_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+
-  '**2Os_generate',' smaller code'#010+
+  '**2Op<x>_se','t target cpu for optimizing, see fpc -i for possible valu'+
+  'es'#010+
+  '**2Os_generate smaller code'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_assembler reading style:'#010+
   '**2Rdefault_use default assembler'#010+
-  '3*2Ratt_read AT&T style assembler'#010+
+  '3*2Ratt_read AT&T style a','ssembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '6*2RMOT_read motorola style ','assembler'#010+
+  '6*2RMOT_read motorola style assembler'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
-  '**2Se<x>_error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : compil','er stops after the <n> errors (default is 1)'#010+
+  '**2Se<','x>_error options. <x> is a combination of the following:'#010+
+  '**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
   '**3*_w : compiler stops also after warnings'#010+
   '**3*_n : compiler stops also after notes'#010+
-  '**3*_h : compiler stops also after hints'#010+
+  '**3*_h : compiler stops also after h','ints'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
-  '**2Si_support C++ st','yled INLINE'#010+
+  '**2Si_support C++ styled 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_suppor','t macros like C (global)'#010+
   '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#010+
-  '**2Ss_cons','tructor name must be init (destructor must be done)'#010+
+  '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+
-  '**1s_don'#039't call assembler and linker'#010+
+  '**1s_don'#039't ','call assembler and linker'#010+
   '**2sh_Generate script to link on host'#010+
-  '**2st_Gene','rate script to link on target'#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*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*2Tli','nux_Linux'#010+
+  '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
-  '3*2Tsunos_SunOS/Solaris'#010+
+  '3*2Tsuno','s_SunOS/Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
-  '3*2Twdosx_WDOSX ','DOS extender'#010+
+  '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintos','h m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Twince_Windows',' CE'#010+
+  'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS on PowerPC'#010+
   'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
-  'S*2Tlinux_Linux'#010+
+  'S*2Tli','nux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
-  '**2Un_don'#039't ','check the unit name'#010+
+  '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#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+
-  '**2*_w : Show warning','s               u : Show unit info'#010+
+  '**2*_e : Show err','ors (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 conditionals'#010+
-  '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers ','           r : Rhide/GCC compatibility mod'+
-  'e'#010+
+  '**2*_i : ','Show general info           d : Show debug info'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
   '**2*_b : Write file names messages with full path'#010+
-  '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
-  'e'#010+
-  '**2*','_    lots of debugging info'#010+
+  '**','2*_v : write fpcdebug.txt with     p : Write tree.log with parse t'+
+  'ree'#010+
+  '**2*_    lots of debugging info'#010+
   '3*1W<x>_Win32-like target options'#010+
   '3*2WB_Create a relocatable image'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
-  '3*2WC_Specify console type application'#010+
+  '3*2WC_Specify console ','type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF','_Specify full-screen type application (OS/2 only)'#010+
+  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
-  '3*2WR_Generate relocation code'#010+
+  '3*2WR_Generat','e relocation code'#010+
   'P*2WC_Specify console type application (Mac OS only)'#010+
-  'P*2','WG_Specify graphic type application (Mac OS only)'#010+
+  'P*2WG_Specify graphic type application (Mac OS only)'#010+
   'P*2WT_Specify tool type application (MPW tool, Mac OS only)'#010+
   '**1X_executable options:'#010+
-  '**2Xc_pass --shared to the linker (Unix only)'#010+
-  '**2Xd_don'#039't use standard library search path (needed for cr','oss c'+
-  'ompile)'#010+
+  '**2Xc_pass --shared to the link','er (Unix only)'#010+
+  '**2Xd_don'#039't use standard library search path (needed for cross com'+
+  'pile)'#010+
   '**2Xe_use external linker'#010+
   '**2XD_try to link units dynamic          (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>_pr','epend the binutils names with the prefix <x>'#010+
+  '**2XM<x>_','set the name of the '#039'main'#039' program routine (default'+
+  ' is '#039'main'#039')'#010+
+  '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2Xt_link with stati','c libraries (-static is passed to linker)'#010+
+  '**2XS_try to l','ink units static (default) (defines FPC_LINK_STATIC)'#010+
+  '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this help without wa','iting'#000
 );
diff --git a/compiler/options.pas b/compiler/options.pas
index 4ff9282190..027cf04259 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -2349,9 +2349,11 @@ begin
 {$endif arm}
   then
     begin
+{$ifdef cpufpemu}
       include(init_settings.moduleswitches,cs_fp_emulation);
       { cs_fp_emulation and fpu_soft are equal on arm }
       init_settings.fputype:=fpu_soft;
+{$endif cpufpemu}
     end;
 
 
diff --git a/compiler/switches.pas b/compiler/switches.pas
index 7c048f049f..6a90eac86d 100644
--- a/compiler/switches.pas
+++ b/compiler/switches.pas
@@ -162,15 +162,24 @@ begin
          begin
            if current_module.in_global then
             begin
-              if state='+' then
-                include(current_settings.moduleswitches,tmoduleswitch(setsw))
-              else
+{$ifndef cpufpemu}
+              if tmoduleswitch(setsw)=cs_fp_emulation then
                 begin
-                  { Turning off debuginfo when lineinfo is requested
-                    is not possible }
-                  if not((cs_use_lineinfo in current_settings.globalswitches) and
-                         (tmoduleswitch(setsw)=cs_debuginfo)) then
-                    exclude(current_settings.moduleswitches,tmoduleswitch(setsw));
+                  Message1(scan_w_unsupported_switch_by_target,'$'+switch);
+                end
+              else
+{$endif cpufpemu}
+                begin
+                  if state='+' then
+                    include(current_settings.moduleswitches,tmoduleswitch(setsw))
+                  else
+                    begin
+                      { Turning off debuginfo when lineinfo is requested
+                        is not possible }
+                      if not((cs_use_lineinfo in current_settings.globalswitches) and
+                             (tmoduleswitch(setsw)=cs_debuginfo)) then
+                        exclude(current_settings.moduleswitches,tmoduleswitch(setsw));
+                    end;
                 end;
             end
            else
diff --git a/compiler/x86/cgx86.pas b/compiler/x86/cgx86.pas
index b979e62008..69e632ca45 100644
--- a/compiler/x86/cgx86.pas
+++ b/compiler/x86/cgx86.pas
@@ -454,7 +454,7 @@ unit cgx86;
                  s:=S_IQ;
               end;
             else
-              internalerror(200204041);
+              internalerror(200204043);
          end;
       end;