Browse Source

--- Merging r20746 through r20747 into '.':
/trunk/compiler/msg/: errore.msg
* directions for reporting bugs are different from those for asking questions
nowadays
/trunk/compiler/msg/: errorct.msg, errord.msg, errorda.msg, errordu.msg,
errore.msg, errores.msg, errorf.msg, errorfi.msg, errorhe.msg, errorheu.msg,
errorid.msg, erroriu.msg, errorn.msg, errorpl.msg, errorpli.msg,
errorpt.msg, errorptu.msg, errorr.msg, errorru.msg, errorues.msg
* e-mail address for reporting bugs is not valid since long time ago
--- Merging r20751 into '.':
/trunk/compiler/: msgidx.inc, msgtxt.inc
* update msgidx.inc and msgtxt.inc after r20747
--- Merging r20763 into '.':
/trunk/compiler/msg/: errorct.msg, errord.msg, errorda.msg, errordu.msg,
errore.msg, errores.msg, errorf.msg, errorfi.msg, errorhe.msg, errorheu.msg,
errorid.msg, erroriu.msg, errorn.msg, errorpl.msg, errorpli.msg,
errorpt.msg, errorptu.msg, errorr.msg, errorru.msg, errorues.msg
* fixed inconsistent license files references
--- Merging r20764 into '.':
/trunk/compiler/: msgidx.inc, msgtxt.inc
* message include files regenerated

git-svn-id: branches/fixes_2_6@20765 -

Tomas Hajny 13 years ago
parent
commit
6666f957ee

+ 2 - 4
compiler/msg/errorct.msg

@@ -4,7 +4,7 @@
 #
 #   Catalan Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2116,12 +2116,10 @@ Plataformes compatibles     :
  $OSTARGETS
 
 Aquest programa ve sota la Llicència Pública General de GNU
-Per a més informació llegiu COPYING.FPC
+Per a més informació llegiu COPYING.v2
 
 Comuniqueu les errades, suggeriments, etc a:
   http://bugs.freepascal.org
-o
-  [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errord.msg

@@ -8,7 +8,7 @@
 #   This file is part of the Free Pascal Compiler
 #   Copyright (c) 1998-2010 by the Free Pascal Development team
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -3026,12 +3026,10 @@ Untersttzte Microcontroller:
   $CONTROLLERTYPES
 
 Dieses Programm unterliegt der GNU General Public Licence
-Weitere Informationen sind in COPYING.FPC zu finden
+Weitere Informationen sind in COPYING.v2 zu finden
 
 Fehlerberichte, Vorschl„ge usw. bitte senden an:
              http://bugs.freepascal.org
-oder
-             [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorda.msg

@@ -9,7 +9,7 @@
 #
 #   This file is encoded in UTF-8, and based on r4084 of errore.eng
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2223,12 +2223,10 @@ Understøttede platforme:
   $OSTARGETS
 
 Dette program dækkes af reglerne for GNU General Public License
-Læs COPYING.FPC for mere information
+Læs COPYING.v2 for mere information
 
 Indsend fejlbeskrivelser, forslag, etc til
                  http://bugs.freepascal.org
-og
-                 [email protected]
 
 For kommentarer vedrørende den danske oversættelse, skriv til
                  [email protected]

+ 2 - 4
compiler/msg/errordu.msg

@@ -8,7 +8,7 @@
 #   This file is part of the Free Pascal Compiler
 #   Copyright (c) 1998-2010 by the Free Pascal Development team
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -3026,12 +3026,10 @@ Unterstützte Microcontroller:
   $CONTROLLERTYPES
 
 Dieses Programm unterliegt der GNU General Public Licence
-Weitere Informationen sind in COPYING.FPC zu finden
+Weitere Informationen sind in COPYING.v2 zu finden
 
 Fehlerberichte, Vorschläge usw. bitte senden an:
              http://bugs.freepascal.org
-oder
-             [email protected]
 ]
 
 #

+ 8 - 5
compiler/msg/errore.msg

@@ -4,7 +4,7 @@
 #
 #   English (default) Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -3053,12 +3053,15 @@ Supported Microcontroller types:
   $CONTROLLERTYPES
 
 This program comes under the GNU General Public Licence
-For more information read COPYING.FPC
+For more information read COPYING.v2
 
-Report bugs, suggestions, etc. to:
+Please report bugs in our bug tracker on:
                  http://bugs.freepascal.org
-or
-                 [email protected]
+
+More information may be found on our WWW pages (including directions
+for mailing lists useful for asking questions or discussing potential
+new features, etc.):
+                 http://www.freepascal.org
 ]
 
 #

