+ Changed type incompatibility messgae to more delphi style one

compiler/msgtxt.inc

@@ -206,58 +206,58 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Self c','an be only an explicit parameter in message handlers'#000+
   'E_Threadvars can be only static or global'#000+
   'E_Type mismatch'#000+
-  'E_Incompatible types $1 and $2'#000+
+  'E_Incompatible types: got $1 expected $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
   'E_Type identifier expected'#000+
-  'E_Variable ','identifier expected'#000+
+  'E','_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
   'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversio','n from floating type to COMP which is an i'+
+  'W_Automatic type',' conversion from floating type to COMP which is an i'+
   'nteger type'#000+
   'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
-  'E_Can'#039't read or write variables of this',' type'#000+
+  'E_Can'#039't read or write variabl','es of this type'#000+
   'E_Type conflict between set elements'#000+
   'W_lo/hi(longint/dword) returns the upper/lower word'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
-  'E_Incompatible type for arg #$1, $2 and $3'#000+
-  'E_Identifier not found $1'#000+
-  'F_In','ternal Error in SymTableStack()'#000+
+  'E_Incompatible type for arg #$1: Got $2, expected $3'#000+
+  'E_Identifi','er not found $1'#000+
+  'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
-  'E_Forward type not reso','lved $1'#000+
+  'E_F','orward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abtsract method are not allo'+
-  'wed'#000+
-  'W_Label not d','efined $1'#000+
+  'E_Instances of classes or objects with an abtsract method are not a','l'+
+  'lowed'#000+
+  'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_illegal type declaration of set elements'#000+
-  'E_Forward class definitio','n not resolved $1'#000+
+  'E_For','ward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does not seem to be initialized'#000+
-  'E_identifier ident','s no member $1'#000+
+  'W_Local variable $1 does not seem to be initialize','d'#000+
+  'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
@@ -265,158 +265,158 @@ const msgtxt : array[0..00103,1..240] of char=(
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low range limit'#000+
-  'E_Illegal co','unter variable'#000+
+  'E_High range limit < low rang','e limit'#000+
+  'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_illegal call by refe','rence parameters'#000+
+  'E_','illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP'#000+
-  'E_Abstract metho','ds can'#039't be called directly'#000+
+  'E_procedure call with stackframe ESP','/SP'#000+
+  'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Internal Error in seco','ndinline()'#000+
+  'F_In','ternal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
-  'E_Element zero of an ansi/wide- o','r longstring can'#039't be accessed,'+
+  'E_Element zer','o of an ansi/wide- or longstring can'#039't be accessed,'+
   ' use (set)length instead'#000+
   'E_Include or exclude not implemented in this case'#000+
   'W_Probably illegal constant passed to internal math function'#000+
-  'Constructors or destructors can not be called inside with here'#000+
-  'F_Divide b','y zero in asm evaluator'#000+
+  'Constructors or destructors can not be called inside ','with here'#000+
+  'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
-  'E_escape sequence ignored:',' $1'#000+
+  'E_esca','pe sequence ignored: $1'#000+
   'E_Asm syntax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
   'W_Calling an overload function in an asm'#000+
-  'E_Constant value out of bounds'#000+
-  'E_Non','-label pattern contains @'#000+
+  'E_Constant value',' out of bounds'#000+
+  'E_Non-label pattern contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
   'E_Error in octal constant: $1'#000+
   'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
-  'E_Invalid labeled opcode'#000+
-  'F_In','ternal error in Findtype()'#000+
+  'E_Invalid',' labeled opcode'#000+
+  'F_Internal error in Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
-  'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combinat','ion of opcode and operands'#000+
+  'W_Fwait can cause emulation problems with emu38','7'#000+
+  'E_Invalid combination of opcode and operands'#000+
   'E_Unsupported combination of opcode and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
-  'E_Invalid three operand',' opcode'#000+
+  'E_I','nvalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid operand type'#000+
   'E_Segment overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
-  'F_Internal Errror converting octal'#000+
-  'E_Invalid',' constant expression'#000+
+  'F_Internal Errror conver','ting octal'#000+
+  'E_Invalid constant expression'#000+
   'E_Unknown identifier: $1'#000+
   'E_Trying to define an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
-  'E_Scaling value only allowed wit','h index'#000+
+  'E_Scaling va','lue only allowed with index'#000+
   'E_Invalid assembler syntax. No ref with brackets)'#000+
   'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
-  'E_Trying to use a negative in','dex register'#000+
+  'E_Trying ','to use a negative index register'#000+
   'E_Asm syntax error - error in reference'#000+
   'E_Local symbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
-  'E_Invalid string as opcode operand: $1'#000+
-  'W_@CODE and @','DATA not supported'#000+
+  'E_Invalid string as opcode opera','nd: $1'#000+
+  'W_@CODE and @DATA not supported'#000+
   'E_Null label references are not allowed'#000+
   'W_Calling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
-  'E_Asm syntax error - register: $1'#000+
-  'E_SEG and',' OFFSET not supported'#000+
+  'E_Asm syntax error - re','gister: $1'#000+
+  'E_SEG and OFFSET not supported'#000+
   'E_Asm syntax error - in opcode operand'#000+
   'E_Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
-  'W_A repeat prefix and a segment override on <= i386 may result in erro'+
-  'rs if an ','interrupt occurs'#000+
+  'W_A repeat prefix and a segment override on <= i386 may res','ult in er'+
+  'rors if an interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
-  'E_Unknown label identifer: $1'#000+
-  'E_Assemble n','ode syntax error'#000+
+  'E_Unknown label identi','fer: $1'#000+
+  'E_Assemble node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
   'D_Starting intel styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
-  'E_NOR not supported'#000+
-  'E_Invalid',' floating point register name'#000+
+  'E_NOR not',' supported'#000+
+  'E_Invalid floating point register name'#000+
   'W_Modulo not supported'#000+
   'E_Invalid floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Size suffix and destination or source size do not match'#000+
-  'W_Size suffix and destination or source',' size do not match'#000+
+  'W_Size suffix and d','estination or source size do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
   'W_Floating point octal representation ignored'#000+
-  'E_Invalid real constant expression'#000,+
+  'E_Invalid real ','constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Invalid segment override expression'#000+
-  'E_Strings not allowed as constan','ts'#000+
+  'E_Strings no','t allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
   'E_Invalid global definition'#000+
   'E_Line separator expected'#000+
-  'W_globl not supported'#000+
-  'W_align not sup','ported'#000+
+  'W_globl not suppo','rted'#000+
+  'W_align not supported'#000+
   'W_lcomm not supported'#000+
   'W_comm not supported'#000+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
   'E_assembler code not returned to text'#000+
-  'F_internal error in BuildReferenc','e()'#000+
+  'F_internal er','ror in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
@@ -425,54 +425,54 @@ const msgtxt : array[0..00103,1..240] of char=(
   'F_internal error in HandleExtend()'#000+
   'E_Invalid character: <'#000+
   'E_Invalid character: >'#000+
-  'E_Unsupported opcode'#000+
-  'E_Incre','ment and Decrement mode not allowed together'#000+
+  'E_Unsupp','orted opcode'#000+
+  'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
   'D_Starting Motorola styled assembler parsing...'#000+
-  'D_Finished Motorola styled assembler ','parsing...'#000+
+  'D_Finished Motoro','la styled assembler parsing...'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
   'E_Extended not supported in this mode'#000+
   'E_Comp not supported in this mode'#000+
-  'W_You need GNU as version >= ','2.81 to compile this MMX code'#000+
+  'W_You nee','d GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
   'E_Cannot index a local var or parameter with a register'#000+
   'H_$1 translated to $2'#000+
-  'W_$1 is associated to an ','overloaded function'#000+
+  'W_$1 ','is associated to an overloaded function'#000+
   'Z_Reference at $1 corresponds to $2 arg'#000+
   'Z_Reference at $1 is not an arg !'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
-  'W_Assembler $1 not found, switching to external assembl','ing'#000+
+  'W_Assembler $1 not found, switching',' to external assembling'#000+
   'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
   'W_Linker $1 not found, switching to external linking'#000+
-  'T_Using linker: $1'#000+
-  'W_Object $1 not fou','nd, Linking may fail !'#000+
+  'T_Using linker: $1',#000+
+  'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
   'W_binder not found, switching to external binding'#000+
-  'W_ar not found, switching to exter','nal ar'#000+
+  'W_ar not found',', switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
-  'X_Size of Code: $1 bytes'#000+
-  'X_Size of ','initialized data: $1 bytes'#000+
+  'X_Size of Code:',' $1 bytes'#000+
+  'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
   'X_Stack space reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
@@ -481,8 +481,8 @@ const msgtxt : array[0..00103,1..240] of char=(
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
-  'U_PPU Time: $1'#000+
-  'U_PPU File too',' short'#000+
+  'U_PPU Tim','e: $1'#000+
+  'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
   'U_PPU is compiled for an other processor'#000+
@@ -490,47 +490,47 @@ const msgtxt : array[0..00103,1..240] of char=(
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
-  'F_reading PPU-File'#000+
-  'F_unexpected e','nd of PPU-File'#000+
+  'F_reading PPU','-File'#000+
+  'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
-  'W_Compiling the system unit requires the ','-Us switch'#000+
+  'W_Compiling the syste','m unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
   'U_Recompiling $1, source found only'#000+
-  'U_Recompiling unit, static lib is older than ppufile'#000+
-  'U_Recompiling unit, ','shared lib is older than ppufile'#000+
+  'U_Recompiling unit, static lib is older than ppufile'#000,+
+  'U_Recompiling unit, shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
-  'U_PPU Check file $1 time $2',#000+
+  'U_PPU C','heck file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
-  'H_-? writes help pages'#000+
-  'F_To','o many config files nested'#000+
+  'H_-? wr','ites help pages'#000+
+  'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
-  'F_too many ENDIFs'#000+
-  'F_open conditional ','at the end of the file'#000+
+  'F_too many ENDIFs',#000+
+  'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'W_You are using the obsolete switch $1'#000+
-  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-','98 by Florian Klaempfl'#000+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET',#000+
+  'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
@@ -539,21 +539,21 @@ const msgtxt : array[0..00103,1..240] of char=(
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
-  'Report bugs,suggestions etc t','o:'#000+
+  'Report bu','gs,suggestions etc to:'#000+
   '                 [email protected]'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
-  '**2al_list sourcecode lines in assembler file'#000+
-  '**1b_ge','nerate browser info'#000+
+  '**2al_list sourcecode lines in as','sembler file'#000+
+  '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
-  '**2Cn_omit linking stage'#000+
-  '**2Co_check',' overflow of integer operations'#000+
+  '**2Cn_omit linki','ng stage'#000+
+  '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
@@ -561,22 +561,22 @@ const msgtxt : array[0..00103,1..240] of char=(
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
-  '*O2Dd<x>_set description to ','<x>'#000+
+  '*O2Dd<x>','_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
-  '**2FE<x>_set exe/unit output pat','h to <x>'#000+
+  '**2FE<x>_set',' exe/unit output path to <x>'#000+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to unit path'#000+
-  '**2FU','<x>_set unit output path to <x>, overrides -FE'#000+
+  '**2Fu<x>_adds <x','> to unit path'#000+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
@@ -584,93 +584,94 @@ const msgtxt : array[0..00103,1..240] of char=(
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
-  '**2iSO_return source OS'#000+
-  '**2iS','P_return source processor'#000+
+  '**2iSO_re','turn source OS'#000+
+  '**2iSP_return source processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the executab','le produced to <x>'#000+
+  '**1o<x>_change the ','name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
-  '**2Sd_tries',' to be Delphi compatible'#000+
+  '**2Sc_supports operators like C (*=,+=,/=',' and -=)'#000+
+  '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ stlyed INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
-  '**2So_tries to be TP/BP 7.0 compatible'#000+
-  '**2Sp_tries to ','be gpc compatible'#000+
+  '**2So_tries to be TP/BP 7.0 compat','ible'#000+
+  '**2Sp_tries to be gpc compatible'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
-  '**1U_unit options'#000+
-  '**2Un_don'#039't check t','he unit name'#000+
+  '**1U_unit options',#000+
+  '**2Un_don'#039't check the unit name'#000+
   '**2Up<x>_same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_w : Show warnings               u : Show unit',' info'#000+
+  '**2*_w : Show warnings        ','       u : Show unit info'#000+
   '**2*_n : Show notes                  t : Show tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers            c : Sho','w conditionals'#000+
+  '**2*_l : Show linenumber','s            c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
-  '**2*_    occurs',#000+
+  '**2*_    declarations if an error    x : Executable info (Win32 o','nly'+
+  ')'#000+
+  '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
-  '**0*_Processor specific o','ptions:'#000+
+  '**0*_','Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
-  '3*2Atasm_obj using Tasm (Borland)'#000+
-  '3*1','R<x>_assembler reading style'#000+
+  '3*2Atasm_obj usin','g Tasm (Borland)'#000+
+  '3*1R<x>_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster code (defa','ult)'#000+
+  '3*2OG_genera','te faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level 3 optimiz','ations (same as -O2u)'#000+
+  '3','*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operating system'#000+
-  '3*2TGO32V1_vers','ion 1 of DJ Delorie DOS extender'#000+
+  '3*1T<x>_Target operating sy','stem'#000+
+  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Synta','x (old GAS)'#000+
+  '6*2Agas_GNU Motorola assembl','er'#000+
+  '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set target processor to a MC68020+',#000+
+  '6*2O2_set target pro','cessor to a MC68020+'#000+
   '6*1R<x>_assembler reading style'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system'#000+
@@ -679,6 +680,6 @@ const msgtxt : array[0..00103,1..240] of char=(
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
-  '**1?_shows this help'#000+
-  '**1h_shows th','is help without waiting'#000
+  '**1?_shows thi','s help'#000+
+  '**1h_shows this help without waiting'#000
 );