diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 07f0c6a832..a95bb807f0 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -3250,7 +3250,7 @@ link_e_undefined_symbol_in_obj=09221_E_Undefined symbol: $1 (first seen in $2)
 % The specified symbol is used, but not defined and was first seen in the specified object file.
 link_e_undefined_symbol=09222_E_Undefined symbol: $1
 % The specified symbol is used, but not defined.
-link_e_unsupported_cross_endian_internal_linker=09223_E_Using internal linker in cross-endian configuration is not supported
+link_w_unsupported_cross_endian_internal_linker=09223_W_Internal linker in cross-endian configuration is work in progress
 % The internal linker does not correctly handle endianess conversion.
 % \end{description}
 # EndOfTeX
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index d7039664ce..9fd7c90428 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -985,7 +985,7 @@ const
   link_e_comdat_selection_differs=09220;
   link_e_undefined_symbol_in_obj=09221;
   link_e_undefined_symbol=09222;
-  link_e_unsupported_cross_endian_internal_linker=09223;
+  link_w_unsupported_cross_endian_internal_linker=09223;
   unit_t_unitsearch=10000;
   unit_t_ppu_loading=10001;
   unit_u_ppu_name=10002;
@@ -1171,7 +1171,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 92299;
+  MsgTxtSize = 92296;
 
   MsgIdxMax : array[1..20] of longint=(
     29,109,371,134,102,63,148,38,224,71,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 171f093d32..fdaebf80e0 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1210,11 +1210,11 @@ const msgtxt : array[0..000384,1..240] of char=(
   '09220_E_COMDAT selection mod','e for symbol "$1" differs'#000+
   '09221_E_Undefined symbol: $1 (first seen in $2)'#000+
   '09222_E_Undefined symbol: $1'#000+
-  '09223_E_Using internal linker in cross-endian configuration is not sup'+
-  'ported'#000+
+  '09223_W_Internal linker in cross-endian configuration is work in progr'+
+  'ess'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
-  '10002_U_PPU Na','me: $1'#000+
+  '10002_U_PPU Name:',' $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
@@ -1222,7 +1222,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   '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 co','mpiled for another target'#000+
+  '10010_U_PPU is compi','led for another target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
@@ -1230,39 +1230,39 @@ const msgtxt : array[0..000384,1..240] of char=(
   '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_Ille','gal unit name: $1 (expecting $2)'#000+
+  '10018_E_Illegal',' unit name: $1 (expecting $2)'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1 used by $2'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000,
-  '10024_F_Unit $1 searched but $2 found'#000+
+  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '100','24_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
-  '10029_','U_Recompiling $1, source found only'#000+
+  '10029_U_R','ecompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit,',' obj is older than asm'#000+
+  '10033_U_Recompiling unit, ob','j is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modified include files'#000+
-  '10041_U_File $1 ','is newer than the one used for creating PPU file $2'#000+
+  '10041_U_File $1 is ','newer than the one used for creating PPU file $2'#000+
   '10042_U_Trying to use a unit which was compiled with a different FPU m'+
   'ode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed',' for unit $1'#000+
+  '10045_U_Interface CRC changed fo','r unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
   '10048_U_Adding dependency: $1 depends on $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
-  '10051_U_Flag for re','load: $1'#000+
+  '10051_U_Flag for reloa','d: $1'#000+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
@@ -1270,156 +1270,156 @@ const msgtxt : array[0..000384,1..240] of char=(
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
-  '10','059_U_Skipping re-resolving unit $1, still loading used units'#000+
+  '10059','_U_Skipping re-resolving unit $1, still loading used units'#000+
   '10060_U_Unloading resource unit $1 (not needed)'#000+
   '10061_E_Unit $1 was compiled using a different whole program optimizat'+
-  'ion feedback input ($2, $3); recompile it without wpo or use',' the sam'+
+  'ion feedback input ($2, $3); recompile it without wpo or use th','e sam'+
   'e wpo feedback input file for this compilation invocation'#000+
   '10062_U_Indirect interface (objects/classes) CRC changed for unit $1'#000+
   '10063_U_PPU is compiled for another i8086 memory model'#000+
   '10064_U_Loading unit $1 from package $2'#000+
-  '10065_F_In','ternal type "$1" was not found. Check if you use the corre'+
+  '10065_F_Inter','nal type "$1" was not found. Check if you use the corre'+
   'ct run time library.'#000+
   '10066_F_Internal type "$1" does not look as expected. Check if you use'+
   ' the correct run time library.'#000+
-  '10067_U_Skipping unit, PPU and compiler have to be both comp','iled wit'+
+  '10067_U_Skipping unit, PPU and compiler have to be both compile','d wit'+
   'h or without LLVM support'#000+
   '10068_U_PPU is compiled for another WebAssembly exceptions mode'#000+
   '10069_U_Skipping unit, PPU and compiler have to be both compiled with '+
   'or without SYMANSISTR support'#000+
-  '10070_U_PPU and program must both be compi','led with or without WebAss'+
+  '10070_U_PPU and program must both be compiled',' with or without WebAss'+
   'embly multithreading support'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported, changing source file to compil'+
   'e from "$1" into "$2"'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '1100','3_E_Nested response files are not supported'#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+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
-  '11009_F_Unable t','o open file $1'#000+
+  '11009_F_Unable to o','pen 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_In options file $1 at line $2 too many #IF(N)DEFs encountered'#000+
-  '11014_F','_In options file $1 at line $2 unexpected #ENDIFs encountered'+
+  '11014_F_In',' options file $1 at line $2 unexpected #ENDIFs encountered'+
   #000+
   '11015_F_Open conditional at the end of the options file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '11018_W_You ar','e using the obsolete switch $1'#000+
+  '11018_W_You are u','sing the obsolete switch $1'#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+
-  '11022_W_"$1" assem','bler use forced'#000+
+  '11022_W_"$1" assemble','r use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
   '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
-  '11032_D_','Interpreting option "$1"'#000+
+  '11032_D_Int','erpreting 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 codepage "$1"'#000+
-  '11040_F_Config file $1 is a directo','ry'#000+
+  '11040_F_Config file $1 is a directory'#000,
   '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
   'ugging disabled'#000+
   '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
   '11043_F_In options file $1 at line $2 #ELSE directive without #IF(N)DE'+
   'F found'#000+
-  '11044','_F_Option "$1" is not, or not yet, supported on the current tar'+
+  '11044_F_','Option "$1" is not, or not yet, supported on the current tar'+
   'get platform'#000+
   '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
   ' target platform'#000+
   '11046_N_DWARF debug information cannot be used with smart linking on t'+
-  'his tar','get, switching to static linking'#000+
+  'his target',', switching to static linking'#000+
   '11047_W_Option "$1" is ignored for the current target platform.'#000+
   '11048_W_Disabling external debug information because it is unsupported'+
   ' for the selected target/debug format combination.'#000+
-  '11049_N_DWARF debug in','formation cannot be used with smart linking wi'+
+  '11049_N_DWARF debug infor','mation cannot be used with smart linking wi'+
   'th external assembler, disabling static library creation.'#000+
   '11050_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variabl'+
   'e: $1'#000+
-  '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environ','ment var'+
+  '11051_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environmen','t var'+
   'iable: $1'#000+
   '11052_E_You must use one of the VFP FPU types when using the EABIHF AB'+
   'I target'#000+
   '11053_W_The selected debug format is not supported on the current targ'+
   'et, not changing the current setting'#000+
-  '11054_E_Argument to "$1" is missing'#000,
-  '11055_E_Malformed parameter: $1'#000+
+  '11054_E_Argument to "$1" is missing'#000+
+  '110','55_E_Malformed parameter: $1'#000+
   '11056_W_Smart linking requires external linker'#000+
   '11057_E_Creating .COM files is not supported in the current memory mod'+
   'el. Only the tiny memory model supports making .COM files.'#000+
-  '11058_W_Experimental CheckPointe','r option not enabled because it is i'+
+  '11058_W_Experimental CheckPointer o','ption not enabled because it is i'+
   'ncomptatible with -Ur option.'#000+
   '11059_E_Unsupported target architecture -P$1, invoke the "fpc" compile'+
   'r driver instead.'#000+
   '11060_E_Feature switches are only supported while compiling the system'+
   ' unit.'#000+
-  '11061_N_T','he selected debug format is not supported by the internal l'+
+  '11061_N_The ','selected debug format is not supported by the internal l'+
   'inker, switching to external linking'#000+
   '11062_E_You can not use both options ($1) ($2) at same time.'#000+
   '11063_F_The selected FPU type "$1" is not supported by the selected in'+
-  'struction set',' "$2"'#000+
+  'struction set "$','2"'#000+
   '11064_E_Only one WebAssembly exception support mode can be specified.'#000+
   '11065_W_Subtarget is already set to: $1'#000+
   '11066_E_Subtarget $1 specified but no corresponding config file $2 fou'+
   'nd.'#000+
   '11067_N_Ignoring compiler executable suffix $1.'#000+
-  '12','000_F_Cannot open whole program optimization feedback file "$1"'#000+
+  '12000','_F_Cannot open whole program optimization feedback file "$1"'#000+
   '12001_D_Processing whole program optimization information in wpo feedb'+
   'ack file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
-  ' in wpo feedback file ','"$1"'#000+
+  ' in wpo feedback file "$1','"'#000+
   '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
   'ck file'#000+
   '12004_W_No handler registered for whole program optimization section "'+
   '$2" at line $1 of wpo feedback file, ignoring'#000+
-  '12005_D_Found whole program optimization ','section "$1" with informati'+
+  '12005_D_Found whole program optimization sec','tion "$1" with informati'+
   'on about "$2"'#000+
   '12006_F_The selected whole program optimizations require a previously '+
   'generated feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
-  'am optimizatio','n found'#000+
+  'am optimization f','ound'#000+
   '12008_F_Specify a whole program optimization feedback file to store th'+
   'e generated info in (using -FW)'#000+
   '12009_E_Not generating any whole program optimization information, yet'+
   ' a feedback file was specified (using -FW)'#000+
-  '12010_E_Not perfo','rming any whole program optimizations, yet an input'+
+  '12010_E_Not performi','ng any whole program optimizations, yet an input'+
   ' feedback file was specified (using -Fw)'#000+
   '12011_D_Skipping whole program optimization section "$1", because not '+
   'needed by the requested optimizations'#000+
-  '12012_W_Overriding previously read infor','mation for "$1" from feedbac'+
+  '12012_W_Overriding previously read informat','ion for "$1" from feedbac'+
   'k input file using information in section "$2"'#000+
   '12013_E_Cannot extract symbol liveness information from program when s'+
   'tripping symbols, use -Xs-'#000+
-  '12014_E_Cannot extract symbol liveness information from program when',' '+
-  'when not linking'#000+
+  '12014_E_Cannot extract symbol liveness information from program when w'+
+  'h','en not linking'#000+
   '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
   'n from linked program'#000+
   '12016_E_Error during reading symbol liveness information produced by "'+
   '$1"'#000+
-  '12017_F_Error executing "$1" (exitcode: $2) to extract s','ymbol inform'+
+  '12017_F_Error executing "$1" (exitcode: $2) to extract symb','ol inform'+
   'ation from linked program'#000+
   '12018_E_Collection of symbol liveness information can only help when u'+
   'sing smart linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
-  '13001_F_Can'#039't find pac','kage $1'#000+
+  '13001_F_Can'#039't find packag','e $1'#000+
   '13002_U_PCP file for package $1 found'#000+
   '13003_E_Duplicate package $1'#000+
   '13004_E_Unit $1 can not be part of a package'#000+
   '13005_N_Unit $1 is implicitly imported into package $2'#000+
   '13006_F_Failed to create PCP file $2 for package $1'#000+
-  '13007_F_Faile','d to read PCP file for package $1'#000+
+  '13007_F_Failed t','o read PCP file for package $1'#000+
   '13008_T_PCP loading $1'#000+
   '13009_U_PCP Name: $1'#000+
   '13010_U_PCP Flags: $1'#000+
@@ -1427,28 +1427,28 @@ const msgtxt : array[0..000384,1..240] of char=(
   '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 Ver','sion $1'#000+
+  '13015_U_PCP Invalid Versio','n $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 entr','y: $1'#000+
+  '13022_F_Invalid PCP-File entry: ','$1'#000+
   '13023_U_Trying to use a unit which was compiled with a different FPU m'+
   'ode'#000+
   '13024_T_Packagesearch: $1'#000+
   '13025_U_Required package $1'#000+
   '13026_U_Contained unit $1'#000+
   '13027_E_Unit $1 is already contained in package $2'#000+
-  '13028_W_Unit $1 is imported f','rom indirectly required package $2'#000+
+  '13028_W_Unit $1 is imported from',' indirectly required package $2'#000+
   '13029_U_PPL filename $1'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
   'Copyright (c) 1993-2023 by Florian Klaempfl and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
-  'Comp','iler date      : $FPCDATE'#010+
+  'Compile','r date      : $FPCDATE'#010+
   'Compiler CPU target: $FPCCPU'#010+
   #010+
   'Supported targets (targets marked with '#039'{*}'#039' are under develop'+
@@ -1459,7 +1459,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   '  $INSTRUCTIONSETS'#010+
   #010+
   'Supported FPU instruction sets:'#010+
-  '  $FPUINSTRUCTION','SETS'#010+
+  '  $FPUINSTRUCTIONSET','S'#010+
   #010+
   'Supported inline assembler modes:'#010+
   '  $ASMMODES'#010+
@@ -1476,7 +1476,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
-  'Supported ','Whole Program Optimizations:'#010+
+  'Supported Who','le Program Optimizations:'#010+
   '  All'#010+
   '  $WPOPTIMIZATIONS'#010+
   #010+
@@ -1487,376 +1487,376 @@ const msgtxt : array[0..000384,1..240] of char=(
   'n Backend)'#010+
   '  $LLVMVERSIONS'#010+
   #010+
-  'Supported Microcontroller types:$\n  ','$CONTROLLERTYPES$\n'#010+
+  'Supported Microcontroller types:$\n  $CO','NTROLLERTYPES$\n'#010+
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.v2'#010+
   #010+
   'Please report bugs in our bug tracker on:'#010+
   '                 https://bugs.freepascal.org'#010+
   #010+
-  'More information may be found on our W','WW 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+
   '                 https://www.freepascal.org'#000+
   '11025_F*0*_Only options valid for the default or selected platform are'+
-  ' lis','ted.'#010+
+  ' listed','.'#010+
   '**0*_Put + after a boolean switch option to enable it, - to disable 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, automa'+
-  'tically switches to',' external assembler writer'#010+
+  'tically switches to ex','ternal assembler writer'#010+
   '**2a5_Don'#039't generate Big Obj COFF files for GNU Binutils older tha'+
   'n 2.25 (Windows, NativeNT)'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file (-dEXTDEBUG compiler)'#010+
-  '**2ao_Add an ','extra option to external assembler call (ignored for in'+
+  '**2ao_Add an ext','ra option to external assembler call (ignored for in'+
   'ternal)'#010+
   '*L2ap_Use pipes instead of creating temporary assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
   '**2aR_List RTTI info in assembler file'#010+
-  '**2at_List tem','p allocation/release info in assembler file'#010+
+  '**2at_List temp a','llocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
   '3*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
   '3*2Acoff_COFF (Go32v2) using internal writer'#010+
-  '3*2Aelf_ELF (L','inux) using internal writer'#010+
+  '3*2Aelf_ELF (Linu','x) using internal writer'#010+
   '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
   '3*2Anasm_Assemble using Nasm'#010+
   '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
-  '3*2Anasmdarwin_macho32 object file us','ing Nasm (experimental)'#010+
+  '3*2Anasmdarwin_macho32 object file using',' Nasm (experimental)'#010+
   '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_Obj file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
-  '3','*2Atasm_Obj file using Tasm (Borland)'#010+
+  '3*2A','tasm_Obj file using Tasm (Borland)'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
   '3*2Ayasm_Assemble using Yasm (experimental)'#010+
   '4*2Aas_Assemble using GNU AS'#010+
   '4*2Aas-darwin_Assemble Darwin Mach-O using GNU GAS'#010+
-  '4*2Aelf_ELF (Linux 64 bit) using interna','l writer'#010+
+  '4*2Aelf_ELF (Linux 64 bit) using internal w','riter'#010+
   '4*2Agas_Assemble using GNU GAS'#010+
   '4*2Amasm_Win64 object file using ml64 (Microsoft)'#010+
   '4*2Anasm_Assemble using Nasm (experimental)'#010+
   '4*2Anasmdarwin_Assemble darwin macho64 object file using Nasm (experim'+
   'ental)'#010+
-  '4*2Anasmelf_Assemble Linux 64',' bit object file using Nasm (experiment'+
+  '4*2Anasmelf_Assemble Linux 64 bi','t object file using Nasm (experiment'+
   'al)'#010+
   '4*2Anasmwin64_Assemble Win64 object file using Nasm (experimental)'#010+
   '4*2Apecoff_PE-COFF (Win64) using internal writer'#010+
   '4*2Ayasm_Assemble using Yasm (experimental)'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Ag','as_GNU Motorola assembler'#010+
+  '6*2Agas_','GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*2Avasm_Use vasm to assemble'#010+
   '8*2Anasm_Assemble using Nasm'#010+
   '8*2Anasmobj_Assemble using Nasm'#010+
   'A*2Aas_Assemble using GNU AS'#010+
-  'A*2Aas-darwin_Assemble using ','GNU AS for Darwin targets'#010+
+  'A*2Aas-darwin_Assemble using GNU',' AS for Darwin targets'#010+
   'A*2Aclang_Assemble using clang'#010+
   'A*2Aelf_Assemble using internal ELF writer'#010+
   'a*2Aas_Assemble using GNU AS'#010+
   'a*2Aas-clang_Assemble using clang for other targets'#010+
   'a*2Aclang_Assemble using clang for darwin/ios targets'#010+
-  'P*2Aa','s_Assemble using GNU AS'#010+
+  'P*2Aas_A','ssemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
   's*2Aas_Assemble using GNU AS'#010+
   'v*2Aas_Assemble using GNU AS'#010+
   'W*2Awasm_Assemble using the internal object writer for wasm32 (experim'+
   'ental)'#010+
-  'W*2Abinaryen_Assemble using GNU AS for wasm32 (wasm-','as) (experimenta'+
+  'W*2Abinaryen_Assemble using GNU AS for wasm32 (wasm-as)',' (experimenta'+
   'l)'#010+
   'W*2Allvm-mc-10_Assemble using llvm-mc-10'#010+
   'W*2Allvm-mc-11_Assemble using llvm-mc-11'#010+
   'W*2Allvm-mc-12_Assemble using llvm-mc-12'#010+
   'W*2Allvm-mc-13_Assemble using llvm-mc-13'#010+
-  'W*2Allvm-mc_Assemble using llvm-mc (version 14 or later)'#010,
-  'W*2Awabt_Assemble using wasa (experimental)'#010+
+  'W*2Allvm-mc_Assemble using llvm-mc (version 14 or later)'#010+
+  'W*2','Awabt_Assemble using wasa (experimental)'#010+
   'x*2Aas_Assemble using GNU AS'#010+
   'Z*2Asdcc-sdasz80_Assemble using SDCC-SDASZ80'#010+
   'Z*2Avasm_Assemble using Vasm'#010+
   'Z*2Az80asm_Assemble using z80asm'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local symbol info'#010,
-  '**1B_Build all modules'#010+
+  '**2bl_Generate local symbol info'#010+
+  '**1','B_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 or fpc -ia 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+
+  '**2C','c<x>_Set default calling convention to <x>'#010+
   'V*2Cd<x>_Discard selected RTL startup sections (use with caution)'#010+
   'V*3Cdc_Discard initializing data. Data defaults to noinit section'#010+
-  'V*3Cdj_Discard jump to PASCALMAIN. Use only if PASCALMAIN foll','ows di'+
+  'V*3Cdj_Discard jump to PASCALMAIN. Use only if PASCALMAIN follows',' di'+
   'rectly after startup code'#010+
   'V*3Cds_Discard _START code. Use only if all interrupts are disabled'#010+
   'V*3Cdz_Discard code initializing the zero register and stack pointer'#010+
   '**2CD_Create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation wit','h emulated floating point opcodes'#010+
+  '**2Ce_Compilation with e','mulated floating point opcodes'#010+
   '**2CE_Generate FPU code which can raise exceptions'#010+
   '**2Cf<x>_Select fpu instruction set to use; see fpc -i or fpc -if for '+
   'possible values'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010,
-  '**2Cg_Generate PIC code'#010+
+  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
+  '**2','Cg_Generate PIC code'#010+
   '**2Ch<n>[,m]_<n> bytes min heap size (between 1023 and 67107840) and o'+
   'ptionally [m] max heap size'#010+
   '**2Ci_IO-checking'#010+
   'A*2CI<x>_Select instruction set on ARM: ARM or THUMB'#010+
   'L*2Cl<x>_LLVM code generation options'#010+
-  'L*3Clflto','_Enable Link-time optimisation (needed both when compiling '+
+  'L*3Clflto_En','able Link-time optimisation (needed both when compiling '+
   'units and programs/libraries)'#010+
   'L*3Clfltonosystem_Disable LTO for the system unit (needed with at leas'+
   't Xcode 10.2 and earlier due to linker bugs)'#010+
-  'L*3Clflsanitize=address_Enable addre','ss sanitizer'#010+
+  'L*3Clflsanitize=address_Enable address ','sanitizer'#010+
   'L*3Clv<x>_LLVM target version: Xcode-10.1, 7.0, 8.0, .., 10.0'#010+
   '**2Cn_Omit linking stage'#010+
   'P*2CN_Generate nil-pointer checks (AIX-only)'#010+
   '**2Co_Check overflow of integer operations'#010+
-  '**2CO_Check for possible overflow of integer operati','ons'#010+
+  '**2CO_Check for possible overflow of integer operations',#010+
   '**2Cp<x>_Select instruction set; see fpc -i or fpc -ic for possible va'+
   'lues'#010+
   '**2CP<x>=<y>_ packing settings'#010+
   '**3CPPACKENUM=<y>_ <y> enum packing: 0, 1, 2 and 4 or DEFAULT or NORMA'+
   'L'#010+
-  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or N','ORMAL, 1, '+
+  '**3CPPACKRECORD=<y>_ <y> record packing: 0 or DEFAULT or NORM','AL, 1, '+
   '2, 4, 8, 16 and 32'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
   '**2Cs<n>_Set stack checking size to <n>'#010+
-  '**2Ct_Stack checking (for testing',' only, see manual)'#010+
+  '**2Ct_Stack checking (for testing on','ly, see manual)'#010+
   '8*2CT<x>_Target-specific code generation 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+
+  'P*2CT<x>_Target-specific cod','e generation options'#010+
   'J*2CT<x>_Target-specific code generation options'#010+
   'A*2CT<x>_Target-specific code generation options'#010+
   'W*2CT<x>_Target-specific code generation options'#010+
-  'p*3CTsmalltoc_ Generate smaller TOCs at the expense of execution spee',
-  'd (AIX)'#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*3CTautogetterprefix=X_  Automatically create getters for properties '+
   'with prefix X (empty string disables)'#010+
-  'J*3CTautosetterprefix=X_  Automatically create ','setters for propertie'+
+  'J*3CTautosetterprefix=X_  Automatically create set','ters for propertie'+
   's with prefix X (empty string disables)'#010+
   '8*3CTcld_                 Emit a CLD instruction before using the x86 '+
   '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+
+  '4*','3CTcld_                 Emit a CLD instruction before using the x8'+
+  '6 string instructions'#010+
   '8*3CTfarprocspushoddbp_       Increment BP before pushing it in the pr'+
   'ologue of far functions'#010+
-  'J*3CTcompactintarrayinit_ Generate smaller (but potenti','ally slower) '+
+  'J*3CTcompactintarrayinit_ Generate smaller (but potentiall','y 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 tha','t trigger a '+
+  'J*3CTinitlocals_          Initialize local variables that t','rigger 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*3CTthumbinterworking_ Generate Thumb interworking-safe code if ','pos'+
-  'sible'#010+
+  'A*3CTthumbinterworking_ Generate Thumb interworking-safe code if pos','s'+
+  'ible'#010+
   'W*3CTnoexceptions_        Disable the exception support. Raising an ex'+
   'ception will abort the program.'#010+
   'W*3CTbfexceptions_        Enable the branchful exception support for W'+
   'ebAssembly'#010+
-  'W*3CTjsexceptions_        Enable the JavaScript-','based exception supp'+
+  'W*3CTjsexceptions_        Enable the JavaScript-bas','ed exception supp'+
   'ort for WebAssembly (experimental)'#010+
   'W*3CTwasmexceptions_      Enable the native WebAssembly exceptions sup'+
   'port'#010+
   'W*3CTwasmthreads_         Enable WebAssembly threads support (experime'+
   'ntal)'#010+
-  'J*2Cv_Var/out parameter copy-out c','hecking'#010+
+  'J*2Cv_Var/out parameter copy-out chec','king'#010+
   'A*2CV<x>_Set section threadvar model to <x>'#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+
-  '**2DD<x>_Set the date string returned by %DATE% to x, it is no','t chec'+
+  '**2DD<x>_Set the date string returned by %DATE% to x, it is not c','hec'+
   'ked for being a valid date string'#010+
   '**2DT<x>_Set the time string returned by %TIME% to x, it is not checke'+
   'd for being a valid time string'#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+
+  '**1E_Same as -Cn'#010,
   '**1fPIC_Same as -Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
   '**2FC<x>_Set RC compiler binary name to <x>'#010+
-  '**2Fd_Disable the compiler'#039's i','nternal directory cache'#010+
+  '**2Fd_Disable the compiler'#039's inte','rnal directory cache'#010+
   '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
   '**2FE<x>_Set exe/unit output path to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only), or set IDF path to <'+
-  'x','> (Xtensa-FreeRTOS)'#010+
+  'x> (','Xtensa-FreeRTOS)'#010+
   '**2FF_Use fpcres as RC to RES compiler instead of windres or gorc'#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 i','n the compiler '+
+  '**2Fm<x>_Load unicode conversion table from <x>.txt in t','he compiler '+
   'dir'#010+
   '**2FM<x>_Set the directory where to search for unicode binary files'#010+
   '**2FN<x>_Add <x> to list of default unit scopes (namespaces)'#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+
+  '**2FR<x>_Set resource (.re','s) linker to <x>'#010+
   '**2Ft_Do not search uppercased or 8.3 unit filenames on case sensitive'+
   ' filesystems.'#010+
   '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
-  '**2Fw<x>_Load previously stored whole-program optimiza','tion feedback '+
+  '**2Fw<x>_Load previously stored whole-program optimizatio','n feedback '+
   'from <x>'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers (experimental, only available on so'+
-  'me targets, might g','enerate false positive)'#010+
+  'me targets, might gene','rate false positive)'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
   '*g2gl_Use line info unit (show more info with backtraces)'#010+
   '*g2gm_Generate Microsoft CodeView debug information (experimental)'#010+
-  '*g2go<x>_Set debug informat','ion options'#010+
+  '*g2go<x>_Set debug information',' options'#010+
   '*g3godwarfcpp_ Simulate C++ debug information in DWARF'#010+
   '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
   'ame'#010+
   '*g3godwarfomflinnum_ Generate line number information in OMF LINNUM re'+
-  'cords in MS LINK format in ad','dition to the DWARF debug information ('+
+  'cords in MS LINK format in addit','ion to the DWARF debug information ('+
   'Open Watcom Debugger/Linker compatibility)'#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+
-  '*g2gp_Pres','erve case in stabs symbol names'#010+
+  '*g2gp_Preserv','e case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
   '*g2gt_Trash local variables (to detect uninitialized uses; multiple '#039+
   't'#039' changes the trashing value)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
-  '*g2gw_Generate DWARF','v2 debug information (same as -gw2)'#010+
+  '*g2gw_Generate DWARFv2 ','debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
   '**1i_Information'#010+
   '**2ia_Return list of supported ABI targets'#010+
-  '**2','ib_Return the used code generation backend type'#010+
+  '**2ib_','Return the used code generation backend type'#010+
   '**2ic_Return list of supported CPU instruction sets'#010+
   '**2iD_Return compiler date'#010+
   '**2if_Return list of supported FPU instruction sets'#010+
   '**2ii_Return list of supported inline assembler modes'#010+
-  'L*2il_R','eturn list of supported LLVM/Xcode versions by the LLVM backe'+
+  'L*2il_Retu','rn list of supported LLVM/Xcode versions by the LLVM backe'+
   'nd'#010+
   '**2im_Return list of supported modeswitches'#010+
   '**2io_Return list of supported optimizations'#010+
   '**2ir_Return list of recognized compiler and RTL features'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2','iSP_Return compiler host processor'#010+
+  '**2iSP','_Return compiler host processor'#010+
   '**2it_Return list of supported targets'#010+
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
   '**2iu_Return list of supported microcontroller types'#010+
   '**2iV_Return short compiler version'#010+
-  '**2iw_Return list of s','upported whole program optimizations'#010+
+  '**2iw_Return list of supp','orted whole program optimizations'#010+
   '**2iW_Return full compiler version'#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> / enable modeswitch <x> (see option -'+
   'im)'#010+
-  '**2Mdelphi_Delp','hi 7 compatibility mode'#010+
+  '**2Mdelphi_Delphi ','7 compatibility mode'#010+
   '**2Mdelphiunicode_Delphi 2009 and later compatibility mode'#010+
   '**2Mextendedpascal_ISO 10206 mode'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
   '**2Miso_ISO 7185 mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
-  '**2Mobj','fpc_FPC mode with Object Pascal support'#010+
+  '**2Mobjfpc','_FPC mode with Object Pascal support'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2*_Each mode (as listed above) enables its default set of modeswitch'+
   'es.'#010+
   '**2*_Other modeswitches are disabled and need to be enabled one by ano'+
   'ther.'#010+
-  '**1M<x>-_Disab','le modeswitch <x> (see option -im)'#010+
+  '**1M<x>-_Disable ','modeswitch <x> (see option -im)'#010+
   '**1n_Do not read the default config files'#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 friend','ly)'#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_Level 4 optimizations (-O3 + optimizations which might have unex'+
   'pected side effects)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[N','O]<x>_Enable or disable optimizations; see fpc -i or fpc -io '+
+  '**2Oo[NO]<','x>_Enable or disable optimizations; see fpc -i or fpc -io '+
   'for possible values'#010+
   '**2Op<x>_Set target cpu for optimizing; see fpc -i or fpc -ic for poss'+
   'ible values'#010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**2Ow<x>_Perform whole-program opti','mization <x>; see fpc -i or fpc -'+
+  '**2Ow<x>_Perform whole-program optimiz','ation <x>; see fpc -i or fpc -'+
   'iw for possible values'#010+
   '**2OW<x>_Generate whole-program optimization feedback for optimization'+
   ' <x>; see fpc -i or fpc -iw for possible values'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
-  'F*1P<x','>_Target CPU / compiler related options:'#010+
+  'F*1P<x>_T','arget 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 (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipse'+
   'l,powerpc,powerpc64,sparc,x86_64)'#010+
-  '**1R<x>_Assembler reading styl','e:'#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+
   '4*2Ratt_Read AT&T style assembler'#010+
   '4*2Rintel_Read Intel style assembler'#010+
   '8*2Ratt_Read AT&T style assembler'#010+
-  '8*2Rintel_Read I','ntel style assembler'#010+
+  '8*2Rintel_Read Inte','l style assembler'#010+
   '6*2RMOT_Read Motorola style assembler'#010+
   '**1s_Do not call assembler and linker'#010+
   '**2sh_Generate script to link on host, automatically switches to exter'+
   'nal assembler writer'#010+
-  '**2sr_Skip register allocation phase (use with -alr)',', automatically '+
+  '**2sr_Skip register allocation phase (use with -alr), a','utomatically '+
   'switches to external assembler writer'#010+
   '**2st_Generate script to assemble and link on target, automatically sw'+
   'itches to external assembler writer'#010+
   '**2sT_Generate script only to link on target'#010+
   '**1S<x>_Syntax options:'#010+
-  '**2S2_Same ','as -Mobjfpc'#010+
+  '**2S2_Same as ','-Mobjfpc'#010+
   '**2Sa_Turn on assertions'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#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*_h',' : Compiler also halts after hints'#010+
+  '**3*_h : ','Compiler also halts after hints'#010+
   '**3*_n : Compiler also halts after notes'#010+
   '**3*_w : Compiler also halts after warnings'#010+
   '**2Sf_Enable certain features in compiler and RTL; see fpc -i or fpc -'+
   'ir for possible values)'#010+
-  '**2Sg_Enable LABEL and GOT','O (default in -Mtp and -Mdelphi)'#010+
+  '**2Sg_Enable LABEL and GOTO (','default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use reference counted strings (ansistring by default) instead of'+
   ' shortstrings'#010+
   '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
   '**2SI<x>_Set interface style to <x>'#010+
-  '**3SIcom_COM compat','ible interface (default)'#010+
+  '**3SIcom_COM compatibl','e interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sj_Allows typed constants to be writeable (default in all modes)'#010+
   '**2Sk_Load fpcylix unit'#010+
   '**2Sm_Support macros like C (global)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Sr_Transparent file names ','in ISO mode'#010+
+  '**2Sr_Transparent file names in ','ISO mode'#010+
   '**2Ss_Constructor name must be "Init" (destructor name must be "Done")'+
   #010+
   '**2Sv_Support vector processing (use CPU vector extensions if availabl'+
   'e)'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
-  '**2Sy_@<pointer> re','turns a typed pointer, same as $T+'#010+
+  '**2Sy_@<pointer> retur','ns a typed pointer, same as $T+'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Tandroid_Android'#010+
   '3*2Taros_AROS'#010+
@@ -1865,14 +1865,14 @@ const msgtxt : array[0..000384,1..240] of char=(
   '3*2Tembedded_Embedded'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tg','o32v2_Version 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32','v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Thaiku_Haiku'#010+
   '3*2Tiphonesim_iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tdar'+
   'win)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnativent_Native NT API (experimental)'#010+
   '3*2Tnetbsd_NetBSD'#010+
-  '3*2Tnetware_Novell Netware Mod','ule (clib)'#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+
@@ -1881,7 +1881,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 bit'#010+
-  '3','*2Twince_Windows CE'#010+
+  '3*2T','wince_Windows CE'#010+
   '4*2Tandroid_Android'#010+
   '4*2Taros_AROS'#010+
   '4*2Tdarwin_Darwin/Mac OS X'#010+
@@ -1892,7 +1892,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   '4*2Tiphonesim_iPhoneSimulator'#010+
   '4*2Tlinux_Linux'#010+
   '4*2Tnetbsd_NetBSD'#010+
-  '4*2Topenb','sd_OpenBSD'#010+
+  '4*2Topenbsd_','OpenBSD'#010+
   '4*2Tsolaris_Solaris'#010+
   '4*2Twin64_Win64 (64 bit Windows systems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
@@ -1902,7 +1902,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   '6*2Tnetbsd_NetBSD'#010+
   '6*2Tmacosclassic_Classic Mac OS'#010+
   '6*2Tpalmos_PalmOS'#010+
-  '6*2Tsincla','irql_Sinclair QL'#010+
+  '6*2Tsinclairq','l_Sinclair QL'#010+
   '8*2Tembedded_Embedded'#010+
   '8*2Tmsdos_MS-DOS (and compatible)'#010+
   '8*2Twin16_Windows 16 bit'#010+
@@ -1913,7 +1913,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   'A*2Tgba_Game Boy Advance'#010+
   'A*2Tios_iOS'#010+
   'A*2Tlinux_Linux'#010+
-  'A*2Tnds_Nin','tendo DS'#010+
+  'A*2Tnds_Ninten','do DS'#010+
   'A*2Tnetbsd_NetBSD'#010+
   'A*2Tpalmos_PalmOS'#010+
   'A*2Tsymbian_Symbian'#010+
@@ -1926,7 +1926,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   'a*2Twin64_Windows 64'#010+
   'J*2Tandroid_Android'#010+
   'J*2Tjava_Java'#010+
-  'l*2T','linux_Linux'#010+
+  'l*2Tlin','ux_Linux'#010+
   'm*2Tandroid_Android'#010+
   'm*2Tembedded_Embedded'#010+
   'm*2Tlinux_Linux'#010+
@@ -1938,7 +1938,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   'P*2Tembedded_Embedded'#010+
   'P*2Tlinux_Linux'#010+
   'P*2Tmacosclassic_Classic Mac OS'#010+
-  'P*2Tm','orphos_MorphOS'#010+
+  'P*2Tmorp','hos_MorphOS'#010+
   'P*2Tnetbsd_NetBSD'#010+
   'P*2Twii_Wii'#010+
   'p*2Taix_AIX'#010+
@@ -1951,7 +1951,7 @@ const msgtxt : array[0..000384,1..240] of char=(
   'r*2Tlinux_Linux'#010+
   'S*2Tlinux_Linux'#010+
   'S*2Tsolaris_Solaris'#010+
-  's*2Tli','nux_Linux'#010+
+  's*2Tlinux','_Linux'#010+
   'V*2Tembedded_Embedded'#010+
   'x*2Tembedded_Embedded'#010+
   'x*2Tfreertos_FreeRTOS'#010+
@@ -1961,18 +1961,18 @@ const msgtxt : array[0..000384,1..240] of char=(
   'Z*2Tmsxdos_MSX-DOS'#010+
   'Z*2Tzxspectrum_ZX Spectrum'#010+
   'W*2Tembedded_Embedded'#010+
-  'W*2Twasi_The WebAssembly System',' Interface (WASI)'#010+
+  'W*2Twasi_The WebAssembly System In','terface (WASI)'#010+
   '**1t<x>_Target architecture'#010+
   '**2*_ * Defines FPC_SUBTARGET_<x> '#010+
   '**2*_ * Defines FPC_SUBTARGET as <arg>'#010+
   '**2*_ * Additionally reads config file fpc-<subtarget>.cfg'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do ','not check where the unit name matches the file name'#010+
+  '**2Un_Do not',' check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_0 : Show nothing (exc','ept errors)'#010+
+  '**2*_0 : Show nothing (except',' errors)'#010+
   '**2*_a : Show everything'#010+
   '**2*_b : Write file names messages with full path'#010+
   '**2*_c : Show conditionals'#010+
@@ -1980,157 +1980,157 @@ const msgtxt : array[0..000384,1..240] of char=(
   '**2*_e : Show errors (default)'#010+
   '**2*_h : Show hints'#010+
   '**2*_i : Show general info'#010+
-  '**2*_j : Always add mai','n source (useful when run in parallel make)'#010+
+  '**2*_j : Always add main s','ource (useful when run in parallel make)'#010+
   '**2*_l : Show linenumbers'#010+
   '**2*_m<x>,<y> : Do not show messages numbered <x> and <y>'#010+
   '**2*_n : Show notes'#010+
   '**2*_p : Write tree.log with parse tree'#010+
   '**2*_q : Show message numbers'#010+
-  '**2*_r : Rhide/GCC com','patibility mode'#010+
+  '**2*_r : Rhide/GCC compat','ibility mode'#010+
   '**2*_s : Show time stamps'#010+
   '**2*_t : Show tried/used files'#010+
   '**2*_u : Show unit info'#010+
   '**2*_v : Write fpcdebug.txt with lots of debugging info'#010+
   '**2*_w : Show warnings'#010+
   '**2*_x : Show info about invoked tools'#010+
-  '**2*_z : Write output to ','stderr'#010+
+  '**2*_z : Write output to std','err'#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+
-  'A*2WA_Specify native ','type application (Windows)'#010+
+  'A*2WA_Specify native typ','e 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 (Darwin)'#010+
   'a*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'A*2Wb','_Create a bundle instead of a library (Darwin)'#010+
+  'A*2Wb_Cr','eate 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*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
-  '4*2WB_Create a relocatable image (Windo','ws)'#010+
+  '4*2WB_Create a relocatable image (Windows)',#010+
   '4*2WB<x>_Set image base to <x> (Windows)'#010+
   'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
   'A*2WB<x>_Set image base to <x> (Windows, Symbian)'#010+
   'Z*2WB<x>_Set image base to <x> (ZX Spectrum)'#010+
-  '3*2WC_Specify console type application (EMX, OS/','2, Windows)'#010+
+  '3*2WC_Specify console type application (EMX, OS/2, ','Windows)'#010+
   '4*2WC_Specify console type application (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 DE','FFILE to export functions of DLL or EXE (Windows)'#010+
+  '4*2WD_Use DEFFI','LE 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+
-  'A*2We_Use exte','rnal resources (Darwin)'#010+
+  'A*2We_Use externa','l resources (Darwin)'#010+
   'P*2We_Use external resources (Darwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
   '6*2WF<x>_Set TOS program flags to <x> (Atari)'#010+
-  '3*2WG_Specify graphic type application ','(EMX, OS/2, Windows)'#010+
+  '3*2WG_Specify graphic type application (EM','X, OS/2, Windows)'#010+
   '4*2WG_Specify graphic type application (Windows)'#010+
   'A*2WG_Specify graphic type application (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
-  '4*2Wi_Use internal resource','s (Darwin)'#010+
+  '4*2Wi_Use internal resources (','Darwin)'#010+
   'a*2Wi_Use internal resources (Darwin)'#010+
   'A*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_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 th','e usage of import sections (Windows)'#010+
+  '4*2WI_Turn on/off the u','sage of import sections (Windows)'#010+
   'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
   '8*2Wh_Use huge code for units (ignored for models with CODE in a uniqu'+
   'e segment)'#010+
   '8*2Wm<x>_Set memory model'#010+
   '8*3WmTiny_Tiny memory model'#010+
-  '8*3WmSmall_','Small memory model (default)'#010+
+  '8*3WmSmall_Sma','ll memory model (default)'#010+
   '8*3WmMedium_Medium memory model'#010+
   '8*3WmCompact_Compact memory model'#010+
   '8*3WmLarge_Large memory model'#010+
   '8*3WmHuge_Huge memory model'#010+
   '3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
   'n)'#010+
-  '4*2WM<x>_Minim','um 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 co','de, needed for debugging (Windows'+
+  '3*2WN_Do not generate relocation code,',' needed for 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*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for p','oss'+
-  'ible values'#010+
+  'A*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss','i'+
+  'ble values'#010+
   'm*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   'R*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
-  'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for p','oss'+
-  'ible values'#010+
+  'V*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for poss','i'+
+  'ble values'#010+
   'x*2Wp<x>_Specify the controller type; see fpc -i or fpc -iu for possib'+
   'le values'#010+
   '3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
   '4*2WP<x>_Minimum iOS deployment version: 8.0, 8.0.2, ... (iphonesim)'#010+
-  'a*2WP<x','>_Minimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
+  'a*2WP<x>_M','inimum iOS deployment version: 7.0, 7.1.2, ... (Darwin)'#010+
   'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
   'x*2WP<x>_Esp8266-rtos-sdk or esp-idf version number: 3.3, 3.4 (esp8266'+
   ') or 4.2, 4.3 (esp32)'#010+
-  '3*2WR_Generate relocati','on 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*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+
-  '8*3Wtexe_Create a DOS .EXE file (defa','ult)'#010+
+  '8*3Wtexe_Create a DOS .EXE file (default',')'#010+
   '6*2Wt<x>_Set the target executable format (Atari)'#010+
   '6*3Wttos_Create TOS executable file (default)'#010+
   '6*3Wtmint_Create a MiNT executable file'#010+
   'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
-  '6*2WQ<x>_Set executable metadata format (S','inclair QL)'#010+
+  '6*2WQ<x>_Set executable metadata format (Sinc','lair QL)'#010+
   '6*3WQqhdr_Set metadata to QDOS File Header style (default)'#010+
   '6*3WQxtcc_Set metadata to XTcc style'#010+
   '**2WX_Enable executable stack (Linux)'#010+
   '**1x<suff>_Set suffix for compiler executable (fpc command only)'#010+
   '**1X_Executable options:'#010+
-  '**2X','9_Generate linkerscript for GNU Binutils ld older than version 2'+
+  '**2X9_G','enerate linkerscript for GNU Binutils ld older than version 2'+
   '.19.1 (Linux)'#010+
   '**2Xa_Generate code which allows to use more than 2 GB static data on '+
   '64 bit targets (Linux)'#010+
-  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Li',
-  'nux)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
+  'ux',')'#010+
   '**2Xd_Do not search default library path (sometimes required for cross'+
   '-compiling when not using -XR)'#010+
   '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xe_Use external linker'#010+
-  '**2Xf_Substitute pthread library name fo','r linking (BSD)'#010+
+  '**2Xf_Substitute pthread library name for l','inking (BSD)'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
   'to executable'#010+
   '**2Xi_Use internal linker'#010+
   'L*2XlS<x>_LLVM utilties suffix (e.g. -7 in case clang is called clang-'+
   '7)'#010+
-  '**2XLA_Define library substitutions for l','inking'#010+
+  '**2XLA_Define library substitutions for link','ing'#010+
   '**2XLD_Exclude default order of standard libraries'#010+
   '**2XLO_Define order of library linking'#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+
-  '**2Xn_Use target system native linker instead o','f GNU ld (Solaris, AI'+
+  '**2Xn_Use target system native linker instead of G','NU ld (Solaris, AI'+
   'X)'#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 comp'+
-  'ile, see the ld manual for ','more information) (BeOS, Linux)'#010+
+  'ile, see the ld manual for mor','e information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
   ', Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
-  '**','2Xt_Link with static libraries (-static is passed to linker)'#010+
+  '**2Xt','_Link with static libraries (-static is passed to linker)'#010+
   '**2Xu_Generate executable in UF2 format  (embedded targets only)'#010+
   '**2Xv_Generate table for Virtual Entry calls'#010+
-  '**2XV_Use VLink as external linker       (default on Amiga, Atari, Si',
-  'nclair QL)'#010+
+  '**2XV_Use VLink as external linker       (default on Amiga, Atari, Sin'+
+  'cl','air QL)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
diff --git a/compiler/options.pas b/compiler/options.pas
index 0a4bf2891d..1a6e08545d 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -5702,7 +5702,7 @@ begin
   if source_info.endian<>target_info.endian then
     begin
       if option.LinkInternSetExplicitly then
-        Message(link_e_unsupported_cross_endian_internal_linker)
+        Message(link_w_unsupported_cross_endian_internal_linker)
       else
         include(init_settings.globalswitches,cs_link_extern);
     end;