+ 2 - 4
compiler/msg/errores.msg

@@ -10,7 +10,7 @@
 #
 #   Spanish Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2133,12 +2133,10 @@ Sets de instrucciones de la FPU soportados:
   $FPUINSTRUCTIONSETS
 
 Este programa esta bajo la licencia GNU General Public Licence
-Para mas informació lea COPYING.FPC
+Para mas informació lea COPYING.v2
 
 Para informar de errores, sugerencias, etc:
                  http://bugs.freepascal.org
-o
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorf.msg

@@ -4,7 +4,7 @@
 #
 #   French (cp850) Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -1726,12 +1726,10 @@ Cible du compilateur : $FPCTARGET
 # the next lines are NOT translated on purpose !!!
 
 This program comes under the GNU General Public Licence
-For more information read COPYING.FPC
+For more information read COPYING.v2
 
 Report bugs,suggestions etc to:
                  http://bugs.freepascal.org
-ou
-                 [email protected]
 ]
 
 #

+ 4 - 4
compiler/msg/errorfi.msg

@@ -6,7 +6,7 @@
 #   Latest updates contributed by Rémi Dorlet <remi at dorlet.org>
 #   Based on errore.msg of SVN revision 4165
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2270,11 +2270,11 @@ Jeu d'instructions CPU support
 Jeu d'instructions FPU supportés: $FPUINSTRUCTIONSETS
 Optimisations supportées: $OPTIMIZATIONS
 Ce programme est fourni sous la License Publique Générale GNU (GNU GPL).
-Pour plus d'informations, consultez le fichier COPYING.FPC.
+Pour plus d'informations, consultez le fichier COPYING.v2.
 Rapports de bogues, suggestions, etc. à:
     http://bugs.freepascal.org
-ou
-    [email protected] ]
+]
+
 #
 # Help pages (option -? and -h)
 #

+ 2 - 4
compiler/msg/errorhe.msg

@@ -6,7 +6,7 @@
 #   Contributed by Ido Kanner <idokan at gmail.com> and Dotan Kamber <kamberd at yahoo.com>
 #   Based on errore.msg of SVN revision 8988
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2429,12 +2429,10 @@ Free Pascal Compiler version $FPCVERSION
   $OPTIMIZATIONS
 
 äúåëðä îåâùú úçú øéùéåï GNU General Public License
-ìîéãò ðåñó éù ì÷øåà àú COPYING.FPC
+ìîéãò ðåñó éù ì÷øåà àú COPYING.v2
 
 ãéååç òì ú÷ìåú (áàâéí), äöòåú åëå':
                  http://bugs.freepascal.org
-
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorheu.msg

@@ -6,7 +6,7 @@
 #   Contributed by Ido Kanner <idokan at gmail.com> and Dotan Kamber <kamberd at yahoo.com>
 #   Based on errore.msg of SVN revision 8988
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2429,12 +2429,10 @@ Free Pascal Compiler version $FPCVERSION
   $OPTIMIZATIONS
 
 התוכנה מוגשת תחת רישיון GNU General Public License
-למידע נוסף יש לקרוא את COPYING.FPC
+למידע נוסף יש לקרוא את COPYING.v2
 
 דיווח על תקלות (באגים), הצעות וכו':
                  http://bugs.freepascal.org
-
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorid.msg

@@ -5,7 +5,7 @@
 #   Indonesian Language File for Free Pascal
 #   Contributed by Zaenal Mutaqin <ade999 at gmail.com>
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2446,12 +2446,10 @@ Optimasi Didukung:
   $OPTIMIZATIONS
 
 Program ini datang bersama GNU General Public Licence
-Untuk informasi lebih jauh baca COPYING.FPC
+Untuk informasi lebih jauh baca COPYING.v2
 
 Laporkan bugs, saran, dll ke:
                  http://bugs.freepascal.org
-atau
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/erroriu.msg

@@ -6,7 +6,7 @@
 #   Contributed by Massimo Soricetti <notturno at quipo.it>
 #   Translation for FPC 2.4.2, april 16, 2011, Tolentino, Italy
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2725,12 +2725,10 @@ Tipi di microcontroller supportati:
   $CONTROLLERTYPES
 
 Questo programma è distribuito sotto la GNU General Public Licence
-Per ulteriori informazioni leggere il file COPYING.FPC
+Per ulteriori informazioni leggere il file COPYING.v2
 
 Riferire difetti, suggerimenti ecc. a:
                  http://bugs.freepascal.org
