Merged revisions 509 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@510 -

compiler/msg/errore.msg

@@ -2347,6 +2347,7 @@ S*2Tlinux_Linux
 **2*_v : write fpcdebug.txt with     p : Write tree.log with parse tree
 **2*_    lots of debugging info
 3*1W<x>_Win32-like target options
+3*2WB_Create a relocatable image
 3*2WB<x>_Set Image base to Hexadecimal <x> value
 3*2WC_Specify console type application
 3*2WD_Use DEFFILE to export functions of DLL or EXE

compiler/msgidx.inc

@@ -656,7 +656,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 38582;
+  MsgTxtSize = 38615;
 
   MsgIdxMax : array[1..20] of longint=(
     19,72,214,59,59,46,100,20,35,60,

compiler/msgtxt.inc

@@ -915,26 +915,27 @@ const msgtxt : array[0..000160,1..240] of char=(
   'e'#010+
   '**2*_    lots of debugging info'#010+
   '3*1W<x>_Win32-like',' target options'#010+
+  '3*2WB_Create a relocatable image'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type ap','plication'#010+
+  '3*2WF_Specify full-screen type application (OS/2 on','ly)'#010+
+  '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type application (MacOS only)'#010+
-  'P*2WT_Specify tool type applica','tion (MPW tool, MacOS only)'#010+
+  'P*2WG_Specify graphic type application (MacOS only',')'#010+
+  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_pass --shared to the linker (Unix only)'#010+
   '**2Xd_don'#039't use standard library search path (needed for cross com'+
   'pile)'#010+
-  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '*','*2XP<x>_prepend the binutils names with the prefix <x>'#010+
+  '**2XD_try to link units dynamic     ','     (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2Xt_link ','with static libraries (-static is passed to linker)'#010+
+  '**2XS_try to link units static (default) (def','ines FPC_LINK_STATIC)'#010+
+  '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+