* regenerate msg files after r32133

git-svn-id: branches/svenbarth/packages@32134 -

compiler/msgidx.inc

@@ -996,13 +996,34 @@ const
   package_e_duplicate_package=13003;
   package_e_unit_deny_package=13004;
   package_n_implicit_unit_import=13005;
+  package_f_cant_create_pcp=13006;
+  package_f_cant_read_pcp=13007;
+  package_t_pcp_loading=13008;
+  package_u_pcp_name=13009;
+  package_u_pcp_flags=13010;
+  package_u_pcp_crc=13011;
+  package_u_pcp_time=13012;
+  package_u_pcp_file_too_short=13013;
+  package_u_pcp_invalid_header=13014;
+  package_u_pcp_invalid_version=13015;
+  package_u_pcp_invalid_processor=13016;
+  package_u_pcp_invalid_target=13017;
+  package_u_pcp_write=13018;
+  package_f_pcp_cannot_write=13019;
+  package_f_pcp_read_error=13020;
+  package_f_pcp_read_unexpected_end=13021;
+  package_f_pcp_invalid_entry=13022;
+  package_u_pcp_invalid_fpumode=13023;
+  package_t_packagesearch=13024;
+  package_u_required_package=13025;
+  package_u_contained_unit=13026;
   option_logo=11023;
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 72281;
+  MsgTxtSize = 72986;
 
   MsgIdxMax : array[1..20] of longint=(
     26,99,340,123,89,57,126,27,202,64,
-    58,20,6,1,1,1,1,1,1,1
+    58,20,27,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000301] of string[240]=(
+const msgtxt : array[0..000304] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000301,1..240] of char=(
+const msgtxt : array[0..000304,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1216,9 +1216,31 @@ const msgtxt : array[0..000301,1..240] of char=(
   '13003_E_Duplicate package $1'#000+
   '13004_E_Unit $1 can not be part of a package'#000+
   '13005_N_Unit $1 is implicitely imported into package $2'#000+
+  '13006_F_Failed to create PCP file $2 for package $1'#000+
+  '13007_F_Failed to read PCP file for package $1'#000+
+  '13','008_T_PCP loading $1'#000+
+  '13009_U_PCP Name: $1'#000+
+  '13010_U_PCP Flags: $1'#000+
+  '13011_U_PCP Crc: $1'#000+
+  '13012_U_PCP Time: $1'#000+
+  '13013_U_PCP File too short'#000+
+  '13014_U_PCP Invalid Header (no PCP at the begin)'#000+
+  '13015_U_PCP Invalid Version $1'#000+
+  '13016_U_PCP is compiled for ','another processor'#000+
+  '13017_U_PCP is compiled for another target'#000+
+  '13018_U_Writing $1'#000+
+  '13019_F_Can'#039't Write PCP-File'#000+
+  '13020_F_Error reading PCP-File'#000+
+  '13021_F_unexpected end of PCP-File'#000+
+  '13022_F_Invalid PCP-File entry: $1'#000+
+  '13023_U_Trying to use a unit w','hich was compiled with a different FPU'+
+  ' mode'#000+
+  '13024_T_Packagesearch: $1'#000+
+  '13025_U_Required package $1'#000+
+  '13026_U_Contained unit $1'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copyright (c) 1993-2014 by ','Florian Klaempfl and others'#000+
+  'Copyright (c) 1993-2014 by Florian Klaempf','l and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
@@ -1230,8 +1252,8 @@ const msgtxt : array[0..000301,1..240] of char=(
   'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
-  'Supported FPU instr','uction sets:'#010+
-  '  $FPUINSTRUCTIONSETS'#010+
+  'Supported FPU instruction sets:'#010+
+  '  ','$FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported inline assembler modes:'#010+
   '  $ASMMODES'#010+
@@ -1246,7 +1268,7 @@ const msgtxt : array[0..000301,1..240] of char=(
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
-  'Supported M','icrocontroller types:'#010+
+  'Supported Microcontroller ','types:'#010+
   '  $CONTROLLERTYPES'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
@@ -1255,132 +1277,132 @@ const msgtxt : array[0..000301,1..240] of char=(
   'Please report bugs in our bug tracker on:'#010+
   '                 http://bugs.freepascal.org'#010+
   #010+
-  'More information ','may be found on our WWW pages (including directions'+
+  'More information may be found on',' our WWW pages (including directions'+
   #010+
   'for mailing lists useful for asking questions or discussing potential'#010+
   'new features, etc.):'#010+
   '                 http://www.freepascal.org'#000+
-  '11025_**0*_Put + after a boolean switch option to enab','le it, - to di'+
-  'sable it'#010+
+  '11025_**0*_Put + after a boolean switch option to enable it, - to dis',
+  'able it'#010+
   '**1@<x>_Read compiler options from <x> in addition to the default fpc.'+
   'cfg'#010+
   '**1a_The compiler does not delete the generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
-  '**2an_List node info in assembler ','file (-dEXTDEBUG compiler)'#010+
+  '**2an_List node info in assembler file (-dEXTDEBU','G compiler)'#010+
   '**2ao_Add an extra option to external assembler call (ignored for inte'+
   'rnal)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List te','mp allocation/release info in assembler file'#010+
+  '**2at_List temp allocation/r','elease info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
   '8*2Anasm_Assemble using Nasm'#010+
-  '8*2Anasmobj_Assemb','le using Nasm'#010+
-  '3*2Anasm_Assemble using Nasm'#010+
+  '8*2Anasmobj_Assemble using Nasm'#010+
+  '3','*2Anasm_Assemble 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*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
-  '3*2Anasmdarwin_macho','32 object file using Nasm (experimental)'#010+
+  '3*2Anasmdarwin_macho32 object file ','using Nasm (experimental)'#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*2Aelf_ELF (Linux) using internal writer'#010+
-  '3*2Acof','f_COFF (Go32v2) using internal writer'#010+
+  '3*2Acoff_COFF (Go32v2)',' using internal writer'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '3*2Ayasm_Assmeble using Yasm (experimental)'#010+
   '4*2Aas_Assemble using GNU AS'#010+
   '4*2Agas_Assemble using GNU GAS'#010+
-  '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU',' GAS'#010+
-  '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
+  '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+
+  '4*2Amasm_W','in64 object file using ml64 (Microsoft)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
   '4*2Aelf_ELF (Linux-64bit) using internal writer'#010+
   '4*2Ayasm_Assemble using Yasm (experimental)'#010+
-  '4*2Anasm_Assemble  using Nasm (experimental)',#010+
-  '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
+  '4*2Anasm_Assemble  using Nasm (experimental)'#010+
+  '4*2Anasmwin64_','Assemble Win64 object file using Nasm (experimental)'#010+
   '4*2Anasmelf_Assemble Linux-64bit object file using Nasm (experimental)'+
   #010+
   '4*2Anasmdarwin_Assemble darwin macho64 object file using Nasm (experim'+
   'ental)'#010+
-  '6*2Aas_Unix o-file using',' GNU AS'#010+
-  '6*2Agas_GNU Motorola assembler'#010+
+  '6*2Aas_Unix o-file using GNU AS'#010+
+  '6*2Agas','_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local s','ymbol info'#010+
-  '**1B_Build all modules'#010+
+  '**2bl_Generate local symbol info'#010+
+  '**1B','_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
   '**2C3_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate code for a big-endian variant of the target architectur'+
   'e'#010+
-  '*','*2Cc<x>_Set default calling convention to <x>'#010+
+  '**2Cc<x>_Set def','ault calling convention to <x>'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
-  '**2CF<x>_Minim','al floating point constant precision (default, 32, 64)'+
+  '**2CF<x>_Minimal floating poi','nt constant precision (default, 32, 64)'+
   #010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   'A*2CI<x>_Select instruction set on ARM: ARM or THUMB'#010+
   '**2Cn_Omit linking stage'#010+
-  'P*2CN_Generat','e nil-pointer checks (AIX-only)'#010+
+  'P*2CN_Generate nil-pointer c','hecks (AIX-only)'#010+
   '**2Co_Check overflow of integer operations'#010+
   '**2CO_Check for possible overflow of integer operations'#010+
   '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKSET=<','y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+
+  '**3CPPACKSET=<y>_ <y> set all','ocation: 0, 1 or DEFAULT or NORMAL, 2, '+
   '4 and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
-  '8*2CT<x>_Target-specific',' code generation options'#010+
+  '8*2CT<x>_Target-specific code generatio','n options'#010+
   '3*2CT<x>_Target-specific code generation options'#010+
   '4*2CT<x>_Target-specific code generation options'#010+
   'p*2CT<x>_Target-specific code generation options'#010+
   'P*2CT<x>_Target-specific code generation options'#010+
-  'J*2CT<x>_Target-spe','cific code generation options'#010+
+  'J*2CT<x>_Target-specific code gene','ration options'#010+
   'A*2CT<x>_Target-specific code generation options'#010+
   'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
   'P*3CTsmalltoc_ Generate smaller TOCs at the expense of execution speed'+
   ' (AIX)'#010+
-  'J*3CTau','togetterprefix=X_  Automatically create getters for propertie'+
+  'J*3CTautogetterprefix=','X_  Automatically create getters for propertie'+
   's with prefix X (empty string disables)'#010+
   'J*3CTautosetterprefix=X_  Automatically create setters for properties '+
   'with prefix X (empty string disables)'#010+
-  '8*3CTcld_                 Emit ','a CLD instruction before using the x8'+
+  '8*3CTcld_                 Emit a CLD instructi','on before using the x8'+
   '6 string instructions'#010+
   '3*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
   '4*3CTcld_                 Emit a CLD instruction before using the x86 '+
   'string instructions'#010+
-  'J','*3CTcompactintarrayinit_ Generate smaller (but potentially slower) '+
+  'J*3CTcompactinta','rrayinit_ Generate smaller (but potentially slower) '+
   'code for initializing integer array constants'#010+
   'J*3CTenumfieldinit_       Initialize enumeration fields in constructor'+
   's to enumtype(0), after calling inherited constructors'#010+
-  'J*','3CTinitlocals_          Initialize local variables that trigger a '+
+  'J*3CTinitlocals_ ','         Initialize local variables that trigger a '+
   'JVM bytecode verification error if used uninitialized (slows down code'+
   ')'#010+
   'J*3CTlowercaseprocstart_  Lowercase the first character of procedure/f'+
   'unction/method names'#010+
-  'A*3CTthumbi','nterworking_ Generate Thumb interworking-safe code if pos'+
+  'A*3CTthumbinterworking_ Ge','nerate Thumb interworking-safe code if pos'+
   'sible'#010+
   'J*2Cv_Var/out parameter copy-out checking'#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+
+  '**2Dv<x>_Set DLL version',' to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
@@ -1388,139 +1410,139 @@ const msgtxt : array[0..000301,1..240] of char=(
   '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
-  '**2Fc<x>_Set input c','odepage to <x>'#010+
+  '**2Fc<x>_Set input codepage to <x>'#010,
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
   '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
-  '**2Ff<x>_Add <x> to fra','mework path (Darwin only)'#010+
+  '**2Ff<x>_Add <x> to framework path (Da','rwin only)'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
   '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
-  'r'#010,
-  '**2FM<x>_Set the directory where to search for unicode binary files'#010+
+  'r'#010+
+  '**2FM<x>_Set th','e directory where to search for unicode binary files'#010+
   '**2Fo<x>_Add <x> to object path'#010+
   '**2Fr<x>_Load error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
   '**2Fu<x>_Add <x> to unit path'#010+
-  '**2FU<x>_Set unit output path ','to <x>, overrides -FE'#010+
+  '**2FU<x>_Set unit output path to <x>, overrid','es -FE'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
   '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
   'om <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
-  '*g2gc_Generat','e checks for pointers'#010+
+  '*g2gc_Generate checks for po','inters'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information',' (b'+
-  'reaks gdb < 6.5)'#010+
+  '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
+  'aks gdb < ','6.5)'#010+
   '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
   #010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
-  '*g2gs_Generate Stabs debug inform','ation'#010+
-  '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
+  '*g2gs_Generate Stabs debug information'#010+
+  '*g2gt_Tra','sh local variables (to detect uninitialized uses)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
-  '*g2gw3_Generate DWARFv3 debu','g information'#010+
-  '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
+  '*g2gw3_Generate DWARFv3 debug information'#010+
+  '*','g2gw4_Generate DWARFv4 debug information (experimental)'#010+
   '**1i_Information'#010+
   '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2iSP_Return compiler host ','processor'#010+
-  '**2iTO_Return target OS'#010+
+  '**2iSP_Return compiler host processor'#010+
+  '**2iT','O_Return target OS'#010+
   '**2iTP_Return target processor'#010+
   '**1I<x>_Add <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+
-  '**2Mobjfpc_FPC mode with ','Object Pascal support'#010+
+  '**2Mobjfpc_FPC mode with Object Pascal s','upport'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
-  '**1o<x>_Change the name of the executable pro','duced to <x>'#010+
-  '**1O<x>_Optimizations:'#010+
+  '**1o<x>_Change the name of the executable produced to <x>'#010+
+  '**','1O<x>_Optimizations:'#010+
   '**2O-_Disable optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
-  '**2O4_L','evel 4 optimizations (-O3 + optimizations which might have un'+
+  '**2O4_Level 4 optimiza','tions (-O3 + optimizations which might have un'+
   'expected side effects)'#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 f','or possible valu'+
+  '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible val','u'+
   'es'#010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
   ' <x>, see fpc -i for possible values'#010+
   '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
   'le values'#010+
-  '**2Os_Optimize for size rather tha','n speed'#010+
-  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
+  '**2Os_Optimize for size rather than speed'#010+
+  '**1pg_G','enerate profile code for gprof (defines FPC_PROFILE)'#010+
   'F*1P<x>_Target CPU / compiler related options:'#010+
   'F*2PB_Show default compiler binary'#010+
   'F*2PP_Show default target cpu'#010+
-  'F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,po','werpc64,'+
-  'sparc,x86_64)'#010+
+  'F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+
+  'arc,x','86_64)'#010+
   '**1R<x>_Assembler reading style:'#010+
   '**2Rdefault_Use default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
-  '**2S2_S','ame as -Mobjfpc'#010+
+  '**2S2_Same as -Mobjfpc',#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
-  '**','3*_w : Compiler also halts after warnings'#010+
+  '**3*_w : Compiler',' also halts after warnings'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_h : Compiler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
-  '**2Sh_Use reference counted strings (ansistring by defaul','t) instead '+
-  'of shortstrings'#010+
+  '**2Sh_Use reference counted strings (ansistring by default) instead of'+
+  ' s','hortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2','Sm_Support macros like C (global)'#010+
+  '**2Sm_Support macr','os like C (global)'#010+
   '**2So_Same as -Mtp'#010+
   '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
-  '**1s_D','o not call assembler and linker'#010+
+  '**1s_Do not call asse','mbler and linker'#010+
   '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
   '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Tdarwin_Darwin/Mac OS X'#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*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
   'rwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnativent_Native NT API (experimental)'#010+
-  '3*2Tn','etbsd_NetBSD'#010+
-  '3*2Tnetware_Novell Netware Module (clib)'#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*2Tsymbian_Symbian OS'#010+
   '3*2Tsolaris_Solaris'#010+
-  '3*2Twatcom_Watcom compatible D','OS extender'#010+
-  '3*2Twdosx_WDOSX DOS extender'#010+
+  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*2','Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1529,7 +1551,7 @@ const msgtxt : array[0..000301,1..240] of char=(
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
-  '6','*2Tpalmos_PalmOS'#010+
+  '6*2Tpalmos_PalmO','S'#010+
   'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
@@ -1540,123 +1562,123 @@ const msgtxt : array[0..000301,1..240] of char=(
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tsolaris_Solaris'#010+
   'S*2Tlinux_Linux'#010+
-  '**1u<x>_Und','efines the symbol <x>'#010+
+  '**1u<x>_Undefines the symb','ol <x>'#010+
   '**1U_Unit options:'#010+
   '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of',' the following letters:'#010+
+  '**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 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*_h : Show hints                  c : S','how conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
   '**2*_s : Show time stamps            q : Show message numbers'#010+
-  '**2*_a : Show every','thing             x : Executable info (Win32 only'+
+  '**2*_a : Show everything          ','   x : Executable info (Win32 only'+
   ')'#010+
   '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
   'e'#010+
   '**2*_    with full path              v : Write fpcdebug.txt with'#010+
-  '**2*_                                    lots of deb','ugging info'#010+
-  '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
+  '**2*_                                    lots of debugging info'#010+
+  '**2','*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
   'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
   'or version)'#010+
   '**1W<x>_Target-specific options (targets)'#010+
   '3*2WA_Specify native type application (Windows)'#010+
-  '4*2WA_','Specify native type application (Windows)'#010+
+  '4*2WA_Specify native ','type application (Windows)'#010+
   'A*2WA_Specify native type application (Windows)'#010+
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'p*2Wb_Create a bundle instead of a library (Da','rwin)'#010+
-  'A*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
+  'A*2Wb_Cre','ate a bundle instead of a library (Darwin)'#010+
   '4*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows, Symbian)'#010+
   '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
-  '4*2WB_Create a relocatable',' image (Windows)'#010+
+  '4*2WB_Create a relocatable image (Windows',')'#010+
   '4*2WBxxxx_Set image base to xxxx (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
   'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  '4*2WC_Specify co','nsole type application (EMX, OS/2, Windows)'#010+
+  '4*2WC_Specify console type appl','ication (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '4*2WD_Use DEFFILE to export f','unctions of DLL or EXE (Windows)'#010+
+  '4*2WD_Use DEFFILE to export functions of DLL',' or EXE (Windows)'#010+
   'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
   '3*2We_Use external resources (Darwin)'#010+
   '4*2We_Use external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
-  'P*2We_Use external resources (D','arwin)'#010+
-  'p*2We_Use external resources (Darwin)'#010+
+  'P*2We_Use external resources (Darwin)'#010+
+  'p*2We_Us','e external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
   '4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  'A*2WG_Specify graphi','c type application (Windows)'#010+
+  'A*2WG_Specify graphic type applicat','ion (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   '4*2Wi_Use internal resources (Darwin)'#010+
   'A*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
-  'p*2','Wi_Use internal resources (Darwin)'#010+
+  'p*2Wi_Use internal',' resources (Darwin)'#010+
   '3*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '4*2WI_Turn on/off the usage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '8*2Wm<x>_Set memory model'#010+
-  '8*3WmTin','y_Tiny memory model'#010+
+  '8*3WmTiny_Tiny memory m','odel'#010+
   '8*3WmSmall_Small memory model (default)'#010+
   '8*3WmMedium_Medium memory model'#010+
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '4*2WM<x>_Mi','nimum Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
+  '4*2WM<x>_Minimum Mac OS X ','deployment version: 10.4, 10.5.1, ... (Dar'+
   'win)'#010+
   'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
   'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '3*2WN_Do not generate relocation',' code, needed for debugging (Windows'+
+  '3*2WN_Do not generate relocation code, needed f','or debugging (Windows'+
   ')'#010+
   '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
-  'A*2Wpxxxx_Specify the controller type, see fpc -i for possible',' value'+
+  'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
+  'V*2Wpxx','xx_Specify the controller type, see fpc -i for possible value'+
   's'#010+
-  'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
   '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
-  '3*2WR_Generate relocation c','ode (Windows)'#010+
-  '4*2WR_Generate relocation code (Windows)'#010+
+  '3*2WR_Generate relocation code (Windows)'#010+
+  '4','*2WR_Generate relocation code (Windows)'#010+
   'A*2WR_Generate relocation code (Windows)'#010+
   '8*2Wt<x>_Set the target executable format'#010+
   '8*3Wtexe_Create a DOS .EXE file (default)'#010+
-  '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)',#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
+  'P*2WT_Specify ','MPW tool type application (Classic Mac OS)'#010+
   '**2WX_Enable executable stack (Linux)'#010+
   '**1X_Executable options:'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2Xd_Do not search default library path (som','etimes required for cro'+
+  '**2Xd_Do not search default library path (sometimes required',' for cro'+
   'ss-compiling when not using -XR)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_','Use internal linker'#010+
+  '**2Xi_Use internal li','nker'#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+
   'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '*','*2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross co'+
+  '**2Xr<x>_Set the',' linker'#039's rlink-path to <x> (needed for cross co'+
   'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
-  '**2Xs_Strip all symb','ols from executable'#010+
+  '**2Xs_Strip all symbols from execut','able'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_Show this ','help'#010+
-  '**1h_Shows this help without waiting'
+  '**1?_Show this help'#010+
+  '**1h_Shows',' this help without waiting'
 );