-oppure a
-                 [email protected]
 ]
 
 #

+ 4 - 4
compiler/msg/errorn.msg

@@ -6,7 +6,7 @@
 #   Latest updates contributed by Matthijs Willemstein <matthijs at willemstein.net>
 #   Based on errore.msg of SVN revision 3982
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2193,12 +2193,12 @@ Free Pascal Compiler versie $FPCVERSION
 Compiler datum:       $FPCDATE
 Compiler doelsysteem: $FPCTARGET
 Dit programma wordt verspreid onder de GNU General Public Licence
-Voor meer informatie, lees COPYING.FPC. Hiervan is helaas geen
+Voor meer informatie, lees COPYING.v2. Hiervan is helaas geen
 Nederlandse vertaling beschikbaar.
+
                 http://bugs.freepascal.org
-of
-                [email protected]
 ]
+
 #
 # Help pages (option -? and -h)
 #

+ 2 - 4
compiler/msg/errorpl.msg

@@ -4,7 +4,7 @@
 #
 #   Polish (CP 852) Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2138,12 +2138,10 @@ Wspierane instrukcje FPU:
   $FPUINSTRUCTIONSETS
   
 Ten program jest oparty na GNU General Public Licence
-Przeczytaj COPYING.FPC aby dowiedzie† si© wi©cej
+Przeczytaj COPYING.v2 aby dowiedzie† si© wi©cej
 
 Zgˆaszanie bˆ©d¢w, sugestii itp.
                  http://bugs.freepascal.org
-lub
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorpli.msg

@@ -4,7 +4,7 @@
 #
 #   Polish (ISO 8859-2) Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2138,12 +2138,10 @@ Wspierane instrukcje FPU:
   $FPUINSTRUCTIONSETS
   
 Ten program jest oparty na GNU General Public Licence
-Przeczytaj COPYING.FPC aby dowiedzieæ siê wiêcej
+Przeczytaj COPYING.v2 aby dowiedzieæ siê wiêcej
 
 Zg³aszanie b³êdów, sugestii itp.
                  http://bugs.freepascal.org
-lub
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorpt.msg

@@ -6,7 +6,7 @@
 #   Contributed by Marcelo B Paula, based on errore.msg SVN Rev.15527
 #   Former translator: Ari Ricardo Ody <ary.odi at japinfo.com.br>
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2940,12 +2940,10 @@ Tipos Microcontroladores suportados:
   $CONTROLLERTYPES
 
 Este programa ‚ oferecido sob a Licen‡a Geral P£blica GNU
-Para maiores informa‡äes leia COPYING.FPC
+Para maiores informa‡äes leia COPYING.v2
 
 Reportar falhas, sugestäes, etc. para:
                  http://bugs.freepascal.org
-ou
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorptu.msg

@@ -6,7 +6,7 @@
 #   Contributed by Marcelo B Paula, based on errore.msg SVN Rev.15527
 #   Former translator: Ari Ricardo Ody <ary.odi at japinfo.com.br>
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2940,12 +2940,10 @@ Tipos Microcontroladores suportados:
   $CONTROLLERTYPES
 
 Este programa é oferecido sob a Licença Geral Pública GNU
-Para maiores informações leia COPYING.FPC
+Para maiores informações leia COPYING.v2
 
 Reportar falhas, sugestões, etc. para:
                  http://bugs.freepascal.org
-ou
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorr.msg

@@ -7,7 +7,7 @@
 #   This file corresponds to SVN revision 13665 of errore.msg
 #   Translated by Sergei Gorelkin <sergei_gorelkin at mail.ru>
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2538,12 +2538,10 @@ Compiler CPU Target: $FPCCPU
   $CONTROLLERTYPES
 
 This program comes under the GNU General Public Licence
-For more information read COPYING.FPC
+For more information read COPYING.v2
 
 Report bugs, suggestions, etc. to:
                  http://bugs.freepascal.org
-or
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorru.msg

@@ -7,7 +7,7 @@
 #   This file corresponds to SVN revision 13665 of errore.msg
 #   Translated by Sergei Gorelkin <sergei_gorelkin at mail.ru>
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2538,12 +2538,10 @@ Compiler CPU Target: $FPCCPU
   $CONTROLLERTYPES
 
 This program comes under the GNU General Public Licence
-For more information read COPYING.FPC
+For more information read COPYING.v2
 
 Report bugs, suggestions, etc. to:
                  http://bugs.freepascal.org
-or
-                 [email protected]
 ]
 
 #

+ 2 - 4
compiler/msg/errorues.msg

@@ -4,7 +4,7 @@
 #
 #   Spanish Language File for Free Pascal
 #
-#   See the file COPYING.FPC, included in this distribution,
+#   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -2127,12 +2127,10 @@ Sets de instrucciones de la FPU soportados:
   $FPUINSTRUCTIONSETS
 
 Este programa esta bajo la licencia GNU General Public Licence
-Para mas informació lea COPYING.FPC
+Para mas informació lea COPYING.v2
 
 Para informar de errores, sugerencias, etc:
                  http://bugs.freepascal.org
-o
-                 [email protected]
 ]
 
 #

+ 1 - 1
compiler/msgidx.inc

@@ -898,7 +898,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 60934;
+  MsgTxtSize = 61104;
 
   MsgIdxMax : array[1..20] of longint=(
     24,89,314,103,85,54,111,23,202,63,

+ 136 - 132
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000253] of string[240]=(
+const msgtxt : array[0..000254] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000253,1..240] of char=(
+const msgtxt : array[0..000254,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -1099,217 +1099,222 @@ const msgtxt : array[0..000253,1..240] of char=(
   '  $CONTROLLERTYPES'#010+
   #010+
   'This program co','mes under the GNU General Public Licence'#010+
-  'For more information read COPYING.FPC'#010+
+  'For more information read COPYING.v2'#010+
   #010+
-  'Report bugs, suggestions, etc. to:'#010+
+  'Please report bugs in our bug tracker on:'#010+
   '                 http://bugs.freepascal.org'#010+
-  'or'#010+
-  '                 [email protected]'#000+
-  '11025_**0*_Put + after a boolean switch o','ption to enable it, - to di'+
-  'sable it'#010+
-  '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
+  #010+
+  'More information may be found on our WWW pages (including directions'#010+
+  'for m','ailing lists useful for asking questions or discussing potentia'+
+  'l'#010+
+  'new features, etc.):'#010+
+  '                 http://www.freepascal.org'#000+
+  '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
+  'ble it'#010+
+  '**1a_The compiler doesn'#039't delete t','he generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
-  '*L2ap_Use pipes instead of creating temporary assembler f','iles'#010+
+  '*L2ap_Use pipes instead of creating temporary assembler files'#010+
   '**2ar_List register allocation/release info in assembler file'#010+
-  '**2at_List temp allocation/release info in assembler file'#010+
+  '**2','at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
-  '3*2Amacho_Mach-O (Darwin, Int','el 32 bit) using internal writer'#010+
-  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
+  '3*2Amacho_Mach-O (Darwin, Intel 32 bit) using internal writer'#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*2Awasm_Obj file using Wasm (','Watcom)'#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*2Amasm_Obj file using Masm (','Microsoft)'#010+
   '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
   '3*2Acoff_COFF (Go32v2) using internal writer'#010+
-  '3*2Apecoff_PE-COFF (Win32) using ','internal writer'#010+
+  '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
   '4*2Aas_Assemble using GNU AS'#010+
-  '4*2Agas_Assemble using GNU GAS'#010+
+  '4*2Agas_Assemble using GN','U GAS'#010+
   '4*2Agas-darwin_Assemble darwin Mach-O64 using GNU GAS'#010+
   '4*2Amasm_Win64 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*2Aelf_ELF (Linux-64bit) using internal writer'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola assembler'#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 u','sing GNU AS'#010+
+  'S*2Aas_Assemble using GNU AS'#010+
   '**1b_Generate browser info'#010+
-  '**2bl_Generate local symbol info'#010+
+  '**2bl_Generate local symbol inf','o'#010+
   '**1B_Build all modules'#010+
   '**1C<x>_Code generation options:'#010+
   '**2C3<x>_Turn on ieee error checking for constants'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
-  '**2Cb_Gen','erate big-endian code'#010+
+  '**2Cb_Generate big-endian code'#010+
   '**2Cc<x>_Set default calling convention to <x>'#010+
-  '**2CD_Create also dynamic library (not supported)'#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 possibl','e '+
-  'values'#010+
-  '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
+  '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
+  'lues'#010+
+  '**2CF<x>_Minimal floating point constant precision (default, ','32, 64)'+
+  #010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
-  '**2Co_Check overflow of integer operations'#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>_Selec','t instruction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
-  '**2Cr_Range c','hecking'#010+
+  '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set stack checking size to <n>'#010+
+  '**2Cs<n>_Set stack ch','ecking size to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#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 description to <x>'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
-  '*O2Dw_PM application'#010+
+  '*O2Dw_PM ap','plication'#010+
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
   '**1fPIC_Same as -Cg'#010+
   '**1F<x>_Set file names and paths:'#010+
-  '**2Fa<x>[,y]_(for a program) load units <x> and [y] before',' uses is p'+
-  'arsed'#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+
+  '**2FC<x>_Set RC com','piler 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 o','utput to <x>'#010+
+  '**2Fe<x>_Redirect error output to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
-  '**2FE<x>_Set exe/unit output path to <x>'#010+
+  '**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 tab','le from <x>.txt in the compiler '+
-  'dir'#010+
+  '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
+  'r'#010+
   '**2Fo<x>_Add <x> to object path'#010+
-  '**2Fr<x>_Load error message file <x>'#010+
+  '**','2Fr<x>_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+
-  '**2FW<x>_S','tore generated whole-program optimization feedback in <x>'#010+
-  '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
-  'om <x>'#010+
+  '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
+  '**2Fw<x>_Loa','d previously stored whole-program optimization feedback '+
+  'from <x>'#010+
   '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
-  '*g2gh_Use ','heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
+  '*g2gl_Use line i','nfo unit (show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
   '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+
   'aks gdb < 6.5)'#010+
-  '*g3gostabsab','sincludes_ Store absolute/full include file paths in Sta'+
-  'bs'#010+
-  '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+
-  'ame'#010+
+  '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
+  #010+
+  '*g3godwarfm','ethodclassprefix_ Prefix method names in DWARF with class'+
+  ' name'#010+
   '*g2gp_Preserve case in stabs symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
-  '*g2gt_Trash local variable','s (to detect uninitialized uses)'#010+
-  '*g2gv_Generates programs traceable with Valgrind'#010+
+  '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
+  '*g2gv_Generates programs traceable wi','th Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
   '*g2gw2_Generate DWARFv2 debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
-  '*g2gw4_Generate DW','ARFv4 debug information (experimental)'#010+
+  '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+
   '**1i_Information'#010+
-  '**2iD_Return compiler date'#010+
+  '**2iD_Return c','ompiler 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 O','S'#010+
+  '**2iTO_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+
+  '**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+
-  '**2Mdelphi','_Delphi 7 compatibility mode'#010+
+  '**2Mdelphi_Delphi 7 compatibility mode'#010+
   '**2Mtp_TP/BP 7.0 compatibility mode'#010+
-  '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
+  '**2Mm','acpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
   '**1N<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
-  '**1o<x>_Change the name of',' the executable produced to <x>'#010+
+  '**1o<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O-_Disable optimizations'#010+
+  '**2O-_Disable o','ptimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
-  '**2O3_Level 3 optimizations (-O2 + slow opt','imizations)'#010+
+  '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
-  'values'#010+
+  '**2Oo[NO]<x>_Enable or disable ','optimizations, see fpc -i for possibl'+
+  'e values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
-  '**2OW<x>_Generate whole-program optimization feedback',' for optimizati'+
-  'on <x>, see fpc -i for possible values'#010+
-  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
-  'le values'#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 poss'+
+  'ible values'#010+
   '**2Os_Optimize for size rather than speed'#010+
   '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '**1R','<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assembler for target'#010+
+  '**1R<x>_Assembler reading style:'#010+
+  '**2Rdefault_Use default assembler for tar','get'#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_Same as -Mobjfpc'#010+
-  '**2Sc_Supp','ort operators like C (*=,+=,/= and -=)'#010+
+  '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_Turn on assertions'#010+
-  '**2Sd_Same as -Mdelphi'#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+
+  '**3*_h : Comp','iler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use ansistrings by default instead of shortstrings'#010+
-  '**2Si_Turn on inlining of ','procedures/functions declared as "inline"'#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+
+  '**2S','I<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_Support macros like C (global)'#010+
-  '**2So_Same as -Mtp'#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+
+  '**2Sx_En','able exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Generate script',' to link on host'#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+
+  '**2sr_Skip re','gister 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*2Tfreebsd_FreeBSD'#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*2Tiphonesim_ iPhoneS','imulator from iOS SDK 3.2+ (older versions: -T'+
+  'darwin)'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Module (libc)',#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
-  '3*2Tsunos_SunOS/Solaris'#010+
+  '3*2Tsunos_SunOS/Solari','s'#010+
   '3*2Tsymbian_Symbian OS'#010+
   '3*2Tsolaris_Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
-  '4*2Tdarw','in_Darwin/Mac OS X'#010+
+  '4*2Tdarwin_Darwin/Mac OS X'#010+
   '4*2Tlinux_Linux'#010+
-  '4*2Twin64_Win64 (64 bit Windows systems)'#010+
+  '4*2Twin64_Win64 (64 bit Windows sys','tems)'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux'#010+
@@ -1317,106 +1322,105 @@ const msgtxt : array[0..000253,1..240] of char=(
   'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
-  'P*2Tamiga_','AmigaOS'#010+
+  'P*2Tamiga_AmigaOS'#010+
   'P*2Tdarwin_Darwin/Mac OS X'#010+
   'P*2Tlinux_Linux'#010+
-  'P*2Tmacos_Mac OS (classic)'#010+
+  'P*2Tmacos_Mac OS (c','lassic)'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tsolaris_Solaris'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit name matches the fil','e name'#010+
-  '**2Ur_Generate release unit files (never automatically recompiled)'#010+
+  '**2Un_Do not check where the unit name matches the file name'#010+
+  '**2Ur_Generate release unit files (never automatically recompil','ed)'#010+
   '**2Us_Compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
-  '*','*2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files'#010+
+  '**2*_w : Show warnings               u : Show unit info'#010+
+  '**2*_n : Show n','otes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l',' : Show linenumbers            r : Rhide/GCC compatibility mod'+
-  'e'#010+
-  '**2*_s : Show time stamps            q : Show message numbers'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
+  '**2*_s',' : Show time stamps            q : Show message numbers'#010+
   '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names messages   p : Wri','te tree.log with parse t'+
-  'ree'#010+
-  '**2*_    with full path              v : Write fpcdebug.txt with'#010+
+  '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
+  'e'#010+
+  '**2*_    with full path              v : W','rite fpcdebug.txt with'#010+
   '**2*_                                    lots of debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
-  '**1W<x>_Target-specific op','tions (targets)'#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 instea','d 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+
+  'p*2Wb_Create a bundle instead of a library (Da','rwin)'#010+
   'A*2Wb_Create 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*2WBxxx','x_Set image base to xxxx (Windows, Symbian)'#010+
-  '4*2WB_Create a relocatable image (Windows)'#010+
+  '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#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 console type application (EMX, OS/2, Windows)'#010+
+  '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
+  '4*2WC_Specify co','nsole type application (EMX, OS/2, Windows)'#010+
   'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
-  '3*2WD_Use DEFFILE to ','export functions of DLL or EXE (Windows)'#010+
-  '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#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+
   '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+
+  '4*2We_Use external resources (Darwin)'#010+
   'A*2We_Use external resources (Darwin)'#010+
-  'P*2We_Use external resources (Darwin)'#010+
+  'P*2We_Use external resources (D','arwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
   '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  '4*2WG_Spec','ify graphic type application (EMX, OS/2, Windows)'#010+
-  'A*2WG_Specify graphic type application (Windows)'#010+
+  '4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
+  'A*2WG_Specify graphi','c 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 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+
+  'p*2','Wi_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+
-  '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 (Win','dows'+
+  'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
+  '3*2WN_Do not generate relocation c','ode, needed for debugging (Windows'+
   ')'#010+
-  'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#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 v','alue'+
+  's'#010+
   'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
   '4*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_Genera','te relocation code (Windows)'#010+
-  'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
+  'A*2WR_Generate relocation code (Windows)'#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 use ','standard library search path (needed for cross comp'+
-  'ile)'#010+
-  '**2Xe_Use external linker'#010+
+  '**2Xd_Do not use standard library search path (needed for cross compil'+
+  'e)'#010+
+  '**2Xe_Use exte','rnal 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 linker'#010+
   '**2Xm_Generate link map'#010+
-  '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
-  's '#039'main'#039')'#010+
+  '**2XM<x>_Set the name of t','he '#039'main'#039' program routine (default'+
+  ' is '#039'main'#039')'#010+
   '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
-  'il','e, 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+
+  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XR<x>_Prep','end <x> to all linker search paths (BeOS, Darwin, FreeB'+
+  'SD, Linux, Mac OS, Solaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try to link units statically (default, de','fines FPC_LINK_STATIC'+
-  ')'#010+
-  '**2Xt_Link with static libraries (-static is passed to linker)'#010+
+  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
+  '**2Xt_Link with static libraries (-static is pa','ssed to linker)'#010+
   '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+