IDE: fixed old Gutter.OnChange

git-svn-id: trunk@15405 -
2025-04-07 07:38:14 +02:00 · 2008-06-13 10:17:03 +00:00 · 2008-06-13 10:17:03 +00:00 · 4526640d8f
commit 4526640d8f
parent d694c15f0a
17 changed files with 6427 additions and 3618 deletions
--- a/components/lazreport/source/lr_edit.lfm
+++ b/components/lazreport/source/lr_edit.lfm
@ -152,7 +152,6 @@ object frEditorForm: TfrEditorForm
      Gutter.Color = 13605511
      Gutter.LeftOffset = 10
      Gutter.Width = 20
-      Gutter.OnChange = nil
      Gutter.CodeFoldingWidth = 14
      Highlighter = SynPasSyn1
      Keystrokes = <      
--- a/components/lazreport/source/lr_expres.lfm
+++ b/components/lazreport/source/lr_expres.lfm
@ -1,21 +1,18 @@
 object lrExpresionEditorForm: TlrExpresionEditorForm
-  Left = 195
+  Left = 205
  Height = 300
-  Top = 104
+  Top = 108
  Width = 417
-  HorzScrollBar.Page = 416
-  VertScrollBar.Page = 299
  ActiveControl = Memo1
  Caption = 'Insert Expression'
  ClientHeight = 300
  ClientWidth = 417
-  PixelsPerInch = 96
+  LCLVersion = '0.9.25'
  object Label1: TLabel
-    Height = 14
+    Height = 20
    Width = 417
    Align = alTop
    Caption = 'Expression'
-    Color = clNone
    ParentColor = False
  end
  object GroupBox1: TGroupBox
@ -24,7 +21,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    Width = 417
    Align = alBottom
    Caption = 'Insert'
-    ClientHeight = 62
+    ClientHeight = 61
    ClientWidth = 413
    TabOrder = 0
    object Panel1: TPanel
@ -73,7 +70,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
      end
    end
    object Button1: TButton
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -85,7 +82,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button2: TButton
      Left = 30
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -97,7 +94,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button3: TButton
      Left = 60
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -109,7 +106,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button4: TButton
      Left = 90
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -121,7 +118,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button5: TButton
      Left = 120
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -133,7 +130,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button6: TButton
      Left = 150
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -145,7 +142,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button7: TButton
      Left = 180
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -157,7 +154,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button8: TButton
      Left = 210
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -169,7 +166,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button9: TButton
      Left = 240
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -181,7 +178,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button10: TButton
      Left = 270
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -193,7 +190,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button11: TButton
      Left = 360
-      Height = 28
+      Height = 27
      Top = 34
      Width = 53
      Align = alClient
@ -205,7 +202,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button12: TButton
      Left = 330
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -217,7 +214,7 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
    object Button13: TButton
      Left = 300
-      Height = 28
+      Height = 27
      Top = 34
      Width = 30
      Align = alLeft
@ -229,17 +226,14 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
    end
  end
  object Memo1: TSynEdit
-    Name = 'Memo1'
-    Height = 166
-    Top = 14
+    Height = 160
+    Top = 20
    Width = 417
    Align = alClient
    Font.Height = -16
    Font.Name = 'courier'
    ParentColor = False
    TabOrder = 1
-    BookMarkOptions.OnChange = nil
-    Gutter.OnChange = nil
    Gutter.CodeFoldingWidth = 14
    Keystrokes = <    
      item
@ -562,7 +556,6 @@ object lrExpresionEditorForm: TlrExpresionEditorForm
        Command = 250
        ShortCut = 24642
      end>
-    SelectedColor.OnChange = nil
  end
  object Panel2: TPanel
    Height = 40
--- a/components/lazreport/source/lr_expres.lrs
+++ b/components/lazreport/source/lr_expres.lrs
@ -1,82 +1,80 @@
 { Ýòî - ôàéë ðåñóðñîâ, àâòîìàòè÷åñêè ñîçäàííûé lazarus }

 LazarusResources.Add('TlrExpresionEditorForm','FORMDATA',[
-  'TPF0'#22'TlrExpresionEditorForm'#21'lrExpresionEditorForm'#4'Left'#3#195#0#6
-  +'Height'#3','#1#3'Top'#2'h'#5'Width'#3#161#1#18'HorzScrollBar.Page'#3#160#1
-  +#18'VertScrollBar.Page'#3'+'#1#13'ActiveControl'#7#5'Memo1'#7'Caption'#6#17
-  +'Insert Expression'#12'ClientHeight'#3','#1#11'ClientWidth'#3#161#1#13'Pixel'
-  +'sPerInch'#2'`'#0#6'TLabel'#6'Label1'#6'Height'#2#14#5'Width'#3#161#1#5'Alig'
-  +'n'#7#5'alTop'#7'Caption'#6#10'Expression'#5'Color'#7#6'clNone'#11'ParentCol'
-  +'or'#8#0#0#9'TGroupBox'#9'GroupBox1'#6'Height'#2'P'#3'Top'#3#180#0#5'Width'#3
-  +#161#1#5'Align'#7#8'alBottom'#7'Caption'#6#6'Insert'#12'ClientHeight'#2'>'#11
-  +'ClientWidth'#3#157#1#8'TabOrder'#2#0#0#6'TPanel'#6'Panel1'#6'Height'#2'"'#5
-  +'Width'#3#157#1#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'#12'ClientHeig'
-  +'ht'#2'"'#11'ClientWidth'#3#157#1#8'TabOrder'#2#0#0#7'TBitBtn'#7'BitBtn1'#4
-  +'Left'#3#22#1#6'Height'#2#28#3'Top'#2#1#5'Width'#3#128#0#25'BorderSpacing.In'
-  +'nerBorder'#2#2#7'Caption'#6#8'Function'#9'NumGlyphs'#2#0#7'OnClick'#7#12'Bi'
-  +'tBtn1Click'#8'TabOrder'#2#2#7'TabStop'#8#0#0#7'TBitBtn'#7'BitBtn2'#4'Left'#3
+  'TPF0'#22'TlrExpresionEditorForm'#21'lrExpresionEditorForm'#4'Left'#3#205#0#6
+  +'Height'#3','#1#3'Top'#2'l'#5'Width'#3#161#1#13'ActiveControl'#7#5'Memo1'#7
+  +'Caption'#6#17'Insert Expression'#12'ClientHeight'#3','#1#11'ClientWidth'#3
+  +#161#1#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#6'Label1'#6'Height'#2#20#5'Wid'
+  +'th'#3#161#1#5'Align'#7#5'alTop'#7'Caption'#6#10'Expression'#11'ParentColor'
+  +#8#0#0#9'TGroupBox'#9'GroupBox1'#6'Height'#2'P'#3'Top'#3#180#0#5'Width'#3#161
+  +#1#5'Align'#7#8'alBottom'#7'Caption'#6#6'Insert'#12'ClientHeight'#2'='#11'Cl'
+  +'ientWidth'#3#157#1#8'TabOrder'#2#0#0#6'TPanel'#6'Panel1'#6'Height'#2'"'#5'W'
+  +'idth'#3#157#1#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'#12'ClientHeigh'
+  +'t'#2'"'#11'ClientWidth'#3#157#1#8'TabOrder'#2#0#0#7'TBitBtn'#7'BitBtn1'#4'L'
+  +'eft'#3#22#1#6'Height'#2#28#3'Top'#2#1#5'Width'#3#128#0#25'BorderSpacing.Inn'
+  +'erBorder'#2#2#7'Caption'#6#8'Function'#9'NumGlyphs'#2#0#7'OnClick'#7#12'Bit'
+  +'Btn1Click'#8'TabOrder'#2#2#7'TabStop'#8#0#0#7'TBitBtn'#7'BitBtn2'#4'Left'#3
  +#142#0#6'Height'#2#28#3'Top'#2#1#5'Width'#2''#25'BorderSpacing.InnerBorder'
  +#2#2#7'Caption'#6#8'Variable'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn2Click'
  +#8'TabOrder'#2#1#7'TabStop'#8#0#0#7'TBitBtn'#7'BitBtn3'#4'Left'#2#6#6'Height'
  +#2#28#3'Top'#2#1#5'Width'#2''#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6
  +#9'DB fields'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn3Click'#8'TabOrder'#2#0
-  +#7'TabStop'#8#0#0#0#7'TButton'#7'Button1'#6'Height'#2#28#3'Top'#2'"'#5'Width'
+  +#7'TabStop'#8#0#0#0#7'TButton'#7'Button1'#6'Height'#2#27#3'Top'#2'"'#5'Width'
  +#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1
  +'+'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#8#7'TabStop'#8#0#0#7'TButto'
-  +'n'#7'Button2'#4'Left'#2#30#6'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'
+  +'n'#7'Button2'#4'Left'#2#30#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'
  +#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'-'#7'OnClick'#7
  +#13'Button13Click'#8'TabOrder'#2#1#7'TabStop'#8#0#0#7'TButton'#7'Button3'#4
-  +'Left'#2'<'#6'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25
+  +'Left'#2'<'#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25
  +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'*'#7'OnClick'#7#13'Button13Cl'
  +'ick'#8'TabOrder'#2#2#7'TabStop'#8#0#0#7'TButton'#7'Button4'#4'Left'#2'Z'#6
-  +'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacin'
+  +'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacin'
  +'g.InnerBorder'#2#2#7'Caption'#6#1'/'#7'OnClick'#7#13'Button13Click'#8'TabOr'
-  +'der'#2#3#7'TabStop'#8#0#0#7'TButton'#7'Button5'#4'Left'#2'x'#6'Height'#2#28
+  +'der'#2#3#7'TabStop'#8#0#0#7'TButton'#7'Button5'#4'Left'#2'x'#6'Height'#2#27
  +#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'
  +#2#2#7'Caption'#6#1'='#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#4#7'TabS'
-  +'top'#8#0#0#7'TButton'#7'Button6'#4'Left'#3#150#0#6'Height'#2#28#3'Top'#2'"'
+  +'top'#8#0#0#7'TButton'#7'Button6'#4'Left'#3#150#0#6'Height'#2#27#3'Top'#2'"'
  +#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Capt'
  +'ion'#6#2'<>'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#9#7'TabStop'#8#0#0
-  +#7'TButton'#7'Button7'#4'Left'#3#180#0#6'Height'#2#28#3'Top'#2'"'#5'Width'#2
+  +#7'TButton'#7'Button7'#4'Left'#3#180#0#6'Height'#2#27#3'Top'#2'"'#5'Width'#2
  +#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'>'
  +#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#12#7'TabStop'#8#0#0#7'TButton'
-  +#7'Button8'#4'Left'#3#210#0#6'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'
+  +#7'Button8'#4'Left'#3#210#0#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'
  +#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'<'#7'OnClick'#7
  +#13'Button13Click'#8'TabOrder'#2#7#7'TabStop'#8#0#0#7'TButton'#7'Button9'#4
-  +'Left'#3#240#0#6'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'
+  +'Left'#3#240#0#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'
  +#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'>='#7'OnClick'#7#13'Button'
  +'13Click'#8'TabOrder'#2#6#7'TabStop'#8#0#0#7'TButton'#8'Button10'#4'Left'#3
-  +#14#1#6'Height'#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'Borde'
+  +#14#1#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'Borde'
  +'rSpacing.InnerBorder'#2#2#7'Caption'#6#2'<='#7'OnClick'#7#13'Button13Click'
  +#8'TabOrder'#2#5#7'TabStop'#8#0#0#7'TButton'#8'Button11'#4'Left'#3'h'#1#6'He'
-  +'ight'#2#28#3'Top'#2'"'#5'Width'#2'5'#5'Align'#7#8'alClient'#25'BorderSpacin'
+  +'ight'#2#27#3'Top'#2'"'#5'Width'#2'5'#5'Align'#7#8'alClient'#25'BorderSpacin'
  +'g.InnerBorder'#2#2#7'Caption'#6#3'not'#7'OnClick'#7#13'Button13Click'#8'Tab'
  +'Order'#2#13#7'TabStop'#8#0#0#7'TButton'#8'Button12'#4'Left'#3'J'#1#6'Height'
-  +#2#28#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerB'
+  +#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerB'
  +'order'#2#2#7'Caption'#6#2'or'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2
-  +#11#7'TabStop'#8#0#0#7'TButton'#8'Button13'#4'Left'#3','#1#6'Height'#2#28#3
+  +#11#7'TabStop'#8#0#0#7'TButton'#8'Button13'#4'Left'#3','#1#6'Height'#2#27#3
  +'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2
  +#2#7'Caption'#6#3'and'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#10#7'Tab'
-  +'Stop'#8#0#0#0#8'TSynEdit'#5'Memo1'#4'Name'#6#5'Memo1'#6'Height'#3#166#0#3'T'
-  +'op'#2#14#5'Width'#3#161#1#5'Align'#7#8'alClient'#11'Font.Height'#2#240#9'Fo'
-  +'nt.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#1#24'BookMarkOptions.'
-  +'OnChange'#13#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Key'
-  +'strokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCu'
-  +'t'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'Shor'
-  +'tCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'S'
-  +'hortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Sh'
-  ,'ortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Sh'
-  +'ortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Sh'
-  +'ortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
-  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
-  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
-  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
-  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
-  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
-  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
-  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
-  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
-  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +'Stop'#8#0#0#0#8'TSynEdit'#5'Memo1'#6'Height'#3#160#0#3'Top'#2#20#5'Width'#3
+  +#161#1#5'Align'#7#8'alClient'#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'
+  +#11'ParentColor'#8#8'TabOrder'#2#1#23'Gutter.CodeFoldingWidth'#2#14#10'Keyst'
+  +'rokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'
+  +#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCu'
+  +'t'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'Shor'
+  +'tCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Short'
+  +'Cut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Short'
+  +'Cut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Short'
+  ,'Cut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'Sho'
+  +'rtCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'Sh'
+  +'ortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'S'
+  +'hortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'Sh'
+  +'ortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'S'
+  +'hortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'Sh'
+  +'ortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'S'
+  +'hortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'Sh'
+  +'ortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'S'
+  +'hortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
@ -103,14 +101,123 @@ LazarusResources.Add('TlrExpresionEditorForm','FORMDATA',[
  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
-  +#0#0#22'SelectedColor.OnChange'#13#0#0#6'TPanel'#6'Panel2'#6'Height'#2'('#3
-  +'Top'#3#4#1#5'Width'#3#161#1#5'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvNon'
-  +'e'#12'ClientHeight'#2'('#11'ClientWidth'#3#161#1#8'TabOrder'#2#2#0#7'TBitBt'
-  +'n'#7'BitBtn4'#4'Left'#3#1#1#6'Height'#2#30#3'Top'#2#6#5'Width'#2'K'#7'Ancho'
-  +'rs'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6
-  +#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8
-  +'TabOrder'#2#0#0#0#7'TBitBtn'#7'BitBtn5'#4'Left'#3'R'#1#6'Height'#2#30#3'Top'
-  +#2#6#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.Inne'
-  +'rBorder'#2#2#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2
-  +#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
+  +#0#0#0#0#6'TPanel'#6'Panel2'#6'Height'#2'('#3'Top'#3#4#1#5'Width'#3#161#1#5
+  +'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('#11'Cl'
+  +'ientWidth'#3#161#1#8'TabOrder'#2#2#0#7'TBitBtn'#7'BitBtn4'#4'Left'#3#1#1#6
+  +'Height'#2#30#3'Top'#2#6#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25
+  +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4
+  +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#7
+  +'BitBtn5'#4'Left'#3'R'#1#6'Height'#2#30#3'Top'#2#6#5'Width'#2'K'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#6'C'
+  +'ancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrde'
+  +'r'#2#1#0#0#0#0#22'TlrExpresionEditorForm'#21'lrExpresionEditorForm'#4'Left'
+  +#3#205#0#6'Height'#3','#1#3'Top'#2'l'#5'Width'#3#161#1#13'ActiveControl'#7#5
+  +'Memo1'#7'Caption'#6#17'Insert Expression'#12'ClientHeight'#3','#1#11'Client'
+  +'Width'#3#161#1#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#6'Label1'#6'Height'#2
+  +#20#5'Width'#3#161#1#5'Align'#7#5'alTop'#7'Caption'#6#10'Expression'#11'Pare'
+  +'ntColor'#8#0#0#9'TGroupBox'#9'GroupBox1'#6'Height'#2'P'#3'Top'#3#180#0#5'Wi'
+  +'dth'#3#161#1#5'Align'#7#8'alBottom'#7'Caption'#6#6'Insert'#12'ClientHeight'
+  +#2'='#11'ClientWidth'#3#157#1#8'TabOrder'#2#0#0#6'TPanel'#6'Panel1'#6'Height'
+  +#2'"'#5'Width'#3#157#1#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'#12'Cli'
+  +'entHeight'#2'"'#11'ClientWidth'#3#157#1#8'TabOrder'#2#0#0#7'TBitBtn'#7'BitB'
+  +'tn1'#4'Left'#3#22#1#6'Height'#2#28#3'Top'#2#1#5'Width'#3#128#0#25'BorderSpa'
+  +'cing.InnerBorder'#2#2#7'Caption'#6#8'Function'#9'NumGlyphs'#2#0#7'OnClick'#7
+  +#12'BitBtn1Click'#8'TabOrder'#2#2#7'TabStop'#8#0#0#7'TBitBtn'#7'BitBtn2'#4'L'
+  +'eft'#3#142#0#6'Height'#2#28#3'Top'#2#1#5'Width'#2''#25'BorderSpacing.Inner'
+  +'Border'#2#2#7'Caption'#6#8'Variable'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBt'
+  +'n2Click'#8'TabOrder'#2#1#7'TabStop'#8#0#0#7'TBitBtn'#7'BitBtn3'#4'Left'#2#6
+  +#6'Height'#2#28#3'Top'#2#1#5'Width'#2''#25'BorderSpacing.InnerBorder'#2#2#7
+  +'Caption'#6#9'DB fields'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn3Click'#8'Ta'
+  +'bOrder'#2#0#7'TabStop'#8#0#0#0#7'TButton'#7'Button1'#6'Height'#2#27#3'Top'#2
+  ,'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'C'
+  +'aption'#6#1'+'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#8#7'TabStop'#8#0
+  +#0#7'TButton'#7'Button2'#4'Left'#2#30#6'Height'#2#27#3'Top'#2'"'#5'Width'#2
+  +#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'-'
+  +#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#1#7'TabStop'#8#0#0#7'TButton'#7
+  +'Button3'#4'Left'#2'<'#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6
+  +'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'*'#7'OnClick'#7#13
+  +'Button13Click'#8'TabOrder'#2#2#7'TabStop'#8#0#0#7'TButton'#7'Button4'#4'Lef'
+  +'t'#2'Z'#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'Bo'
+  +'rderSpacing.InnerBorder'#2#2#7'Caption'#6#1'/'#7'OnClick'#7#13'Button13Clic'
+  +'k'#8'TabOrder'#2#3#7'TabStop'#8#0#0#7'TButton'#7'Button5'#4'Left'#2'x'#6'He'
+  +'ight'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.'
+  +'InnerBorder'#2#2#7'Caption'#6#1'='#7'OnClick'#7#13'Button13Click'#8'TabOrde'
+  +'r'#2#4#7'TabStop'#8#0#0#7'TButton'#7'Button6'#4'Left'#3#150#0#6'Height'#2#27
+  +#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'
+  +#2#2#7'Caption'#6#2'<>'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#9#7'Tab'
+  +'Stop'#8#0#0#7'TButton'#7'Button7'#4'Left'#3#180#0#6'Height'#2#27#3'Top'#2'"'
+  +#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Capt'
+  +'ion'#6#1'>'#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#12#7'TabStop'#8#0#0
+  +#7'TButton'#7'Button8'#4'Left'#3#210#0#6'Height'#2#27#3'Top'#2'"'#5'Width'#2
+  +#30#5'Align'#7#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'<'
+  +#7'OnClick'#7#13'Button13Click'#8'TabOrder'#2#7#7'TabStop'#8#0#0#7'TButton'#7
+  +'Button9'#4'Left'#3#240#0#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7
+  +#6'alLeft'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'>='#7'OnClick'#7
+  +#13'Button13Click'#8'TabOrder'#2#6#7'TabStop'#8#0#0#7'TButton'#8'Button10'#4
+  +'Left'#3#14#1#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'
+  +#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'<='#7'OnClick'#7#13'Button'
+  +'13Click'#8'TabOrder'#2#5#7'TabStop'#8#0#0#7'TButton'#8'Button11'#4'Left'#3
+  +'h'#1#6'Height'#2#27#3'Top'#2'"'#5'Width'#2'5'#5'Align'#7#8'alClient'#25'Bor'
+  +'derSpacing.InnerBorder'#2#2#7'Caption'#6#3'not'#7'OnClick'#7#13'Button13Cli'
+  +'ck'#8'TabOrder'#2#13#7'TabStop'#8#0#0#7'TButton'#8'Button12'#4'Left'#3'J'#1
+  +#6'Height'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpac'
+  +'ing.InnerBorder'#2#2#7'Caption'#6#2'or'#7'OnClick'#7#13'Button13Click'#8'Ta'
+  +'bOrder'#2#11#7'TabStop'#8#0#0#7'TButton'#8'Button13'#4'Left'#3','#1#6'Heigh'
+  +'t'#2#27#3'Top'#2'"'#5'Width'#2#30#5'Align'#7#6'alLeft'#25'BorderSpacing.Inn'
+  +'erBorder'#2#2#7'Caption'#6#3'and'#7'OnClick'#7#13'Button13Click'#8'TabOrder'
+  +#2#10#7'TabStop'#8#0#0#0#8'TSynEdit'#5'Memo1'#6'Height'#3#160#0#3'Top'#2#20#5
+  +'Width'#3#161#1#5'Align'#7#8'alClient'#11'Font.Height'#2#240#9'Font.Name'#6#7
+  +'courier'#11'ParentColor'#8#8'TabOrder'#2#1#23'Gutter.CodeFoldingWidth'#2#14
+  +#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'S'
+  +'hortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8
+  +'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0
+  +#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8
+  +'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8
+  +'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8
+  +'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
+  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
+  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
+  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
+  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
+  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
+  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
+  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
+  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
+  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
+  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
+  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
+  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
+  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
+  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
+  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
+  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
+  ,#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
+  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
+  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
+  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
+  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
+  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
+  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
+  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
+  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
+  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
+  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
+  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
+  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
+  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
+  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
+  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
+  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
+  +#0#0#0#0#6'TPanel'#6'Panel2'#6'Height'#2'('#3'Top'#3#4#1#5'Width'#3#161#1#5
+  +'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'('#11'Cl'
+  +'ientWidth'#3#161#1#8'TabOrder'#2#2#0#7'TBitBtn'#7'BitBtn4'#4'Left'#3#1#1#6
+  +'Height'#2#30#3'Top'#2#6#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25
+  +'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4
+  +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#7
+  +'BitBtn5'#4'Left'#3'R'#1#6'Height'#2#30#3'Top'#2#6#5'Width'#2'K'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#6'C'
+  +'ancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrde'
+  +'r'#2#1#0#0#0#0
 ]);
--- a/components/printers/design/printers4lazidetest/main.lfm
+++ b/components/printers/design/printers4lazidetest/main.lfm
@ -1,15 +1,14 @@
 object Form1: TForm1
-  Left = 290
+  Left = 289
  Height = 596
-  Top = 175
+  Top = 167
  Width = 767
-  HorzScrollBar.Page = 766
-  VertScrollBar.Page = 595
  ActiveControl = SynEdit1
  Caption = 'Form1'
  ClientHeight = 596
  ClientWidth = 767
  OnCreate = FormCreate
+  LCLVersion = '0.9.25'
  object SynEdit1: TSynEdit
    AnchorSideTop.Control = Button1
    AnchorSideTop.Side = asrBottom
@ -22,10 +21,8 @@ object Form1: TForm1
    Font.Name = 'courier'
    ParentColor = False
    TabOrder = 0
-    BookMarkOptions.Xoffset = 38
-    BookMarkOptions.OnChange = nil
+    BookMarkOptions.Xoffset = 46
    Gutter.ShowLineNumbers = True
-    Gutter.OnChange = nil
    Gutter.CodeFoldingWidth = 14
    Keystrokes = <    
      item
@ -351,7 +348,6 @@ object Form1: TForm1
    Lines.Strings = (
      'SynEdit1'
    )
-    SelectedColor.OnChange = nil
  end
  object Button1: TButton
    AnchorSideLeft.Control = Owner
--- a/components/printers/design/printers4lazidetest/main.lrs
+++ b/components/printers/design/printers4lazidetest/main.lrs
@ -1,61 +1,114 @@
 { This is an automatically generated lazarus resource file }

 LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3'T'#2#3'Top'#3#175#0#5'Wi'
-  +'dth'#3#255#2#18'HorzScrollBar.Page'#3#254#2#18'VertScrollBar.Page'#3'S'#2#13
-  +'ActiveControl'#7#8'SynEdit1'#7'Caption'#6#5'Form1'#12'ClientHeight'#3'T'#2
-  +#11'ClientWidth'#3#255#2#8'OnCreate'#7#10'FormCreate'#0#8'TSynEdit'#8'SynEdi'
-  +'t1'#21'AnchorSideTop.Control'#7#7'Button1'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#6'Height'#3'/'#2#3'Top'#2'%'#5'Width'#3#255#2#5'Align'#7#8'alBottom'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2
-  +#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMark'
-  +'Options.Xoffset'#2'&'#24'BookMarkOptions.OnChange'#13#22'Gutter.ShowLineNum'
-  +'bers'#9#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrok'
-  +'es'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3
-  +'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'
-  +#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCu'
-  +'t'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'
-  +#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3
-  +'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3
-  +''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3
-  +'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3
-  +'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3
-  +'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'!'
-  +' '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3
-  +'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$'
-  +' '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3
-  +'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'#'
-  +' '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3
-  +'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortC'
-  +'ut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8
-  +'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245
-  +#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3
-  +#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7
-  +'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2
-  +#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortC'
-  +'ut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8
-  +'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3
-  +#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Comma'
-  +'nd'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7
-  +'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3
-  +'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCu'
-  +'t'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'Sh'
-  +'ortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1
-  +#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3
-  +'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Comman'
-  +'d'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'C'
-  +'ommand'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1
-  +#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'
-  +#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3
-  +'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCu'
-  +'t'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'S'
-  +'hortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233
-  +#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3
-  +'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lin'
-  +'es.Strings'#1#6#8'SynEdit1'#0#22'SelectedColor.OnChange'#13#0#0#7'TButton'#7
-  +'Button1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5
-  +'Owner'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#20'BorderSpacing'
-  +'.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#5'Print'#7'OnCl'
-  +'ick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#0
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'!'#1#6'Height'#3'T'#2#3'Top'#3#167#0#5'Wi'
+  +'dth'#3#255#2#13'ActiveControl'#7#8'SynEdit1'#7'Caption'#6#5'Form1'#12'Clien'
+  +'tHeight'#3'T'#2#11'ClientWidth'#3#255#2#8'OnCreate'#7#10'FormCreate'#10'LCL'
+  +'Version'#6#6'0.9.25'#0#8'TSynEdit'#8'SynEdit1'#21'AnchorSideTop.Control'#7#7
+  +'Button1'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3'/'#2#3'Top'#2'%'
+  +#5'Width'#3#255#2#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11'P'
+  +'arentColor'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'.'#22'Gutter.Sh'
+  +'owLineNumbers'#9#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Com'
+  +'mand'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Comm'
+  +'and'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Co'
+  +'mmand'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7
+  +'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'C'
+  +'ommand'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'C'
+  +'ommand'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#8
+  +'SynEdit1'#0#0#0#7'TButton'#7'Button1'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5
+  +'Width'#2'K'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#5'Print'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#0#6'T'
+  +'Form1'#5'Form1'#4'Left'#3'!'#1#6'Height'#3'T'#2#3'Top'#3#167#0#5'Width'#3
+  +#255#2#13'ActiveControl'#7#8'SynEdit1'#7'Caption'#6#5'Form1'#12'ClientHeight'
+  +#3'T'#2#11'ClientWidth'#3#255#2#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6
+  +#6'0.9.25'#0#8'TSynEdit'#8'SynEdit1'#21'AnchorSideTop.Control'#7#7'Button1'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3'/'#2#3'Top'#2'%'#5'Width'
+  +#3#255#2#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11'ParentColor'
+  +#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'.'#22'Gutter.ShowLineNumber'
+  +'s'#9#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8
+  ,'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0
+  +#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8
+  +'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1
+  +#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8
+  +'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8
+  +'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
+  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
+  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
+  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
+  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
+  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
+  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
+  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
+  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
+  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
+  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
+  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
+  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
+  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
+  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
+  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
+  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
+  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
+  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
+  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
+  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
+  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
+  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
+  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
+  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
+  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
+  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
+  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
+  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#8'SynEdit1'#0
+  +#0#0#7'TButton'#7'Button1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
+  +'deTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#2
+  +'K'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
+  +#6#5'Print'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#0
 ]);
--- a/ide/checklfmdlg.lfm
+++ b/ide/checklfmdlg.lfm
@ -1,59 +1,64 @@
 object CheckLFMDialog: TCheckLFMDialog
+  Left = 367
+  Height = 516
+  Top = 196
+  Width = 458
+  ActiveControl = LFMSynEdit
  Caption = 'Repair LFM file'
  ClientHeight = 516
  ClientWidth = 458
  OnCreate = CheckLFMDialogCreate
-  HorzScrollBar.Page = 459
-  VertScrollBar.Page = 517
-  Left = 368
-  Height = 516
-  Top = 200
-  Width = 458
+  LCLVersion = '0.9.25'
+  object NoteLabel: TLabel
+    Left = 8
+    Height = 20
+    Top = 8
+    Width = 66
+    Caption = 'NoteLabel'
+    ParentColor = False
+    WordWrap = True
+  end
  object CancelButton: TButton
-    Anchors = [akleft, akbottom]
-    ModalResult = 2
-    Caption = 'Cancel'
-    TabStop = True
-    TabOrder = 0
    Left = 359
    Height = 25
    Top = 483
    Width = 75
+    Anchors = [akLeft, akBottom]
+    Caption = 'Cancel'
+    ModalResult = 2
+    TabOrder = 0
  end
  object RemoveAllButton: TButton
-    Anchors = [akleft, akbottom]
-    Caption = 'Remove all invalid properties'
-    TabStop = True
-    TabOrder = 1
-    OnClick = RemoveAllButtonClick
    Left = 24
    Height = 25
    Top = 483
    Width = 311
+    Anchors = [akLeft, akBottom]
+    Caption = 'Remove all invalid properties'
+    OnClick = RemoveAllButtonClick
+    TabOrder = 1
  end
  object LFMGroupBox: TGroupBox
-    Anchors = [aktop, akleft, akright, akbottom]
-    Caption = 'LFM file'
-    ClientHeight = 266
-    ClientWidth = 442
-    ParentColor = True
-    ParentCtl3D = False
-    TabOrder = 2
    Left = 8
    Height = 283
    Top = 80
    Width = 446
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    Caption = 'LFM file'
+    ClientHeight = 264
+    ClientWidth = 442
+    ParentCtl3D = False
+    TabOrder = 2
    object LFMSynEdit: TSynEdit
-      Align = alclient
+      Height = 264
+      Width = 442
+      Align = alClient
      Font.Height = -15
      Font.Name = 'courier'
-      Height = 266
-      Name = 'LFMSynEdit'
+      ParentColor = False
      ParentCtl3D = False
      TabOrder = 0
-      Width = 442
-      BookMarkOptions.OnChange = nil
-      Gutter.OnChange = nil
+      Gutter.CodeFoldingWidth = 14
      Highlighter = SynLFMSyn1
      Keystrokes = <      
        item
@ -379,44 +384,29 @@ object CheckLFMDialog: TCheckLFMDialog
      Lines.Strings = (
        'LFMSynEdit'
      )
-      SelectedColor.OnChange = nil
      OnSpecialLineColors = LFMSynEditSpecialLineColors
-      Cursor = 65532
-      Height = 266
-      Width = 442
    end
  end
  object ErrorsGroupBox: TGroupBox
-    Anchors = [akleft, akright, akbottom]
-    Caption = 'Errors'
-    ClientHeight = 87
-    ClientWidth = 442
-    ParentColor = True
-    ParentCtl3D = False
-    TabOrder = 3
    Left = 8
    Height = 104
    Top = 371
    Width = 446
+    Anchors = [akLeft, akRight, akBottom]
+    Caption = 'Errors'
+    ClientHeight = 85
+    ClientWidth = 442
+    ParentCtl3D = False
+    TabOrder = 3
    object ErrorsListBox: TListBox
-      Align = alclient
+      Height = 85
+      Width = 442
+      Align = alClient
      OnClick = ErrorsListBoxClick
      TabOrder = 0
-      TabStop = True
      TopIndex = -1
-      Height = 87
-      Width = 442
    end
  end
-  object NoteLabel: TLabel
-    Caption = 'NoteLabel'
-    Layout = tltop
-    WordWrap = True
-    Left = 8
-    Height = 65
-    Top = 8
-    Width = 441
-  end
  object SynLFMSyn1: TSynLFMSyn
    DefaultFilter = 'Lazarus Form Files (*.lfm)|*.lfm'
    Enabled = False
--- a/ide/checklfmdlg.lrs
+++ b/ide/checklfmdlg.lrs
@ -1,73 +1,141 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TCheckLFMDialog','FORMDATA',[
-  'TPF0'#15'TCheckLFMDialog'#14'CheckLFMDialog'#7'Caption'#6#15'Repair LFM file'
-  +#12'ClientHeight'#3#4#2#11'ClientWidth'#3#202#1#8'OnCreate'#7#20'CheckLFMDia'
-  +'logCreate'#18'HorzScrollBar.Page'#3#203#1#18'VertScrollBar.Page'#3#5#2#4'Le'
-  +'ft'#3'p'#1#6'Height'#3#4#2#3'Top'#3#200#0#5'Width'#3#202#1#0#7'TButton'#12
-  +'CancelButton'#7'Anchors'#11#6'akleft'#8'akbottom'#0#11'ModalResult'#2#2#7'C'
-  +'aption'#6#6'Cancel'#7'TabStop'#9#8'TabOrder'#2#0#4'Left'#3'g'#1#6'Height'#2
-  +#25#3'Top'#3#227#1#5'Width'#2'K'#0#0#7'TButton'#15'RemoveAllButton'#7'Anchor'
-  +'s'#11#6'akleft'#8'akbottom'#0#7'Caption'#6#29'Remove all invalid properties'
-  +#7'TabStop'#9#8'TabOrder'#2#1#7'OnClick'#7#20'RemoveAllButtonClick'#4'Left'#2
-  +#24#6'Height'#2#25#3'Top'#3#227#1#5'Width'#3'7'#1#0#0#9'TGroupBox'#11'LFMGro'
-  +'upBox'#7'Anchors'#11#5'aktop'#6'akleft'#7'akright'#8'akbottom'#0#7'Caption'
-  +#6#8'LFM file'#12'ClientHeight'#3#10#1#11'ClientWidth'#3#186#1#11'ParentColo'
-  +'r'#9#11'ParentCtl3D'#8#8'TabOrder'#2#2#4'Left'#2#8#6'Height'#3#27#1#3'Top'#2
-  +'P'#5'Width'#3#190#1#0#8'TSynEdit'#10'LFMSynEdit'#5'Align'#7#8'alclient'#11
-  +'Font.Height'#2#241#9'Font.Name'#6#7'courier'#6'Height'#3#10#1#4'Name'#6#10
-  +'LFMSynEdit'#11'ParentCtl3D'#8#8'TabOrder'#2#0#5'Width'#3#186#1#24'BookMarkO'
-  +'ptions.OnChange'#13#15'Gutter.OnChange'#13#11'Highlighter'#7#10'SynLFMSyn1'
-  +#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'S'
-  +'hortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8
-  +'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0
-  +#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8
-  +'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8
-  +'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8
-  +'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
-  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
-  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
-  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
-  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
-  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
-  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
-  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
-  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
-  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
-  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
-  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
-  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
-  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
-  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
-  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
-  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
-  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
-  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
-  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
-  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
-  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
-  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
-  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
-  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
-  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
-  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
-  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
-  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
-  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
-  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
-  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
-  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
-  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
-  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
-  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
-  +#0#0#13'Lines.Strings'#1#6#10'LFMSynEdit'#0#22'SelectedColor.OnChange'#13#19
-  +'OnSpecialLineColors'#7#27'LFMSynEditSpecialLineColors'#6'Cursor'#4#252#255#0
-  +#0#6'Height'#3#10#1#5'Width'#3#186#1#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#7
-  +'Anchors'#11#6'akleft'#7'akright'#8'akbottom'#0#7'Caption'#6#6'Errors'#12'Cl'
-  +'ientHeight'#2'W'#11'ClientWidth'#3#186#1#11'ParentColor'#9#11'ParentCtl3D'#8
-  ,#8'TabOrder'#2#3#4'Left'#2#8#6'Height'#2'h'#3'Top'#3's'#1#5'Width'#3#190#1#0
-  +#8'TListBox'#13'ErrorsListBox'#5'Align'#7#8'alclient'#7'OnClick'#7#18'Errors'
-  +'ListBoxClick'#8'TabOrder'#2#0#7'TabStop'#9#8'TopIndex'#2#255#6'Height'#2'W'
-  +#5'Width'#3#186#1#0#0#0#6'TLabel'#9'NoteLabel'#7'Caption'#6#9'NoteLabel'#6'L'
-  +'ayout'#7#5'tltop'#8'WordWrap'#9#4'Left'#2#8#6'Height'#2'A'#3'Top'#2#8#5'Wid'
-  +'th'#3#185#1#0#0#10'TSynLFMSyn'#10'SynLFMSyn1'#13'DefaultFilter'#6' Lazarus '
-  +'Form Files (*.lfm)|*.lfm'#7'Enabled'#8#4'left'#3#129#0#3'top'#2'h'#0#0#0
+  'TPF0'#15'TCheckLFMDialog'#14'CheckLFMDialog'#4'Left'#3'o'#1#6'Height'#3#4#2#3
+  +'Top'#3#196#0#5'Width'#3#202#1#13'ActiveControl'#7#10'LFMSynEdit'#7'Caption'
+  +#6#15'Repair LFM file'#12'ClientHeight'#3#4#2#11'ClientWidth'#3#202#1#8'OnCr'
+  +'eate'#7#20'CheckLFMDialogCreate'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#9'N'
+  +'oteLabel'#4'Left'#2#8#6'Height'#2#20#3'Top'#2#8#5'Width'#2'B'#7'Caption'#6#9
+  +'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#7'TButton'#12'CancelButton'#4
+  +'Left'#3'g'#1#6'Height'#2#25#3'Top'#3#227#1#5'Width'#2'K'#7'Anchors'#11#6'ak'
+  +'Left'#8'akBottom'#0#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2
+  +#0#0#0#7'TButton'#15'RemoveAllButton'#4'Left'#2#24#6'Height'#2#25#3'Top'#3
+  +#227#1#5'Width'#3'7'#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#29
+  +'Remove all invalid properties'#7'OnClick'#7#20'RemoveAllButtonClick'#8'TabO'
+  +'rder'#2#1#0#0#9'TGroupBox'#11'LFMGroupBox'#4'Left'#2#8#6'Height'#3#27#1#3'T'
+  +'op'#2'P'#5'Width'#3#190#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
+  +'ottom'#0#7'Caption'#6#8'LFM file'#12'ClientHeight'#3#8#1#11'ClientWidth'#3
+  +#186#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'TSynEdit'#10'LFMSynEdit'#6'Heig'
+  +'ht'#3#8#1#5'Width'#3#186#1#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9'F'
+  +'ont.Name'#6#7'courier'#11'ParentColor'#8#11'ParentCtl3D'#8#8'TabOrder'#2#0
+  +#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'SynLFMSyn1'#10'Keystr'
+  +'okes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3
+  +'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'
+  +#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCu'
+  +'t'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'
+  +#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3
+  +'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3
+  +''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3
+  +'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3
+  +'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3
+  +'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'!'
+  +' '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3
+  +'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$'
+  +' '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3
+  +'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'#'
+  +' '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3
+  +'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8
+  +'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3
+  +#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7
+  +'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2
+  +#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8
+  +'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3
+  +#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Comma'
+  +'nd'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7
+  +'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3
+  +'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCu'
+  +'t'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'Sh'
+  +'ortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1
+  +#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3
+  +'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Comman'
+  +'d'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'C'
+  +'ommand'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1
+  +#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'
+  +#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3
+  +'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCu'
+  +'t'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'S'
+  +'hortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233
+  +#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3
+  +'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lin'
+  +'es.Strings'#1#6#10'LFMSynEdit'#0#19'OnSpecialLineColors'#7#27'LFMSynEditSpe'
+  +'cialLineColors'#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#4'Left'#2#8#6'Height'
+  +#2'h'#3'Top'#3's'#1#5'Width'#3#190#1#7'Anchors'#11#6'akLeft'#7'akRight'#8'ak'
+  +'Bottom'#0#7'Caption'#6#6'Errors'#12'ClientHeight'#2'U'#11'ClientWidth'#3#186
+  ,#1#11'ParentCtl3D'#8#8'TabOrder'#2#3#0#8'TListBox'#13'ErrorsListBox'#6'Heigh'
+  +'t'#2'U'#5'Width'#3#186#1#5'Align'#7#8'alClient'#7'OnClick'#7#18'ErrorsListB'
+  +'oxClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#10'TSynLFMSyn'#10'SynLFMSy'
+  +'n1'#13'DefaultFilter'#6' Lazarus Form Files (*.lfm)|*.lfm'#7'Enabled'#8#4'l'
+  +'eft'#3#129#0#3'top'#2'h'#0#0#0#15'TCheckLFMDialog'#14'CheckLFMDialog'#4'Lef'
+  +'t'#3'o'#1#6'Height'#3#4#2#3'Top'#3#196#0#5'Width'#3#202#1#13'ActiveControl'
+  +#7#10'LFMSynEdit'#7'Caption'#6#15'Repair LFM file'#12'ClientHeight'#3#4#2#11
+  +'ClientWidth'#3#202#1#8'OnCreate'#7#20'CheckLFMDialogCreate'#10'LCLVersion'#6
+  +#6'0.9.25'#0#6'TLabel'#9'NoteLabel'#4'Left'#2#8#6'Height'#2#20#3'Top'#2#8#5
+  +'Width'#2'B'#7'Caption'#6#9'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#7
+  +'TButton'#12'CancelButton'#4'Left'#3'g'#1#6'Height'#2#25#3'Top'#3#227#1#5'Wi'
+  +'dth'#2'K'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#6'Cancel'#11'M'
+  +'odalResult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#15'RemoveAllButton'#4'Left'#2
+  +#24#6'Height'#2#25#3'Top'#3#227#1#5'Width'#3'7'#1#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#7'Caption'#6#29'Remove all invalid properties'#7'OnClick'#7#20
+  +'RemoveAllButtonClick'#8'TabOrder'#2#1#0#0#9'TGroupBox'#11'LFMGroupBox'#4'Le'
+  +'ft'#2#8#6'Height'#3#27#1#3'Top'#2'P'#5'Width'#3#190#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#8'LFM file'#12'ClientHeight'
+  +#3#8#1#11'ClientWidth'#3#186#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'TSynEdi'
+  +'t'#10'LFMSynEdit'#6'Height'#3#8#1#5'Width'#3#186#1#5'Align'#7#8'alClient'#11
+  +'Font.Height'#2#241#9'Font.Name'#6#7'courier'#11'ParentColor'#8#11'ParentCtl'
+  +'3D'#8#8'TabOrder'#2#0#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10
+  +'SynLFMSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Comma'
+  +'nd'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'C'
+  +'ommand'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Co'
+  +'mmand'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7
+  +'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7
+  +'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7
+  +'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7
+  +'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7
+  +'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7
+  +'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'C'
+  +'ommand'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7
+  +'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'C'
+  +'ommand'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7
+  +'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'C'
+  +'ommand'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7
+  +'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1
+  +#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '
+  +#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3
+  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'C'
+  +'ommand'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0
+  +#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3
+  +'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'Short'
+  +'Cut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8
+  +'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['
+  +#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'
+  +#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Com'
+  +'mand'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7
+  +'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0
+  +#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4'
+  +'@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'
+  +#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'Short'
+  +'Cut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8
+  +'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'
+  +#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3
+  +'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Comman'
+  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
+  +'ommand'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1
+  +#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C'
+  +'`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCu'
+  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
+  ,'ortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#10'LFMSynEdit'#0#19'OnSpecialLineCo'
+  +'lors'#7#27'LFMSynEditSpecialLineColors'#0#0#0#9'TGroupBox'#14'ErrorsGroupBo'
+  +'x'#4'Left'#2#8#6'Height'#2'h'#3'Top'#3's'#1#5'Width'#3#190#1#7'Anchors'#11#6
+  +'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#6'Errors'#12'ClientHeight'#2
+  +'U'#11'ClientWidth'#3#186#1#11'ParentCtl3D'#8#8'TabOrder'#2#3#0#8'TListBox'
+  +#13'ErrorsListBox'#6'Height'#2'U'#5'Width'#3#186#1#5'Align'#7#8'alClient'#7
+  +'OnClick'#7#18'ErrorsListBoxClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#10
+  +'TSynLFMSyn'#10'SynLFMSyn1'#13'DefaultFilter'#6' Lazarus Form Files (*.lfm)|'
+  +'*.lfm'#7'Enabled'#8#4'left'#3#129#0#3'top'#2'h'#0#0#0
 ]);
--- a/ide/codetoolsdefines.lfm
+++ b/ide/codetoolsdefines.lfm
--- a/ide/codetoolsdefines.lrs
+++ b/ide/codetoolsdefines.lrs
--- a/ide/codetoolsdefpreview.lfm
+++ b/ide/codetoolsdefpreview.lfm
@ -1,10 +1,8 @@
 object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
-  Left = 342
+  Left = 351
  Height = 450
-  Top = 182
+  Top = 175
  Width = 502
-  HorzScrollBar.Page = 501
-  VertScrollBar.Page = 449
  ActiveControl = DirectoryCombobox
  Caption = 'CodeToolsDefinesDialog'
  ClientHeight = 450
@ -18,18 +16,17 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
    Width = 502
    Align = alTop
    Caption = 'DirectoryGroupbox'
-    ClientHeight = 30
+    ClientHeight = 29
    ClientWidth = 498
    ParentCtl3D = False
    TabOrder = 0
    OnResize = DirectoryGroupboxRESIZE
    object DirectoryCombobox: TComboBox
      Left = 6
-      Height = 21
+      Height = 29
      Top = 1
      Width = 360
      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
-      ItemHeight = 13
      MaxLength = 0
      OnChange = DirectoryComboboxCHANGE
      ParentCtl3D = False
@ -63,12 +60,12 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
    Align = alBottom
    Anchors = [akLeft, akBottom]
    Caption = 'Value'
-    ClientHeight = 84
+    ClientHeight = 83
    ClientWidth = 498
    ParentCtl3D = False
    TabOrder = 2
    object ValueSynedit: TSynEdit
-      Height = 84
+      Height = 83
      Width = 498
      Align = alClient
      Font.Height = -15
@ -77,9 +74,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
      ParentCtl3D = False
      TabOrder = 0
      BookMarkOptions.Xoffset = -18
-      BookMarkOptions.OnChange = nil
      Gutter.Visible = False
-      Gutter.OnChange = nil
      Gutter.CodeFoldingWidth = 14
      Keystrokes = <      
        item
@ -407,7 +402,6 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
      )
      Options = [eoAutoIndent, eoDragDropEditing, eoScrollPastEol, eoShowScrollHint, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoBracketHighlight, eoShowCtrlMouseLinks]
      ReadOnly = True
-      SelectedColor.OnChange = nil
    end
  end
  object MainSplitter: TSplitter
@ -423,14 +417,14 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
    Width = 202
    Align = alClient
    Caption = 'TemplatesGroupBox'
-    ClientHeight = 237
+    ClientHeight = 236
    ClientWidth = 198
    TabOrder = 3
    object ParsedTemplatesTreeView: TTreeView
      Height = 122
      Width = 198
      Align = alTop
-      DefaultItemHeight = 15
+      DefaultItemHeight = 19
      TabOrder = 0
      OnSelectionChanged = ParsedTemplatesTreeViewSelectionChanged
    end
@ -443,7 +437,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
      ResizeAnchor = akTop
    end
    object TemplatesMemo: TMemo
-      Height = 110
+      Height = 109
      Top = 127
      Width = 198
      Align = alClient
@ -465,10 +459,10 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
    object CloseButton: TButton
      AnchorSideRight.Control = CloseButtonPanel
      AnchorSideRight.Side = asrBottom
-      Left = 413
-      Height = 23
-      Top = 15
-      Width = 83
+      Left = 406
+      Height = 29
+      Top = 9
+      Width = 90
      Anchors = [akRight, akBottom]
      AutoSize = True
      BorderSpacing.Right = 6
--- a/ide/codetoolsdefpreview.lrs
+++ b/ide/codetoolsdefpreview.lrs
@ -1,18 +1,17 @@
 { This is an automatically generated lazarus resource file }

 LazarusResources.Add('TCodeToolsDefinesDialog','FORMDATA',[
-  'TPF0'#23'TCodeToolsDefinesDialog'#22'CodeToolsDefinesDialog'#4'Left'#3'V'#1#6
-  +'Height'#3#194#1#3'Top'#3#182#0#5'Width'#3#246#1#18'HorzScrollBar.Page'#3#245
-  +#1#18'VertScrollBar.Page'#3#193#1#13'ActiveControl'#7#17'DirectoryCombobox'#7
-  +'Caption'#6#22'CodeToolsDefinesDialog'#12'ClientHeight'#3#194#1#11'ClientWid'
-  +'th'#3#246#1#7'OnClose'#7#27'CodeToolsDefinesDialogCLOSE'#8'OnCreate'#7#28'C'
-  +'odeToolsDefinesDialogCREATE'#9'OnDestroy'#7#11'FormDestroy'#10'LCLVersion'#6
-  +#6'0.9.25'#0#9'TGroupBox'#17'DirectoryGroupbox'#6'Height'#2'0'#5'Width'#3#246
-  +#1#5'Align'#7#5'alTop'#7'Caption'#6#17'DirectoryGroupbox'#12'ClientHeight'#2
-  +#30#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnResize'#7
-  +#23'DirectoryGroupboxRESIZE'#0#9'TComboBox'#17'DirectoryCombobox'#4'Left'#2#6
-  +#6'Height'#2#21#3'Top'#2#1#5'Width'#3'h'#1#16'AutoCompleteText'#11#22'cbactE'
-  +'ndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'MaxLengt'
+  'TPF0'#23'TCodeToolsDefinesDialog'#22'CodeToolsDefinesDialog'#4'Left'#3'_'#1#6
+  +'Height'#3#194#1#3'Top'#3#175#0#5'Width'#3#246#1#13'ActiveControl'#7#17'Dire'
+  +'ctoryCombobox'#7'Caption'#6#22'CodeToolsDefinesDialog'#12'ClientHeight'#3
+  +#194#1#11'ClientWidth'#3#246#1#7'OnClose'#7#27'CodeToolsDefinesDialogCLOSE'#8
+  +'OnCreate'#7#28'CodeToolsDefinesDialogCREATE'#9'OnDestroy'#7#11'FormDestroy'
+  +#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#17'DirectoryGroupbox'#6'Height'#2
+  +'0'#5'Width'#3#246#1#5'Align'#7#5'alTop'#7'Caption'#6#17'DirectoryGroupbox'
+  +#12'ClientHeight'#2#29#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'
+  +#2#0#8'OnResize'#7#23'DirectoryGroupboxRESIZE'#0#9'TComboBox'#17'DirectoryCo'
+  +'mbobox'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#1#5'Width'#3'h'#1#16'AutoComple'
+  +'teText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLengt'
  +'h'#2#0#8'OnChange'#7#23'DirectoryComboboxCHANGE'#11'ParentCtl3D'#8#8'TabOrd'
  +'er'#2#0#4'Text'#6#17'DirectoryCombobox'#0#0#7'TButton'#21'DirectoryBrowseBu'
  +'tton'#4'Left'#3'w'#1#6'Height'#2#26#3'Top'#2#1#5'Width'#2#31#7'Caption'#6#3
@ -22,165 +21,161 @@ LazarusResources.Add('TCodeToolsDefinesDialog','FORMDATA',[
  +'t'#12'OnSelectItem'#7#24'ValuesListviewSELECTITEM'#0#0#9'TGroupBox'#13'Valu'
  +'eGroupbox'#6'Height'#2'f'#3'Top'#3'/'#1#5'Width'#3#246#1#5'Align'#7#8'alBot'
  +'tom'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#5'Value'#12'ClientH'
-  +'eight'#2'T'#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'T'
-  +'SynEdit'#12'ValueSynedit'#6'Height'#2'T'#5'Width'#3#242#1#5'Align'#7#8'alCl'
+  +'eight'#2'S'#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'T'
+  +'SynEdit'#12'ValueSynedit'#6'Height'#2'S'#5'Width'#3#242#1#5'Align'#7#8'alCl'
  +'ient'#11'Font.Height'#2#241#9'Font.Name'#6#7'courier'#11'ParentColor'#8#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24'BookMar'
-  +'kOptions.OnChange'#13#14'Gutter.Visible'#8#15'Gutter.OnChange'#13#23'Gutter'
-  +'.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'
-  +#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3
-  +'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'('
-  +' '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2
-  +'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%'
-  +'@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
-  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
-  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
-  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
-  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
-  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
-  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
-  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
-  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
-  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
-  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
-  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
-  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
-  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
-  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
-  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
-  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
-  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
-  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
-  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
-  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
-  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
-  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
-  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
-  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
-  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
-  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
-  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
-  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
-  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
-  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
-  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
-  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
-  ,'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
-  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
-  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
-  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
-  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ValueSynedit'#0#7
-  +'Options'#11#12'eoAutoIndent'#17'eoDragDropEditing'#15'eoScrollPastEol'#16'e'
-  +'oShowScrollHint'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'
-  +#18'eoBracketHighlight'#20'eoShowCtrlMouseLinks'#0#8'ReadOnly'#9#22'Selected'
-  +'Color.OnChange'#13#0#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Hei'
-  +'ght'#3#255#0#3'Top'#2'0'#5'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'
-  +#4'Left'#3','#1#6'Height'#3#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8
-  +'alClient'#7'Caption'#6#17'TemplatesGroupBox'#12'ClientHeight'#3#237#0#11'Cl'
-  +'ientWidth'#3#198#0#8'TabOrder'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeVie'
-  +'w'#6'Height'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'
-  +#2#15#8'TabOrder'#2#0#18'OnSelectionChanged'#7'''ParsedTemplatesTreeViewSele'
-  +'ctionChanged'#0#0#9'TSplitter'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'
-  +#6'Height'#2#5#3'Top'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnc'
-  +'hor'#7#5'akTop'#0#0#5'TMemo'#13'TemplatesMemo'#6'Height'#2'n'#3'Top'#2''#5
-  +'Width'#3#198#0#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'Ta'
-  +'bOrder'#2#1#0#0#0#6'TPanel'#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149
-  +#1#5'Width'#3#246#1#5'Align'#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'Cl'
-  +'ientHeight'#2'-'#11'ClientWidth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'Cl'
-  +'oseButton'#23'AnchorSideRight.Control'#7#16'CloseButtonPanel'#20'AnchorSide'
-  +'Right.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Height'#2#23#3'Top'#2#15#5'Wid'
-  +'th'#2'S'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpac'
-  +'ing.Right'#2#6#20'BorderSpacing.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11
-  +'ModalResult'#2#2#8'TabOrder'#2#0#0#0#0#0#23'TCodeToolsDefinesDialog'#22'Cod'
-  +'eToolsDefinesDialog'#4'Left'#3'V'#1#6'Height'#3#194#1#3'Top'#3#182#0#5'Widt'
-  +'h'#3#246#1#18'HorzScrollBar.Page'#3#245#1#18'VertScrollBar.Page'#3#193#1#13
-  +'ActiveControl'#7#17'DirectoryCombobox'#7'Caption'#6#22'CodeToolsDefinesDial'
-  +'og'#12'ClientHeight'#3#194#1#11'ClientWidth'#3#246#1#7'OnClose'#7#27'CodeTo'
-  +'olsDefinesDialogCLOSE'#8'OnCreate'#7#28'CodeToolsDefinesDialogCREATE'#9'OnD'
-  +'estroy'#7#11'FormDestroy'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#17'Dire'
-  +'ctoryGroupbox'#6'Height'#2'0'#5'Width'#3#246#1#5'Align'#7#5'alTop'#7'Captio'
-  +'n'#6#17'DirectoryGroupbox'#12'ClientHeight'#2#30#11'ClientWidth'#3#242#1#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnResize'#7#23'DirectoryGroupboxRESIZE'#0#9
-  +'TComboBox'#17'DirectoryCombobox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#1#5'Wi'
-  +'dth'#3'h'#1#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSear'
-  +'chAscending'#0#10'ItemHeight'#2#13#9'MaxLength'#2#0#8'OnChange'#7#23'Direct'
-  +'oryComboboxCHANGE'#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#17'Directory'
-  +'Combobox'#0#0#7'TButton'#21'DirectoryBrowseButton'#4'Left'#3'w'#1#6'Height'
-  +#2#26#3'Top'#2#1#5'Width'#2#31#7'Caption'#6#3'...'#7'OnClick'#7#26'Directory'
-  +'BrowseButtonCLICK'#8'TabOrder'#2#1#0#0#0#9'TListView'#14'ValuesListview'#6
-  +'Height'#3#255#0#3'Top'#2'0'#5'Width'#3'('#1#5'Align'#7#6'alLeft'#7'Columns'
-  +#14#0#8'TabOrder'#2#1#9'ViewStyle'#7#8'vsReport'#12'OnSelectItem'#7#24'Value'
-  +'sListviewSELECTITEM'#0#0#9'TGroupBox'#13'ValueGroupbox'#6'Height'#2'f'#3'To'
-  +'p'#3'/'#1#5'Width'#3#246#1#5'Align'#7#8'alBottom'#7'Anchors'#11#6'akLeft'#8
-  +'akBottom'#0#7'Caption'#6#5'Value'#12'ClientHeight'#2'T'#11'ClientWidth'#3
-  +#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'TSynEdit'#12'ValueSynedit'#6'He'
-  +'ight'#2'T'#5'Width'#3#242#1#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9
-  +'Font.Name'#6#7'courier'#11'ParentColor'#8#11'ParentCtl3D'#8#8'TabOrder'#2#0
-  +#23'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter'
-  +'.Visible'#8#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keys'
-  +'trokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'
-  +#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCu'
-  +'t'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'Shor'
-  +'tCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Short'
-  +'Cut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Short'
-  +'Cut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Short'
-  +'Cut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'Sho'
-  +'rtCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'Sh'
-  +'ortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'S'
-  +'hortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'Sh'
-  +'ortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'S'
-  ,'hortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'Sh'
-  +'ortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'S'
-  +'hortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'Sh'
-  +'ortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'S'
-  +'hortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
-  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
-  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
-  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
-  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
-  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
-  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
-  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
-  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
-  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
-  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
-  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
-  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
-  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
-  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
-  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
-  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
-  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
-  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
-  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
-  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
-  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
-  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
-  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
-  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
-  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
-  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
-  +#0#0#13'Lines.Strings'#1#6#12'ValueSynedit'#0#7'Options'#11#12'eoAutoIndent'
-  +#17'eoDragDropEditing'#15'eoScrollPastEol'#16'eoShowScrollHint'#11'eoSmartTa'
-  +'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#20'e'
-  +'oShowCtrlMouseLinks'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#0#0#0#9
-  +'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Height'#3#255#0#3'Top'#2'0'#5
-  +'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'#4'Left'#3','#1#6'Height'#3
-  +#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8'alClient'#7'Caption'#6#17'T'
-  +'emplatesGroupBox'#12'ClientHeight'#3#237#0#11'ClientWidth'#3#198#0#8'TabOrd'
-  +'er'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeView'#6'Height'#2'z'#5'Width'#3
-  +#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'#2#15#8'TabOrder'#2#0#18'OnS'
-  +'electionChanged'#7'''ParsedTemplatesTreeViewSelectionChanged'#0#0#9'TSplitt'
-  +'er'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'z'
-  +#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#5'TMem'
-  +'o'#13'TemplatesMemo'#6'Height'#2'n'#3'Top'#2''#5'Width'#3#198#0#5'Align'#7
-  +#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#1#0#0#0#6'TPanel'
-  +#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149#1#5'Width'#3#246#1#5'Align'
-  +#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'ClientHeight'#2'-'#11'ClientWi'
-  +'dth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'CloseButton'#23'AnchorSideRigh'
-  +'t.Control'#7#16'CloseButtonPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#3#157#1#6'Height'#2#23#3'Top'#2#15#5'Width'#2'S'#7'Anchors'#11#7'akRi'
-  +'ght'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpaci'
-  +'ng.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11'ModalResult'#2#2#8'TabOrder'
-  +#2#0#0#0#0#0
+  +'ParentCtl3D'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.'
+  +'Visible'#8#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2
+  +#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3
+  +#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2
+  +'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'
+  +#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2
+  +#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2
+  +#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6
+  +#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2
+  +#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2
+  +#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2
+  +#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13
+  +#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
+  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
+  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
+  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
+  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
+  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
+  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
+  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
+  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
+  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
+  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
+  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
+  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
+  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
+  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
+  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
+  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
+  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
+  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
+  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
+  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
+  ,'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
+  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
+  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ValueSyne'
+  +'dit'#0#7'Options'#11#12'eoAutoIndent'#17'eoDragDropEditing'#15'eoScrollPast'
+  +'Eol'#16'eoShowScrollHint'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrail'
+  +'ingSpaces'#18'eoBracketHighlight'#20'eoShowCtrlMouseLinks'#0#8'ReadOnly'#9#0
+  +#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Height'#3#255#0#3'Top'#2
+  +'0'#5'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'#4'Left'#3','#1#6'Hei'
+  +'ght'#3#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8'alClient'#7'Caption'
+  +#6#17'TemplatesGroupBox'#12'ClientHeight'#3#236#0#11'ClientWidth'#3#198#0#8
+  +'TabOrder'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeView'#6'Height'#2'z'#5'W'
+  +'idth'#3#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'#2#19#8'TabOrder'#2#0
+  +#18'OnSelectionChanged'#7'''ParsedTemplatesTreeViewSelectionChanged'#0#0#9'T'
+  +'Splitter'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'
+  +#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#5
+  +'TMemo'#13'TemplatesMemo'#6'Height'#2'm'#3'Top'#2''#5'Width'#3#198#0#5'Alig'
+  +'n'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#1#0#0#0#6'T'
+  +'Panel'#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149#1#5'Width'#3#246#1#5
+  +'Align'#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'ClientHeight'#2'-'#11'C'
+  +'lientWidth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'CloseButton'#23'AnchorS'
+  +'ideRight.Control'#7#16'CloseButtonPanel'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#3#150#1#6'Height'#2#29#3'Top'#2#9#5'Width'#2'Z'#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'Borde'
+  +'rSpacing.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11'ModalResult'#2#2#8'Tab'
+  +'Order'#2#0#0#0#0#0#23'TCodeToolsDefinesDialog'#22'CodeToolsDefinesDialog'#4
+  +'Left'#3'_'#1#6'Height'#3#194#1#3'Top'#3#175#0#5'Width'#3#246#1#13'ActiveCon'
+  +'trol'#7#17'DirectoryCombobox'#7'Caption'#6#22'CodeToolsDefinesDialog'#12'Cl'
+  +'ientHeight'#3#194#1#11'ClientWidth'#3#246#1#7'OnClose'#7#27'CodeToolsDefine'
+  +'sDialogCLOSE'#8'OnCreate'#7#28'CodeToolsDefinesDialogCREATE'#9'OnDestroy'#7
+  +#11'FormDestroy'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#17'DirectoryGroup'
+  +'box'#6'Height'#2'0'#5'Width'#3#246#1#5'Align'#7#5'alTop'#7'Caption'#6#17'Di'
+  +'rectoryGroupbox'#12'ClientHeight'#2#29#11'ClientWidth'#3#242#1#11'ParentCtl'
+  +'3D'#8#8'TabOrder'#2#0#8'OnResize'#7#23'DirectoryGroupboxRESIZE'#0#9'TComboB'
+  +'ox'#17'DirectoryCombobox'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#1#5'Width'#3
+  +'h'#1#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscen'
+  +'ding'#0#9'MaxLength'#2#0#8'OnChange'#7#23'DirectoryComboboxCHANGE'#11'Paren'
+  +'tCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#17'DirectoryCombobox'#0#0#7'TButton'#21
+  +'DirectoryBrowseButton'#4'Left'#3'w'#1#6'Height'#2#26#3'Top'#2#1#5'Width'#2
+  +#31#7'Caption'#6#3'...'#7'OnClick'#7#26'DirectoryBrowseButtonCLICK'#8'TabOrd'
+  +'er'#2#1#0#0#0#9'TListView'#14'ValuesListview'#6'Height'#3#255#0#3'Top'#2'0'
+  +#5'Width'#3'('#1#5'Align'#7#6'alLeft'#7'Columns'#14#0#8'TabOrder'#2#1#9'View'
+  +'Style'#7#8'vsReport'#12'OnSelectItem'#7#24'ValuesListviewSELECTITEM'#0#0#9
+  +'TGroupBox'#13'ValueGroupbox'#6'Height'#2'f'#3'Top'#3'/'#1#5'Width'#3#246#1#5
+  +'Align'#7#8'alBottom'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#5'V'
+  +'alue'#12'ClientHeight'#2'S'#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'Tab'
+  +'Order'#2#2#0#8'TSynEdit'#12'ValueSynedit'#6'Height'#2'S'#5'Width'#3#242#1#5
+  +'Align'#7#8'alClient'#11'Font.Height'#2#241#9'Font.Name'#6#7'courier'#11'Par'
+  +'entColor'#8#11'ParentCtl3D'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2
+  +#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14
+  +#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1
+  +#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1
+  +#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0
+  +#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1
+  +#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  ,'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12
+  +'ValueSynedit'#0#7'Options'#11#12'eoAutoIndent'#17'eoDragDropEditing'#15'eoS'
+  +'crollPastEol'#16'eoShowScrollHint'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eo'
+  +'TrimTrailingSpaces'#18'eoBracketHighlight'#20'eoShowCtrlMouseLinks'#0#8'Rea'
+  +'dOnly'#9#0#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Height'#3#255
+  +#0#3'Top'#2'0'#5'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'#4'Left'#3
+  +','#1#6'Height'#3#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8'alClient'#7
+  +'Caption'#6#17'TemplatesGroupBox'#12'ClientHeight'#3#236#0#11'ClientWidth'#3
+  +#198#0#8'TabOrder'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeView'#6'Height'#2
+  +'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'#2#19#8'TabOrd'
+  +'er'#2#0#18'OnSelectionChanged'#7'''ParsedTemplatesTreeViewSelectionChanged'
+  +#0#0#9'TSplitter'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5
+  +#3'Top'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'
+  +#0#0#5'TMemo'#13'TemplatesMemo'#6'Height'#2'm'#3'Top'#2''#5'Width'#3#198#0#5
+  +'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#1#0#0#0
+  +#6'TPanel'#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149#1#5'Width'#3#246
+  +#1#5'Align'#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'ClientHeight'#2'-'
+  +#11'ClientWidth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'CloseButton'#23'Anc'
+  +'horSideRight.Control'#7#16'CloseButtonPanel'#20'AnchorSideRight.Side'#7#9'a'
+  +'srBottom'#4'Left'#3#150#1#6'Height'#2#29#3'Top'#2#9#5'Width'#2'Z'#7'Anchors'
+  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'Bo'
+  +'rderSpacing.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11'ModalResult'#2#2#8
+  +'TabOrder'#2#0#0#0#0#0
 ]);
--- a/ide/diskdiffsdialog.lfm
+++ b/ide/diskdiffsdialog.lfm
@ -1,73 +1,68 @@
 object DiskDiffsDlg: TDiskDiffsDlg
-  ActiveControl = RevertAllButton
+  Left = 314
+  Height = 300
+  Top = 379
+  Width = 600
+  ActiveControl = FilesListBox
  Caption = 'DiskDiffsDlg'
  ClientHeight = 300
  ClientWidth = 600
  OnClose = FormClose
  OnKeyDown = DiskDiffsDlgKeyDown
-  PixelsPerInch = 112
  Position = poScreenCenter
-  HorzScrollBar.Page = 599
-  VertScrollBar.Page = 299
-  Left = 340
-  Height = 300
-  Top = 635
-  Width = 600
+  LCLVersion = '0.9.25'
  object IgnoreDiskChangesButton: TButton
+    AnchorSideRight.Control = RevertAllButton
+    Left = 300
+    Height = 29
+    Top = 264
+    Width = 178
    Anchors = [akRight, akBottom]
    AutoSize = True
    BorderSpacing.Right = 6
-    
    Caption = 'IgnoreDiskChangesButton'
    ModalResult = 5
    TabOrder = 0
-    AnchorSideRight.Control = RevertAllButton
-    Left = 338
-    Height = 26
-    Top = 267
-    Width = 154
  end
  object RevertAllButton: TButton
+    Left = 484
+    Height = 29
+    Top = 264
+    Width = 110
    Anchors = [akRight, akBottom]
    AutoSize = True
-    
    Caption = 'RevertAllButton'
    Default = True
    ModalResult = 10
    TabOrder = 1
-    Left = 498
-    Height = 26
-    Top = 267
-    Width = 96
  end
  object FilesListBox: TListBox
+    Left = 6
+    Height = 86
+    Top = 6
+    Width = 594
    Align = alTop
    BorderSpacing.Left = 6
    BorderSpacing.Top = 6
    OnMouseUp = FilesListBoxMouseUp
    TabOrder = 2
    TopIndex = -1
-    Left = 6
-    Height = 86
-    Top = 6
-    Width = 594
  end
  object DiffSynEdit: TSynEdit
+    Left = 6
+    Height = 159
+    Top = 97
+    Width = 588
    Align = alTop
    BorderSpacing.Left = 6
    BorderSpacing.Right = 6
    Anchors = [akTop, akLeft, akRight, akBottom]
    Font.Height = -12
    Font.Name = 'courier'
-    Height = 159
-    Name = 'DiffSynEdit'
    ParentColor = False
    TabOrder = 3
-    Width = 588
    BookMarkOptions.Xoffset = -18
-    BookMarkOptions.OnChange = nil
    Gutter.Visible = False
-    Gutter.OnChange = nil
    Gutter.CodeFoldingWidth = 14
    Keystrokes = <    
      item
@ -394,31 +389,22 @@ object DiskDiffsDlg: TDiskDiffsDlg
      'DiffSynEdit'
    )
    ReadOnly = True
-    SelectedColor.OnChange = nil
-    Cursor = crIBeam
-    Left = 6
-    Height = 159
-    Top = 97
-    Width = 588
  end
  object Splitter: TSplitter
-    Align = alTop
-    Cursor = crVSplit
-    Height = 5
-    Width = 600
-    ResizeAnchor = akTop
    Cursor = crVSplit
    Height = 5
    Top = 92
    Width = 600
+    Align = alTop
+    ResizeAnchor = akTop
  end
  object CheckDiskChangesWithLoadingCheckBox: TCheckBox
+    Left = 10
+    Height = 22
+    Top = 269
+    Width = 286
    Anchors = [akLeft, akBottom]
    Caption = 'CheckDiskChangesWithLoadingCheckBox'
    TabOrder = 4
-    Left = 10
-    Height = 24
-    Top = 267
-    Width = 263
  end
 end
--- a/ide/diskdiffsdialog.lrs
+++ b/ide/diskdiffsdialog.lrs
@ -1,74 +1,139 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TDiskDiffsDlg','FORMDATA',[
-  'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#13'ActiveControl'#7#15'RevertAllBut'
-  +'ton'#7'Caption'#6#12'DiskDiffsDlg'#12'ClientHeight'#3','#1#11'ClientWidth'#3
-  +'X'#2#7'OnClose'#7#9'FormClose'#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#13'Pi'
-  +'xelsPerInch'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3
-  +'W'#2#18'VertScrollBar.Page'#3'+'#1#4'Left'#3'T'#1#6'Height'#3','#1#3'Top'#3
-  +'{'#2#5'Width'#3'X'#2#0#7'TButton'#23'IgnoreDiskChangesButton'#7'Anchors'#11
-  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Captio'
-  +'n'#6#23'IgnoreDiskChangesButton'#11'ModalResult'#2#5#8'TabOrder'#2#0#23'Anc'
-  +'horSideRight.Control'#7#15'RevertAllButton'#4'Left'#3'R'#1#6'Height'#2#26#3
-  +'Top'#3#11#1#5'Width'#3#154#0#0#0#7'TButton'#15'RevertAllButton'#7'Anchors'
-  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#15'RevertAllButton'#7
-  +'Default'#9#11'ModalResult'#2#10#8'TabOrder'#2#1#4'Left'#3#242#1#6'Height'#2
-  +#26#3'Top'#3#11#1#5'Width'#2'`'#0#0#8'TListBox'#12'FilesListBox'#5'Align'#7#5
-  +'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#9'OnMouseUp'#7
-  +#19'FilesListBoxMouseUp'#8'TabOrder'#2#2#8'TopIndex'#2#255#4'Left'#2#6#6'Hei'
-  +'ght'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#0#0#8'TSynEdit'#11'DiffSynEdit'#5'Alig'
-  +'n'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#244#9
-  +'Font.Name'#6#7'courier'#6'Height'#3#159#0#4'Name'#6#11'DiffSynEdit'#11'Pare'
-  +'ntColor'#8#8'TabOrder'#2#3#5'Width'#3'L'#2#23'BookMarkOptions.Xoffset'#2#238
-  +#24'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8#15'Gutter.OnChange'#13
-  +#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'Short'
-  +'Cut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'Sh'
-  +'ortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'Sho'
-  +'rtCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
-  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
-  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
-  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
-  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
-  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
-  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
-  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
-  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#11'DiffSynEd'
-  ,'it'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#6'Cursor'#7#7'crIBeam'#4
-  +'Left'#2#6#6'Height'#3#159#0#3'Top'#2'a'#5'Width'#3'L'#2#0#0#9'TSplitter'#8
-  +'Splitter'#5'Align'#7#5'alTop'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#5'Width'
-  +#3'X'#2#12'ResizeAnchor'#7#5'akTop'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3
-  +'Top'#2'\'#5'Width'#3'X'#2#0#0#9'TCheckBox#CheckDiskChangesWithLoadingCheckB'
-  +'ox'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'#CheckDiskChangesWit'
-  +'hLoadingCheckBox'#8'TabOrder'#2#4#4'Left'#2#10#6'Height'#2#24#3'Top'#3#11#1
-  +#5'Width'#3#7#1#0#0#0
+  'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#4'Left'#3':'#1#6'Height'#3','#1#3'T'
+  +'op'#3'{'#1#5'Width'#3'X'#2#13'ActiveControl'#7#12'FilesListBox'#7'Caption'#6
+  +#12'DiskDiffsDlg'#12'ClientHeight'#3','#1#11'ClientWidth'#3'X'#2#7'OnClose'#7
+  +#9'FormClose'#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#8'Position'#7#14'poScre'
+  +'enCenter'#10'LCLVersion'#6#6'0.9.25'#0#7'TButton'#23'IgnoreDiskChangesButto'
+  +'n'#23'AnchorSideRight.Control'#7#15'RevertAllButton'#4'Left'#3','#1#6'Heigh'
+  +'t'#2#29#3'Top'#3#8#1#5'Width'#3#178#0#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#23'IgnoreDiskChanges'
+  +'Button'#11'ModalResult'#2#5#8'TabOrder'#2#0#0#0#7'TButton'#15'RevertAllButt'
+  +'on'#4'Left'#3#228#1#6'Height'#2#29#3'Top'#3#8#1#5'Width'#2'n'#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#15'RevertAllButton'#7'D'
+  +'efault'#9#11'ModalResult'#2#10#8'TabOrder'#2#1#0#0#8'TListBox'#12'FilesList'
+  +'Box'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#5'Align'#7#5'alT'
+  +'op'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#9'OnMouseUp'#7#19
+  +'FilesListBoxMouseUp'#8'TabOrder'#2#2#8'TopIndex'#2#255#0#0#8'TSynEdit'#11'D'
+  +'iffSynEdit'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#2'a'#5'Width'#3'L'#2#5'Ali'
+  +'gn'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#244#9
+  +'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#3#23'BookMarkOption'
+  +'s.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14#10'K'
+  +'eystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'Short'
+  +'Cut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'Sh'
+  +'ortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8
+  +'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'S'
+  +'hortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'S'
+  +'hortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'S'
+  +'hortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
+  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
+  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
+  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
+  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
+  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
+  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
+  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
+  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
+  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
+  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
+  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
+  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
+  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
+  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
+  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
+  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
+  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
+  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
+  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
+  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
+  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
+  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
+  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
+  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
+  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
+  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
+  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
+  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
+  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
+  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
+  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
+  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
+  +#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8'ReadOnly'#9#0#0#9'TSplitter'#8
+  +'Splitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'\'#5'Width'#3'X'#2
+  ,#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#9'TCheckBox#CheckDiskCh'
+  +'angesWithLoadingCheckBox'#4'Left'#2#10#6'Height'#2#22#3'Top'#3#13#1#5'Width'
+  +#3#30#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'#CheckDiskChanges'
+  +'WithLoadingCheckBox'#8'TabOrder'#2#4#0#0#0#13'TDiskDiffsDlg'#12'DiskDiffsDl'
+  +'g'#4'Left'#3':'#1#6'Height'#3','#1#3'Top'#3'{'#1#5'Width'#3'X'#2#13'ActiveC'
+  +'ontrol'#7#12'FilesListBox'#7'Caption'#6#12'DiskDiffsDlg'#12'ClientHeight'#3
+  +','#1#11'ClientWidth'#3'X'#2#7'OnClose'#7#9'FormClose'#9'OnKeyDown'#7#19'Dis'
+  +'kDiffsDlgKeyDown'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.2'
+  +'5'#0#7'TButton'#23'IgnoreDiskChangesButton'#23'AnchorSideRight.Control'#7#15
+  +'RevertAllButton'#4'Left'#3','#1#6'Height'#2#29#3'Top'#3#8#1#5'Width'#3#178#0
+  +#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'
+  +#2#6#7'Caption'#6#23'IgnoreDiskChangesButton'#11'ModalResult'#2#5#8'TabOrder'
+  +#2#0#0#0#7'TButton'#15'RevertAllButton'#4'Left'#3#228#1#6'Height'#2#29#3'Top'
+  +#3#8#1#5'Width'#2'n'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7
+  +'Caption'#6#15'RevertAllButton'#7'Default'#9#11'ModalResult'#2#10#8'TabOrder'
+  +#2#1#0#0#8'TListBox'#12'FilesListBox'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5
+  +'Width'#3'R'#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+  +'ng.Top'#2#6#9'OnMouseUp'#7#19'FilesListBoxMouseUp'#8'TabOrder'#2#2#8'TopInd'
+  +'ex'#2#255#0#0#8'TSynEdit'#11'DiffSynEdit'#4'Left'#2#6#6'Height'#3#159#0#3'T'
+  +'op'#2'a'#5'Width'#3'L'#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19
+  +'BorderSpacing.Right'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo'
+  +'ttom'#0#11'Font.Height'#2#244#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8
+  +'TabOrder'#2#3#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gut'
+  +'ter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2
+  +'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'
+  +#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3
+  +'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'
+  +#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3
+  +'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
+  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
+  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
+  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
+  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
+  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
+  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
+  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
+  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
+  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
+  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
+  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
+  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
+  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
+  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
+  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
+  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
+  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
+  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
+  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
+  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
+  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
+  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
+  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
+  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
+  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
+  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
+  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
+  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
+  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
+  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
+  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
+  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
+  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
+  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
+  ,#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
+  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8
+  +'ReadOnly'#9#0#0#9'TSplitter'#8'Splitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2
+  +#5#3'Top'#2'\'#5'Width'#3'X'#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTo'
+  +'p'#0#0#9'TCheckBox#CheckDiskChangesWithLoadingCheckBox'#4'Left'#2#10#6'Heig'
+  +'ht'#2#22#3'Top'#3#13#1#5'Width'#3#30#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0
+  +#7'Caption'#6'#CheckDiskChangesWithLoadingCheckBox'#8'TabOrder'#2#4#0#0#0
 ]);
--- a/ide/makeresstrdlg.lfm
+++ b/ide/makeresstrdlg.lfm
@ -1,10 +1,8 @@
 object MakeResStrDialog: TMakeResStrDialog
-  Left = 319
+  Left = 333
  Height = 543
-  Top = 172
+  Top = 162
  Width = 635
-  HorzScrollBar.Page = 634
-  VertScrollBar.Page = 542
  ActiveControl = AppendResStrRadioButton
  BorderIcons = [biSystemMenu]
  Caption = 'MakeResStrDialog'
@ -14,16 +12,17 @@ object MakeResStrDialog: TMakeResStrDialog
  Constraints.MinWidth = 480
  OnCreate = FormCreate
  Position = poScreenCenter
+  LCLVersion = '0.9.25'
  object ConversionGroupBox: TGroupBox
    Left = 6
-    Height = 234
+    Height = 246
    Top = 6
    Width = 623
    Align = alTop
    AutoSize = True
    BorderSpacing.Around = 6
    Caption = 'ConversionGroupBox'
-    ClientHeight = 215
+    ClientHeight = 227
    ClientWidth = 619
    TabOrder = 0
    object ResStrSectionLabel: TLabel
@ -32,7 +31,7 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideTop.Side = asrBottom
      Left = 12
      Height = 20
-      Top = 127
+      Top = 131
      Width = 124
      Alignment = taRightJustify
      BorderSpacing.Top = 2
@ -47,7 +46,7 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideTop.Side = asrBottom
      Left = 12
      Height = 20
-      Top = 158
+      Top = 166
      Width = 176
      Alignment = taRightJustify
      BorderSpacing.Top = 2
@ -63,7 +62,7 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideBottom.Side = asrBottom
      Left = 6
      Height = 22
-      Top = 187
+      Top = 199
      Width = 192
      BorderSpacing.Around = 6
      Caption = 'AppendResStrRadioButton'
@ -78,7 +77,7 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideTop.Side = asrBottom
      Left = 477
      Height = 22
-      Top = 187
+      Top = 199
      Width = 246
      BorderSpacing.Around = 6
      Caption = 'InsertContextSensitiveRadioButton'
@ -91,7 +90,7 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideTop.Side = asrBottom
      Left = 204
      Height = 22
-      Top = 187
+      Top = 199
      Width = 267
      BorderSpacing.Around = 6
      Caption = 'InsertAlphabeticallyResStrRadioButton'
@ -105,8 +104,8 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideRight.Control = ConversionGroupBox
      AnchorSideRight.Side = asrBottom
      Left = 142
-      Height = 25
-      Top = 125
+      Height = 29
+      Top = 129
      Width = 471
      Anchors = [akTop, akLeft, akRight]
      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -124,8 +123,8 @@ object MakeResStrDialog: TMakeResStrDialog
      AnchorSideRight.Control = ConversionGroupBox
      AnchorSideRight.Side = asrBottom
      Left = 194
-      Height = 25
-      Top = 156
+      Height = 29
+      Top = 164
      Width = 419
      Anchors = [akTop, akLeft, akRight]
      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -137,14 +136,14 @@ object MakeResStrDialog: TMakeResStrDialog
    end
    object IdentifierGroupBox: TGroupBox
      Left = 6
-      Height = 113
+      Height = 117
      Top = 6
      Width = 607
      Align = alTop
      AutoSize = True
      BorderSpacing.Around = 6
      Caption = 'IdentifierGroupBox'
-      ClientHeight = 94
+      ClientHeight = 98
      ClientWidth = 603
      TabOrder = 5
      object IdentLengthLabel: TLabel
@ -186,7 +185,7 @@ object MakeResStrDialog: TMakeResStrDialog
        AnchorSideRight.Side = asrBottom
        Left = 114
        Height = 23
-        Top = 65
+        Top = 69
        Width = 483
        Anchors = [akTop, akLeft, akRight]
        BorderSpacing.Around = 6
@ -214,7 +213,7 @@ object MakeResStrDialog: TMakeResStrDialog
        AnchorSideRight.Control = IdentifierGroupBox
        AnchorSideRight.Side = asrBottom
        Left = 497
-        Height = 25
+        Height = 29
        Top = 34
        Width = 100
        Anchors = [akTop, akRight]
@ -231,7 +230,7 @@ object MakeResStrDialog: TMakeResStrDialog
        AnchorSideTop.Control = CustomIdentifierCheckBox
        AnchorSideTop.Side = asrBottom
        Left = 114
-        Height = 25
+        Height = 29
        Top = 34
        Width = 100
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -246,29 +245,29 @@ object MakeResStrDialog: TMakeResStrDialog
  object CodePanel: TPanel
    AnchorSideBottom.Control = CancelButton
    Left = 6
-    Height = 243
-    Top = 246
+    Height = 231
+    Top = 258
    Width = 623
    Align = alClient
    BorderSpacing.Around = 6
    BevelOuter = bvNone
-    ClientHeight = 243
+    ClientHeight = 231
    ClientWidth = 623
    TabOrder = 1
    object SrcPreviewGroupBox: TGroupBox
      AnchorSideBottom.Control = CancelButton
-      Height = 111
+      Height = 99
      Width = 623
      Align = alTop
      Anchors = [akTop, akLeft, akRight, akBottom]
      Caption = 'SrcPreviewGroupBox'
-      ClientHeight = 92
+      ClientHeight = 80
      ClientWidth = 619
      TabOrder = 0
      OnResize = IdentPrefixLabelResize
      object SrcPreviewSynEdit: TSynEdit
        Left = 6
-        Height = 80
+        Height = 68
        Top = 6
        Width = 607
        Align = alClient
@ -282,7 +281,6 @@ object MakeResStrDialog: TMakeResStrDialog
        BookMarkOptions.Xoffset = -18
        BookMarkOptions.OnChange = nil
        Gutter.Visible = False
-        Gutter.OnChange = nil
        Gutter.CodeFoldingWidth = 14
        Highlighter = SynPasSyn
        Keystrokes = <        
@ -614,7 +612,7 @@ object MakeResStrDialog: TMakeResStrDialog
    end
    object StringConstGroupBox: TGroupBox
      Height = 127
-      Top = 116
+      Top = 104
      Width = 623
      Align = alClient
      Caption = 'StringConstGroupBox'
@ -637,7 +635,6 @@ object MakeResStrDialog: TMakeResStrDialog
        BookMarkOptions.Xoffset = -18
        BookMarkOptions.OnChange = nil
        Gutter.Visible = False
-        Gutter.OnChange = nil
        Gutter.CodeFoldingWidth = 14
        Highlighter = SynPasSyn
        Keystrokes = <        
@ -970,7 +967,7 @@ object MakeResStrDialog: TMakeResStrDialog
    object Splitter1: TSplitter
      Cursor = crVSplit
      Height = 5
-      Top = 111
+      Top = 99
      Width = 623
      Align = alTop
      ResizeAnchor = akTop
--- a/ide/makeresstrdlg.lrs
+++ b/ide/makeresstrdlg.lrs
@ -1,173 +1,172 @@
 { This is an automatically generated lazarus resource file }

 LazarusResources.Add('TMakeResStrDialog','FORMDATA',[
-  'TPF0'#17'TMakeResStrDialog'#16'MakeResStrDialog'#4'Left'#3'?'#1#6'Height'#3
-  +#31#2#3'Top'#3#172#0#5'Width'#3'{'#2#18'HorzScrollBar.Page'#3'z'#2#18'VertSc'
-  +'rollBar.Page'#3#30#2#13'ActiveControl'#7#23'AppendResStrRadioButton'#11'Bor'
-  +'derIcons'#11#12'biSystemMenu'#0#7'Caption'#6#16'MakeResStrDialog'#12'Client'
-  +'Height'#3#31#2#11'ClientWidth'#3'{'#2#21'Constraints.MinHeight'#3#1#2#20'Co'
-  +'nstraints.MinWidth'#3#224#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'p'
-  +'oScreenCenter'#0#9'TGroupBox'#18'ConversionGroupBox'#4'Left'#2#6#6'Height'#3
-  +#234#0#3'Top'#2#6#5'Width'#3'o'#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'Borde'
-  +'rSpacing.Around'#2#6#7'Caption'#6#18'ConversionGroupBox'#12'ClientHeight'#3
-  +#215#0#11'ClientWidth'#3'k'#2#8'TabOrder'#2#0#0#6'TLabel'#18'ResStrSectionLa'
-  +'bel'#22'AnchorSideLeft.Control'#7#18'IdentifierGroupBox'#21'AnchorSideTop.C'
-  +'ontrol'#7#18'IdentifierGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#2#12#6'Height'#2#20#3'Top'#2''#5'Width'#2'|'#9'Alignment'#7#14'taRight'
-  +'Justify'#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#18'ResStrSectionLabel'#11'ParentColor'#8#8'OnResize'#7#22'IdentPrefixLabelR'
-  +'esize'#0#0#6'TLabel'#24'ResStrWithSameValueLabel'#22'AnchorSideLeft.Control'
-  +#7#18'IdentifierGroupBox'#21'AnchorSideTop.Control'#7#21'ResStrSectionComboB'
-  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#20#3'Top'
-  +#3#158#0#5'Width'#3#176#0#9'Alignment'#7#14'taRightJustify'#17'BorderSpacing'
-  +'.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6#24'ResStrWithSameValueL'
-  +'abel'#11'ParentColor'#8#8'OnResize'#7#22'IdentPrefixLabelResize'#0#0#12'TRa'
-  +'dioButton'#23'AppendResStrRadioButton'#22'AnchorSideLeft.Control'#7#18'Conv'
-  +'ersionGroupBox'#21'AnchorSideTop.Control'#7#28'ResStrWithSameValuesCombobox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#187#0#5'Width'#3#192#0#20'BorderSpa'
-  +'cing.Around'#2#6#7'Caption'#6#23'AppendResStrRadioButton'#7'Checked'#9#5'St'
-  +'ate'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton!InsertContextSensit'
-  +'iveRadioButton'#22'AnchorSideLeft.Control'#7'%InsertAlphabeticallyResStrRad'
+  'TPF0'#17'TMakeResStrDialog'#16'MakeResStrDialog'#4'Left'#3'M'#1#6'Height'#3
+  +#31#2#3'Top'#3#162#0#5'Width'#3'{'#2#13'ActiveControl'#7#23'AppendResStrRadi'
+  +'oButton'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#16'MakeResStrDi'
+  +'alog'#12'ClientHeight'#3#31#2#11'ClientWidth'#3'{'#2#21'Constraints.MinHeig'
+  +'ht'#3#1#2#20'Constraints.MinWidth'#3#224#1#8'OnCreate'#7#10'FormCreate'#8'P'
+  +'osition'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#18
+  +'ConversionGroupBox'#4'Left'#2#6#6'Height'#3#246#0#3'Top'#2#6#5'Width'#3'o'#2
+  +#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#18'ConversionGroupBox'#12'ClientHeight'#3#227#0#11'ClientWidth'#3'k'#2#8'Ta'
+  +'bOrder'#2#0#0#6'TLabel'#18'ResStrSectionLabel'#22'AnchorSideLeft.Control'#7
+  +#18'IdentifierGroupBox'#21'AnchorSideTop.Control'#7#18'IdentifierGroupBox'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#20#3'Top'#3#131
+  +#0#5'Width'#2'|'#9'Alignment'#7#14'taRightJustify'#17'BorderSpacing.Top'#2#2
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'ResStrSectionLabel'#11'ParentC'
+  +'olor'#8#8'OnResize'#7#22'IdentPrefixLabelResize'#0#0#6'TLabel'#24'ResStrWit'
+  +'hSameValueLabel'#22'AnchorSideLeft.Control'#7#18'IdentifierGroupBox'#21'Anc'
+  +'horSideTop.Control'#7#21'ResStrSectionComboBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#12#6'Height'#2#20#3'Top'#3#166#0#5'Width'#3#176#0#9'Al'
+  +'ignment'#7#14'taRightJustify'#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#24'ResStrWithSameValueLabel'#11'ParentColor'#8#8'OnR'
+  +'esize'#7#22'IdentPrefixLabelResize'#0#0#12'TRadioButton'#23'AppendResStrRad'
+  +'ioButton'#22'AnchorSideLeft.Control'#7#18'ConversionGroupBox'#21'AnchorSide'
+  +'Top.Control'#7#28'ResStrWithSameValuesCombobox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#22#3'Top'#3#199#0#5'Width'#3#192#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#23'AppendResStrRadioButton'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'
+  +#2#0#0#0#12'TRadioButton!InsertContextSensitiveRadioButton'#22'AnchorSideLef'
+  +'t.Control'#7'%InsertAlphabeticallyResStrRadioButton'#19'AnchorSideLeft.Side'
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#28'ResStrWithSameValuesCombobox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#221#1#6'Height'#2#22#3'Top'
+  +#3#199#0#5'Width'#3#246#0#20'BorderSpacing.Around'#2#6#7'Caption'#6'!InsertC'
+  +'ontextSensitiveRadioButton'#8'TabOrder'#2#1#0#0#12'TRadioButton%InsertAlpha'
+  +'beticallyResStrRadioButton'#22'AnchorSideLeft.Control'#7#23'AppendResStrRad'
  +'ioButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
  +#28'ResStrWithSameValuesCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3#221#1#6'Height'#2#22#3'Top'#3#187#0#5'Width'#3#246#0#20'BorderSpacing'
-  +'.Around'#2#6#7'Caption'#6'!InsertContextSensitiveRadioButton'#8'TabOrder'#2
-  +#1#0#0#12'TRadioButton%InsertAlphabeticallyResStrRadioButton'#22'AnchorSideL'
-  +'eft.Control'#7#23'AppendResStrRadioButton'#19'AnchorSideLeft.Side'#7#9'asrB'
-  +'ottom'#21'AnchorSideTop.Control'#7#28'ResStrWithSameValuesCombobox'#18'Anch'
-  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#3#204#0#6'Height'#2#22#3'Top'#3#187#0
-  +#5'Width'#3#11#1#20'BorderSpacing.Around'#2#6#7'Caption'#6'%InsertAlphabetic'
-  +'allyResStrRadioButton'#8'TabOrder'#2#2#0#0#9'TComboBox'#21'ResStrSectionCom'
-  +'boBox'#22'AnchorSideLeft.Control'#7#18'ResStrSectionLabel'#19'AnchorSideLef'
-  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'IdentifierGroupBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'Convers'
-  +'ionGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Heig'
-  +'ht'#2#25#3'Top'#2'}'#5'Width'#3#215#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchA'
-  +'scending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'OnChange'#7#27
-  +'ResStrSectionComboBoxChange'#8'TabOrder'#2#3#4'Text'#6#21'ResStrSectionComb'
-  +'oBox'#0#0#9'TComboBox'#28'ResStrWithSameValuesCombobox'#22'AnchorSideLeft.C'
-  +'ontrol'#7#24'ResStrWithSameValueLabel'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#21'ResStrSectionComboBox'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'ConversionGroupBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#194#0#6'Height'#2#25#3'Top'#3
-  +#156#0#5'Width'#3#163#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'Aut'
-  +'oCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20
-  +'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'OnChange'#7'"ResStrWithSameVal'
-  +'uesComboboxChange'#8'TabOrder'#2#4#4'Text'#6#28'ResStrWithSameValuesCombobo'
-  +'x'#0#0#9'TGroupBox'#18'IdentifierGroupBox'#4'Left'#2#6#6'Height'#2'q'#3'Top'
-  +#2#6#5'Width'#3'_'#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#18'IdentifierGroupBox'#12'ClientHeight'#2'^'#11'Client'
-  +'Width'#3'['#2#8'TabOrder'#2#5#0#6'TLabel'#16'IdentLengthLabel'#21'AnchorSid'
-  +'eTop.Control'#7#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Bottom'#23'AnchorSideRight.Control'#7#19'IdentLengthComboBox'#4'Left'#3'|'#1
-  +#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'o'#9'Alignment'#7#14'taRightJustify'#7
-  +'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#16'IdentLengthLabel'#11'ParentColor'#8#0#0#6'TLa'
-  ,'bel'#16'IdentPrefixLabel'#22'AnchorSideLeft.Control'#7#18'IdentifierGroupBo'
-  +'x'#21'AnchorSideTop.Control'#7#24'CustomIdentifierCheckBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'f'
-  +#9'Alignment'#7#14'taRightJustify'#17'BorderSpacing.Top'#2#2#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#16'IdentPrefixLabel'#11'ParentColor'#8#8'OnResiz'
-  +'e'#7#22'IdentPrefixLabelResize'#0#0#5'TEdit'#14'IdentifierEdit'#22'AnchorSi'
-  +'deLeft.Control'#7#16'IdentPrefixLabel'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#19'IdentPrefixComboBox'#18'AnchorSideTop.Sid'
-  +'e'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'IdentifierGroupBox'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'r'#6'Height'#2#23#3'Top'#2'A'
-  +#5'Width'#3#227#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpa'
-  +'cing.Around'#2#6#7'Enabled'#8#8'OnChange'#7#20'IdentifierEditChange'#8'TabO'
-  +'rder'#2#0#4'Text'#6#14'IdentifierEdit'#0#0#9'TCheckBox'#24'CustomIdentifier'
-  +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3
-  +'Top'#2#6#5'Width'#3'O'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#24'CustomIdentifierCheckBox'#8'OnChange'#7#29'CustomIdentifierCh'
-  +'eckBoxClick'#8'OnResize'#7#22'IdentPrefixLabelResize'#8'TabOrder'#2#1#0#0#9
-  +'TComboBox'#19'IdentLengthComboBox'#21'AnchorSideTop.Control'#7#24'CustomIde'
-  +'ntifierCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
-  +'ontrol'#7#18'IdentifierGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#3#241#1#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'd'#7'Anchors'#11#5'akTo'
-  +'p'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbact'
-  +'SearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'OnChange'
-  +#7#25'IdentLengthComboBoxChange'#8'TabOrder'#2#2#4'Text'#6#19'IdentLengthCom'
-  +'boBox'#0#0#9'TComboBox'#19'IdentPrefixComboBox'#22'AnchorSideLeft.Control'#7
-  +#16'IdentPrefixLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
-  +'p.Control'#7#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#2'r'#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'd'#16'AutoCompleteT'
-  +'ext'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpac'
-  +'ing.Around'#2#6#9'MaxLength'#2#0#8'OnChange'#7#25'IdentPrefixComboBoxChange'
-  +#8'TabOrder'#2#3#4'Text'#6#19'IdentPrefixComboBox'#0#0#0#0#6'TPanel'#9'CodeP'
-  +'anel'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6'Height'
-  +#3#243#0#3'Top'#3#246#0#5'Width'#3'o'#2#5'Align'#7#8'alClient'#20'BorderSpac'
-  +'ing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#3#243#0#11'Clie'
-  +'ntWidth'#3'o'#2#8'TabOrder'#2#1#0#9'TGroupBox'#18'SrcPreviewGroupBox'#24'An'
-  +'chorSideBottom.Control'#7#12'CancelButton'#6'Height'#2'o'#5'Width'#3'o'#2#5
-  +'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#7'Caption'#6#18'SrcPreviewGroupBox'#12'ClientHeight'#2'\'#11'ClientWidth'#3
-  +'k'#2#8'TabOrder'#2#0#8'OnResize'#7#22'IdentPrefixLabelResize'#0#8'TSynEdit'
-  +#17'SrcPreviewSynEdit'#4'Left'#2#6#6'Height'#2'P'#3'Top'#2#6#5'Width'#3'_'#2
-  +#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'Font.Color'#7#7'clBl'
-  +'ack'#11'Font.Height'#2#243#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7'fpF'
-  +'ixed'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24
-  +'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8#15'Gutter.OnChange'#13#23
-  +'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#9'SynPasSyn'#10'Keystrokes'
-  +#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0
-  +#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0
-  +#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'
-  +#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0
-  +#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1
-  +#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1
-  +#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1
-  +#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
-  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
-  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
-  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
-  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
-  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
-  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
-  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
-  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
-  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
-  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
-  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
-  ,'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
-  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
-  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
-  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
-  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
-  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
-  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
-  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
-  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
-  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
-  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
-  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
-  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
-  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
-  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
-  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
-  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
-  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
-  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
-  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
-  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
-  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
-  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#17
-  +'SrcPreviewSynEdit'#0#22'SelectedColor.OnChange'#13#0#0#0#9'TGroupBox'#19'St'
-  +'ringConstGroupBox'#6'Height'#2''#3'Top'#2't'#5'Width'#3'o'#2#5'Align'#7#8
-  +'alClient'#7'Caption'#6#19'StringConstGroupBox'#12'ClientHeight'#2'l'#11'Cli'
-  +'entWidth'#3'k'#2#8'TabOrder'#2#1#0#8'TSynEdit'#18'StringConstSynEdit'#4'Lef'
-  +'t'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'#3'_'#2#5'Align'#7#8'alClient'#20
-  +'BorderSpacing.Around'#2#6#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#243
-  +#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#8'T'
-  +'abOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'
-  +#13#14'Gutter.Visible'#8#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2
-  +#14#11'Highlighter'#7#9'SynPasSyn'#10'Keystrokes'#14#1#7'Command'#2#3#8'Shor'
-  +'tCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'S'
-  +'hortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'Sh'
-  +'ortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
-  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
-  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
-  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
+  +'ft'#3#204#0#6'Height'#2#22#3'Top'#3#199#0#5'Width'#3#11#1#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6'%InsertAlphabeticallyResStrRadioButton'#8'TabOrder'
+  +#2#2#0#0#9'TComboBox'#21'ResStrSectionComboBox'#22'AnchorSideLeft.Control'#7
+  +#18'ResStrSectionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
+  +'Top.Control'#7#18'IdentifierGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#18'ConversionGroupBox'#20'AnchorSideRight.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#29#3'Top'#3#129#0#5'Width'#3
+  +#215#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11
+  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Arou'
+  +'nd'#2#6#9'MaxLength'#2#0#8'OnChange'#7#27'ResStrSectionComboBoxChange'#8'Ta'
+  +'bOrder'#2#3#4'Text'#6#21'ResStrSectionComboBox'#0#0#9'TComboBox'#28'ResStrW'
+  +'ithSameValuesCombobox'#22'AnchorSideLeft.Control'#7#24'ResStrWithSameValueL'
+  +'abel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21
+  +'ResStrSectionComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideR'
+  +'ight.Control'#7#18'ConversionGroupBox'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#3#194#0#6'Height'#2#29#3'Top'#3#164#0#5'Width'#3#163#1#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOf'
+  +'LineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'Max'
+  +'Length'#2#0#8'OnChange'#7'"ResStrWithSameValuesComboboxChange'#8'TabOrder'#2
+  +#4#4'Text'#6#28'ResStrWithSameValuesCombobox'#0#0#9'TGroupBox'#18'Identifier'
+  +'GroupBox'#4'Left'#2#6#6'Height'#2'u'#3'Top'#2#6#5'Width'#3'_'#2#5'Align'#7#5
+  +'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'Identifie'
+  +'rGroupBox'#12'ClientHeight'#2'b'#11'ClientWidth'#3'['#2#8'TabOrder'#2#5#0#6
+  +'TLabel'#16'IdentLengthLabel'#21'AnchorSideTop.Control'#7#24'CustomIdentifie'
+  +'rCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +#7#19'IdentLengthComboBox'#4'Left'#3'|'#1#6'Height'#2#20#3'Top'#2'$'#5'Width'
+  +#2'o'#9'Alignment'#7#14'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'Iden'
+  +'tLengthLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'IdentPrefixLabel'#22'Ancho'
+  ,'rSideLeft.Control'#7#18'IdentifierGroupBox'#21'AnchorSideTop.Control'#7#24
+  +'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'f'#9'Alignment'#7#14'taRightJustify'
+  +#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'Iden'
+  +'tPrefixLabel'#11'ParentColor'#8#8'OnResize'#7#22'IdentPrefixLabelResize'#0#0
+  +#5'TEdit'#14'IdentifierEdit'#22'AnchorSideLeft.Control'#7#16'IdentPrefixLabe'
+  +'l'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Id'
+  +'entPrefixComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight'
+  +'.Control'#7#18'IdentifierGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2'r'#6'Height'#2#23#3'Top'#2'E'#5'Width'#3#227#1#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Enabled'#8#8'OnCha'
+  +'nge'#7#20'IdentifierEditChange'#8'TabOrder'#2#0#4'Text'#6#14'IdentifierEdit'
+  +#0#0#9'TCheckBox'#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3'O'#2#5'Align'#7#5
+  +'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#24'CustomIdentifierCheckBo'
+  +'x'#8'OnChange'#7#29'CustomIdentifierCheckBoxClick'#8'OnResize'#7#22'IdentPr'
+  +'efixLabelResize'#8'TabOrder'#2#1#0#0#9'TComboBox'#19'IdentLengthComboBox'#21
+  +'AnchorSideTop.Control'#7#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'IdentifierGroupBox'#20'Anch'
+  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#3#241#1#6'Height'#2#29#3'Top'#2'"'
+  +#5'Width'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#16'AutoCompleteText'#11#22
+  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'
+  +#2#6#9'MaxLength'#2#0#8'OnChange'#7#25'IdentLengthComboBoxChange'#8'TabOrder'
+  +#2#2#4'Text'#6#19'IdentLengthComboBox'#0#0#9'TComboBox'#19'IdentPrefixComboB'
+  +'ox'#22'AnchorSideLeft.Control'#7#16'IdentPrefixLabel'#19'AnchorSideLeft.Sid'
+  +'e'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'CustomIdentifierCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'r'#6'Height'#2#29#3'Top'#2
+  +'"'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbac'
+  +'tSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'OnChang'
+  +'e'#7#25'IdentPrefixComboBoxChange'#8'TabOrder'#2#3#4'Text'#6#19'IdentPrefix'
+  +'ComboBox'#0#0#0#0#6'TPanel'#9'CodePanel'#24'AnchorSideBottom.Control'#7#12
+  +'CancelButton'#4'Left'#2#6#6'Height'#3#231#0#3'Top'#3#2#1#5'Width'#3'o'#2#5
+  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'
+  +#12'ClientHeight'#3#231#0#11'ClientWidth'#3'o'#2#8'TabOrder'#2#1#0#9'TGroupB'
+  +'ox'#18'SrcPreviewGroupBox'#24'AnchorSideBottom.Control'#7#12'CancelButton'#6
+  +'Height'#2'c'#5'Width'#3'o'#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#18'SrcPreviewGroupBox'#12'Clie'
+  +'ntHeight'#2'P'#11'ClientWidth'#3'k'#2#8'TabOrder'#2#0#8'OnResize'#7#22'Iden'
+  +'tPrefixLabelResize'#0#8'TSynEdit'#17'SrcPreviewSynEdit'#4'Left'#2#6#6'Heigh'
+  +'t'#2'D'#3'Top'#2#6#5'Width'#3'_'#2#5'Align'#7#8'alClient'#20'BorderSpacing.'
+  +'Around'#2#6#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#243#9'Font.Name'#6
+  +#7'Courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#8'TabOrder'#2#0#23
+  +'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter.Vi'
+  +'sible'#8#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#9'SynPasSyn'#10
+  +'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'Shor'
+  +'tCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'S'
+  +'hortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8
+  +'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'S'
+  +'hortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'S'
+  +'hortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'S'
+  +'hortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
+  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
+  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
+  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
+  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
+  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
+  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
+  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
+  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
+  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
+  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
+  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
+  ,#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
+  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
+  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
+  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
+  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
+  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
+  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
+  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
+  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
+  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
+  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
+  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
+  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
+  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
+  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
+  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
+  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
+  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
+  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
+  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
+  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
+  +#0#0#13'Lines.Strings'#1#6#17'SrcPreviewSynEdit'#0#22'SelectedColor.OnChange'
+  +#13#0#0#0#9'TGroupBox'#19'StringConstGroupBox'#6'Height'#2''#3'Top'#2'h'#5
+  +'Width'#3'o'#2#5'Align'#7#8'alClient'#7'Caption'#6#19'StringConstGroupBox'#12
+  +'ClientHeight'#2'l'#11'ClientWidth'#3'k'#2#8'TabOrder'#2#1#0#8'TSynEdit'#18
+  +'StringConstSynEdit'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'#3'_'#2#5
+  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'Font.Color'#7#7'clBlac'
+  +'k'#11'Font.Height'#2#243#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7'fpFix'
+  +'ed'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24
+  +'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidt'
+  +'h'#2#14#11'Highlighter'#7#9'SynPasSyn'#10'Keystrokes'#14#1#7'Command'#2#3#8
+  +'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0
+  +#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8
+  +'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1
+  +#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8
+  +'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8
+  +'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
@ -193,7 +192,231 @@ LazarusResources.Add('TMakeResStrDialog','FORMDATA',[
  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  ,'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
+  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
+  ,#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
+  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
+  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
+  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
+  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
+  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
+  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
+  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#18'StringCon'
+  +'stSynEdit'#0#22'SelectedColor.OnChange'#13#0#0#0#9'TSplitter'#9'Splitter1'#6
+  +'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'c'#5'Width'#3'o'#2#5'Align'#7#5
+  +'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2
+  +'0'#3'Top'#3#239#1#5'Width'#3'{'#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'B'
+  +'evelOuter'#7#6'bvNone'#12'ClientHeight'#2'0'#11'ClientWidth'#3'{'#2#8'TabOr'
+  +'der'#2#2#0#7'TBitBtn'#8'OKButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#214#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constrain'
+  +'ts.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'b'
+  +'kOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8
+  +'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3''''#2#6'Heigh'
+  +'t'#2'$'#3'Top'#2#6#5'Width'#2'N'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.Mi'
+  +'nHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalR'
+  +'esult'#2#2#9'NumGlyphs'#2#0#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2
+  +#1#0#0#7'TBitBtn'#10'HelpButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'Au'
+  +'toSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints'
+  +'.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGly'
+  +'phs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2#2#0#0#0#10'TSynPasS'
+  +'yn'#9'SynPasSyn'#7'Enabled'#8#4'left'#3'h'#1#3'top'#2#24#0#0#0#17'TMakeResS'
+  +'trDialog'#16'MakeResStrDialog'#4'Left'#3'M'#1#6'Height'#3#31#2#3'Top'#3#162
+  +#0#5'Width'#3'{'#2#13'ActiveControl'#7#23'AppendResStrRadioButton'#11'Border'
+  +'Icons'#11#12'biSystemMenu'#0#7'Caption'#6#16'MakeResStrDialog'#12'ClientHei'
+  +'ght'#3#31#2#11'ClientWidth'#3'{'#2#21'Constraints.MinHeight'#3#1#2#20'Const'
+  +'raints.MinWidth'#3#224#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poSc'
+  +'reenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#18'ConversionGroupBox'
+  +#4'Left'#2#6#6'Height'#3#246#0#3'Top'#2#6#5'Width'#3'o'#2#5'Align'#7#5'alTop'
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'ConversionGroupB'
+  +'ox'#12'ClientHeight'#3#227#0#11'ClientWidth'#3'k'#2#8'TabOrder'#2#0#0#6'TLa'
+  +'bel'#18'ResStrSectionLabel'#22'AnchorSideLeft.Control'#7#18'IdentifierGroup'
+  +'Box'#21'AnchorSideTop.Control'#7#18'IdentifierGroupBox'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#20#3'Top'#3#131#0#5'Width'#2'|'
+  +#9'Alignment'#7#14'taRightJustify'#17'BorderSpacing.Top'#2#2#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#18'ResStrSectionLabel'#11'ParentColor'#8#8'OnRes'
+  +'ize'#7#22'IdentPrefixLabelResize'#0#0#6'TLabel'#24'ResStrWithSameValueLabel'
+  +#22'AnchorSideLeft.Control'#7#18'IdentifierGroupBox'#21'AnchorSideTop.Contro'
+  +'l'#7#21'ResStrSectionComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#12#6'Height'#2#20#3'Top'#3#166#0#5'Width'#3#176#0#9'Alignment'#7#14'taRig'
+  +'htJustify'#17'BorderSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#24'ResStrWithSameValueLabel'#11'ParentColor'#8#8'OnResize'#7#22'IdentPref'
+  +'ixLabelResize'#0#0#12'TRadioButton'#23'AppendResStrRadioButton'#22'AnchorSi'
+  +'deLeft.Control'#7#18'ConversionGroupBox'#21'AnchorSideTop.Control'#7#28'Res'
+  +'StrWithSameValuesCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#21'AnchorS'
+  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#199#0#5
+  +'Width'#3#192#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'AppendResStrRad'
+  +'ioButton'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadi'
+  +'oButton!InsertContextSensitiveRadioButton'#22'AnchorSideLeft.Control'#7'%In'
+  +'sertAlphabeticallyResStrRadioButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#28'ResStrWithSameValuesCombobox'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#3#221#1#6'Height'#2#22#3'Top'#3#199#0#5'Wid'
+  +'th'#3#246#0#20'BorderSpacing.Around'#2#6#7'Caption'#6'!InsertContextSensiti'
+  +'veRadioButton'#8'TabOrder'#2#1#0#0#12'TRadioButton%InsertAlphabeticallyResS'
+  ,'trRadioButton'#22'AnchorSideLeft.Control'#7#23'AppendResStrRadioButton'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#28'ResStrWi'
+  +'thSameValuesCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#204#0
+  +#6'Height'#2#22#3'Top'#3#199#0#5'Width'#3#11#1#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6'%InsertAlphabeticallyResStrRadioButton'#8'TabOrder'#2#2#0#0#9'TC'
+  +'omboBox'#21'ResStrSectionComboBox'#22'AnchorSideLeft.Control'#7#18'ResStrSe'
+  +'ctionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#7#18'IdentifierGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSid'
+  +'eRight.Control'#7#18'ConversionGroupBox'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#3#142#0#6'Height'#2#29#3'Top'#3#129#0#5'Width'#3#215#1#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEnd'
+  +'OfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'M'
+  +'axLength'#2#0#8'OnChange'#7#27'ResStrSectionComboBoxChange'#8'TabOrder'#2#3
+  +#4'Text'#6#21'ResStrSectionComboBox'#0#0#9'TComboBox'#28'ResStrWithSameValue'
+  +'sCombobox'#22'AnchorSideLeft.Control'#7#24'ResStrWithSameValueLabel'#19'Anc'
+  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'ResStrSecti'
+  +'onComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contro'
+  +'l'#7#18'ConversionGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#3#194#0#6'Height'#2#29#3'Top'#3#164#0#5'Width'#3#163#1#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'
+  +#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8
+  +'OnChange'#7'"ResStrWithSameValuesComboboxChange'#8'TabOrder'#2#4#4'Text'#6
+  +#28'ResStrWithSameValuesCombobox'#0#0#9'TGroupBox'#18'IdentifierGroupBox'#4
+  +'Left'#2#6#6'Height'#2'u'#3'Top'#2#6#5'Width'#3'_'#2#5'Align'#7#5'alTop'#8'A'
+  +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'IdentifierGroupBox'
+  +#12'ClientHeight'#2'b'#11'ClientWidth'#3'['#2#8'TabOrder'#2#5#0#6'TLabel'#16
+  +'IdentLengthLabel'#21'AnchorSideTop.Control'#7#24'CustomIdentifierCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#19'Iden'
+  +'tLengthComboBox'#4'Left'#3'|'#1#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'o'#9
+  +'Alignment'#7#14'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'Bord'
+  +'erSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'IdentLength'
+  +'Label'#11'ParentColor'#8#0#0#6'TLabel'#16'IdentPrefixLabel'#22'AnchorSideLe'
+  +'ft.Control'#7#18'IdentifierGroupBox'#21'AnchorSideTop.Control'#7#24'CustomI'
+  +'dentifierCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
+  +'ht'#2#20#3'Top'#2'$'#5'Width'#2'f'#9'Alignment'#7#14'taRightJustify'#17'Bor'
+  +'derSpacing.Top'#2#2#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'IdentPrefi'
+  +'xLabel'#11'ParentColor'#8#8'OnResize'#7#22'IdentPrefixLabelResize'#0#0#5'TE'
+  +'dit'#14'IdentifierEdit'#22'AnchorSideLeft.Control'#7#16'IdentPrefixLabel'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'IdentPre'
+  +'fixComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
+  +'ol'#7#18'IdentifierGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2'r'#6'Height'#2#23#3'Top'#2'E'#5'Width'#3#227#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Enabled'#8#8'OnChange'#7
+  +#20'IdentifierEditChange'#8'TabOrder'#2#0#4'Text'#6#14'IdentifierEdit'#0#0#9
+  +'TCheckBox'#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3'O'#2#5'Align'#7#5'alTop'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#24'CustomIdentifierCheckBox'#8'On'
+  +'Change'#7#29'CustomIdentifierCheckBoxClick'#8'OnResize'#7#22'IdentPrefixLab'
+  +'elResize'#8'TabOrder'#2#1#0#0#9'TComboBox'#19'IdentLengthComboBox'#21'Ancho'
+  +'rSideTop.Control'#7#24'CustomIdentifierCheckBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#18'IdentifierGroupBox'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#4'Left'#3#241#1#6'Height'#2#29#3'Top'#2'"'#5'W'
+  +'idth'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#16'AutoCompleteText'#11#22'c'
+  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2
+  +#6#9'MaxLength'#2#0#8'OnChange'#7#25'IdentLengthComboBoxChange'#8'TabOrder'#2
+  +#2#4'Text'#6#19'IdentLengthComboBox'#0#0#9'TComboBox'#19'IdentPrefixComboBox'
+  +#22'AnchorSideLeft.Control'#7#16'IdentPrefixLabel'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#21'AnchorSideTop.Control'#7#24'CustomIdentifierCheckBox'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2'r'#6'Height'#2#29#3'Top'#2'"'#5
+  +'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSear'
+  +'chAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'OnChange'#7
+  +#25'IdentPrefixComboBoxChange'#8'TabOrder'#2#3#4'Text'#6#19'IdentPrefixCombo'
+  +'Box'#0#0#0#0#6'TPanel'#9'CodePanel'#24'AnchorSideBottom.Control'#7#12'Cance'
+  +'lButton'#4'Left'#2#6#6'Height'#3#231#0#3'Top'#3#2#1#5'Width'#3'o'#2#5'Align'
+  ,#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#12'Cl'
+  +'ientHeight'#3#231#0#11'ClientWidth'#3'o'#2#8'TabOrder'#2#1#0#9'TGroupBox'#18
+  +'SrcPreviewGroupBox'#24'AnchorSideBottom.Control'#7#12'CancelButton'#6'Heigh'
+  +'t'#2'c'#5'Width'#3'o'#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#8'akBottom'#0#7'Caption'#6#18'SrcPreviewGroupBox'#12'ClientHeigh'
+  +'t'#2'P'#11'ClientWidth'#3'k'#2#8'TabOrder'#2#0#8'OnResize'#7#22'IdentPrefix'
+  +'LabelResize'#0#8'TSynEdit'#17'SrcPreviewSynEdit'#4'Left'#2#6#6'Height'#2'D'
+  +#3'Top'#2#6#5'Width'#3'_'#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
+  +#6#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#243#9'Font.Name'#6#7'Courie'
+  +'r'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMar'
+  +'kOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8
+  +#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#9'SynPasSyn'#10'Keystrok'
+  +'es'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3
+  +'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'
+  +#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCu'
+  +'t'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'
+  +#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3
+  +'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3
+  +''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3
+  +'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3
+  +'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3
+  +'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'!'
+  +' '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3
+  +'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$'
+  +' '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3
+  +'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'#'
+  +' '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3
+  +'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8
+  +'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3
+  +#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7
+  +'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2
+  +#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8
+  +'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3
+  +#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Comma'
+  +'nd'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7
+  +'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3
+  +'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCu'
+  +'t'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'Sh'
+  +'ortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1
+  +#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3
+  +'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Comman'
+  +'d'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'C'
+  +'ommand'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1
+  +#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'
+  +#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3
+  +'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCu'
+  +'t'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'S'
+  +'hortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233
+  +#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3
+  +'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lin'
+  +'es.Strings'#1#6#17'SrcPreviewSynEdit'#0#22'SelectedColor.OnChange'#13#0#0#0
+  +#9'TGroupBox'#19'StringConstGroupBox'#6'Height'#2''#3'Top'#2'h'#5'Width'#3
+  +'o'#2#5'Align'#7#8'alClient'#7'Caption'#6#19'StringConstGroupBox'#12'ClientH'
+  +'eight'#2'l'#11'ClientWidth'#3'k'#2#8'TabOrder'#2#1#0#8'TSynEdit'#18'StringC'
+  +'onstSynEdit'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'#3'_'#2#5'Align'
+  +#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'Font.Color'#7#7'clBlack'#11'F'
+  +'ont.Height'#2#243#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7'fpFixed'#11
+  +'ParentColor'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24'BookMar'
+  +'kOptions.OnChange'#13#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14
+  +#11'Highlighter'#7#9'SynPasSyn'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCu'
+  ,'t'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'Shor'
+  +'tCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'Short'
+  +'Cut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'Sh'
+  +'ortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'Sho'
+  +'rtCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'Sho'
+  +'rtCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'Sh'
+  +'ortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8
+  +'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
+  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
+  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
+  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
+  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
+  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
+  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
+  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
+  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
+  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
+  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
+  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
+  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
+  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
+  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
+  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
+  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
+  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
+  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
@ -205,7 +428,7 @@ LazarusResources.Add('TMakeResStrDialog','FORMDATA',[
  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#18'StringCon'
  +'stSynEdit'#0#22'SelectedColor.OnChange'#13#0#0#0#9'TSplitter'#9'Splitter1'#6
-  +'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'o'#5'Width'#3'o'#2#5'Align'#7#5
+  +'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'c'#5'Width'#3'o'#2#5'Align'#7#5
  +'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2
  +'0'#3'Top'#3#239#1#5'Width'#3'{'#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'B'
  +'evelOuter'#7#6'bvNone'#12'ClientHeight'#2'0'#11'ClientWidth'#3'{'#2#8'TabOr'
--- a/ide/patheditordlg.lfm
+++ b/ide/patheditordlg.lfm
@ -1,10 +1,8 @@
 object PathEditorDialog: TPathEditorDialog
-  Left = 290
+  Left = 295
  Height = 400
-  Top = 155
+  Top = 158
  Width = 500
-  HorzScrollBar.Page = 499
-  VertScrollBar.Page = 399
  ActiveControl = TemplatesListBox
  Caption = 'PathEditorDialog'
  ClientHeight = 400
@ -29,7 +27,7 @@ object PathEditorDialog: TPathEditorDialog
    BorderSpacing.Top = 6
    BorderSpacing.Right = 6
    Caption = 'PathGroupBox'
-    ClientHeight = 176
+    ClientHeight = 175
    ClientWidth = 484
    TabOrder = 0
    object PathEdit: TSynEdit
@ -39,7 +37,7 @@ object PathEditorDialog: TPathEditorDialog
      AnchorSideRight.Side = asrBottom
      AnchorSideBottom.Control = MoveUpButton
      Left = 6
-      Height = 135
+      Height = 128
      Top = 6
      Width = 472
      BorderSpacing.Around = 6
@ -49,9 +47,7 @@ object PathEditorDialog: TPathEditorDialog
      ParentColor = False
      TabOrder = 0
      BookMarkOptions.Xoffset = -18
-      BookMarkOptions.OnChange = nil
      Gutter.Visible = False
-      Gutter.OnChange = nil
      Gutter.CodeFoldingWidth = 14
      Keystrokes = <      
        item
@ -378,16 +374,15 @@ object PathEditorDialog: TPathEditorDialog
        'PathEdit'
      )
      Options = [eoDragDropEditing, eoHalfPageScroll, eoScrollByOneLess, eoScrollPastEol, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoBracketHighlight, eoHideRightMargin]
-      SelectedColor.OnChange = nil
    end
    object MoveUpButton: TButton
      AnchorSideLeft.Control = PathGroupBox
      AnchorSideBottom.Control = PathGroupBox
      AnchorSideBottom.Side = asrBottom
      Left = 6
-      Height = 23
-      Top = 147
-      Width = 98
+      Height = 29
+      Top = 140
+      Width = 107
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
@ -400,10 +395,10 @@ object PathEditorDialog: TPathEditorDialog
      AnchorSideLeft.Side = asrBottom
      AnchorSideBottom.Control = PathGroupBox
      AnchorSideBottom.Side = asrBottom
-      Left = 110
-      Height = 23
-      Top = 147
-      Width = 112
+      Left = 119
+      Height = 29
+      Top = 140
+      Width = 124
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
@ -416,10 +411,10 @@ object PathEditorDialog: TPathEditorDialog
      AnchorSideLeft.Side = asrBottom
      AnchorSideBottom.Control = PathGroupBox
      AnchorSideBottom.Side = asrBottom
-      Left = 228
-      Height = 23
-      Top = 147
-      Width = 92
+      Left = 249
+      Height = 29
+      Top = 140
+      Width = 101
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
@ -432,10 +427,10 @@ object PathEditorDialog: TPathEditorDialog
      AnchorSideLeft.Side = asrBottom
      AnchorSideBottom.Control = PathGroupBox
      AnchorSideBottom.Side = asrBottom
-      Left = 326
-      Height = 23
-      Top = 147
-      Width = 88
+      Left = 356
+      Height = 29
+      Top = 140
+      Width = 97
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
@ -458,7 +453,7 @@ object PathEditorDialog: TPathEditorDialog
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Around = 6
    Caption = 'TemplateGroupBox'
-    ClientHeight = 134
+    ClientHeight = 133
    ClientWidth = 484
    TabOrder = 1
    object TemplatesListBox: TListBox
@ -468,7 +463,7 @@ object PathEditorDialog: TPathEditorDialog
      AnchorSideRight.Side = asrBottom
      AnchorSideBottom.Control = AddTemplateButton
      Left = 6
-      Height = 93
+      Height = 86
      Top = 6
      Width = 472
      Anchors = [akTop, akLeft, akRight, akBottom]
@ -476,15 +471,16 @@ object PathEditorDialog: TPathEditorDialog
      MultiSelect = True
      OnDblClick = TemplatesListBoxDblClick
      TabOrder = 0
+      TopIndex = -1
    end
    object AddTemplateButton: TButton
      AnchorSideLeft.Control = TemplateGroupBox
      AnchorSideBottom.Control = TemplateGroupBox
      AnchorSideBottom.Side = asrBottom
      Left = 6
-      Height = 23
-      Top = 105
-      Width = 120
+      Height = 29
+      Top = 98
+      Width = 138
      Anchors = [akLeft, akBottom]
      AutoSize = True
      BorderSpacing.Around = 6
--- a/ide/patheditordlg.lrs
+++ b/ide/patheditordlg.lrs
@ -1,43 +1,161 @@
 { Ýòî - ôàéë ðåñóðñîâ, àâòîìàòè÷åñêè ñîçäàííûé lazarus }

 LazarusResources.Add('TPathEditorDialog','FORMDATA',[
-  'TPF0'#17'TPathEditorDialog'#16'PathEditorDialog'#4'Left'#3'"'#1#6'Height'#3
-  +#144#1#3'Top'#3#155#0#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ver'
-  +'tScrollBar.Page'#3#143#1#13'ActiveControl'#7#16'TemplatesListBox'#7'Caption'
-  +#6#16'PathEditorDialog'#12'ClientHeight'#3#144#1#11'ClientWidth'#3#244#1#21
-  +'Constraints.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244#1#8'OnCreate'
-  +#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14'poScreenCent'
-  +'er'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#12'PathGroupBox'#22'AnchorSid'
-  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSid'
-  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
-  +'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'ClientHeight'#3
-  +#176#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'PathEdit'#22
-  +'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Control'#7#12'P'
-  +'athGroupBox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20'AnchorSideRi'
-  +'ght.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'MoveUpButton'#4
-  +'Left'#2#6#6'Height'#3#135#0#3'Top'#2#6#5'Width'#3#216#1#20'BorderSpacing.Ar'
-  +'ound'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font'
-  +'.Height'#2#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#0
-  +#23'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter'
-  +'.Visible'#8#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keys'
-  +'trokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'
-  +#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCu'
-  +'t'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'Shor'
-  +'tCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Short'
-  +'Cut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Short'
-  +'Cut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Short'
-  +'Cut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'Sho'
-  +'rtCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'Sh'
-  +'ortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'S'
-  +'hortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'Sh'
-  +'ortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'S'
-  +'hortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'Sh'
-  +'ortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'S'
-  +'hortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'Sh'
-  +'ortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'S'
-  +'hortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  'TPF0'#17'TPathEditorDialog'#16'PathEditorDialog'#4'Left'#3''''#1#6'Height'#3
+  +#144#1#3'Top'#3#158#0#5'Width'#3#244#1#13'ActiveControl'#7#16'TemplatesListB'
+  +'ox'#7'Caption'#6#16'PathEditorDialog'#12'ClientHeight'#3#144#1#11'ClientWid'
+  +'th'#3#244#1#21'Constraints.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244
+  +#1#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14
+  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#12'PathGroupBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'Clie'
+  +'ntHeight'#3#175#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'P'
+  +'athEdit'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Con'
+  +'trol'#7#12'PathGroupBox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'Move'
+  +'UpButton'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2#6#5'Width'#3#216#1#20'Bord'
+  +'erSpacing.Around'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
+  +'m'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'Ta'
+  +'bOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutte'
+  +'r.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'
+  +#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3
+  +'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'('
+  +' '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2
+  +'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%'
+  +'@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
+  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
+  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
+  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
+  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
+  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
+  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
+  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
+  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
+  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
+  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
+  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
+  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
+  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
+  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
+  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
+  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
+  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
+  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
+  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
+  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
+  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
+  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
+  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
+  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
+  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
+  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
+  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
+  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
+  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
+  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
+  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
+  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
+  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
+  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
+  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
+  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#8'PathEdit'#0#7'Opt'
+  +'ions'#11#17'eoDragDropEditing'#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15
+  +'eoScrollPastEol'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'
+  ,#18'eoBracketHighlight'#17'eoHideRightMargin'#0#0#0#7'TButton'#12'MoveUpButt'
+  +'on'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#24'AnchorSideBottom.Contr'
+  +'ol'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'k'#7'Anchors'#11#6'akLeft'#8'akBot'
+  +'tom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'MoveUpBut'
+  +'ton'#7'OnClick'#7#17'MoveUpButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'M'
+  +'oveDownButton'#22'AnchorSideLeft.Control'#7#12'MoveUpButton'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'w'#6'Height'#2#29#3'Top'#3
+  +#140#0#5'Width'#2'|'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#14'MoveDownButton'#7'OnClick'#7#19'M'
+  +'oveDownButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'BrowseButton'#22'Anch'
+  +'orSideLeft.Control'#7#14'MoveDownButton'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#249#0#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2
+  +'e'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
+  +'und'#2#6#7'Caption'#6#12'BrowseButton'#7'OnClick'#7#17'BrowseButtonClick'#8
+  +'TabOrder'#2#3#0#0#7'TButton'#12'DeleteButton'#22'AnchorSideLeft.Control'#7
+  +#12'BrowseButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
+  +'.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#3'd'#1#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'a'#7'Anchors'#11#6'akLef'
+  +'t'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12
+  +'DeleteButton'#7'OnClick'#7#17'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TG'
+  +'roupBox'#16'TemplateGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
+  +'orSideTop.Control'#7#12'PathGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#24'AnchorSideBottom.Control'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#152#0
+  +#3'Top'#3#206#0#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'
+  +#12'ClientHeight'#3#133#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListB'
+  +'ox'#16'TemplatesListBox'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'
+  +#21'AnchorSideTop.Control'#7#16'TemplateGroupBox'#23'AnchorSideRight.Control'
+  +#7#16'TemplateGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
+  +'eBottom.Control'#7#17'AddTemplateButton'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2
+  +#6#5'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'Template'
+  +'sListBoxDblClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#17'AddTe'
+  +'mplateButton'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSi'
+  +'deBottom.Control'#7#16'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'b'#5'Width'#3#138#0#7'Anchors'#11
+  +#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#17'AddTemplateButton'#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrd'
+  +'er'#2#1#0#0#0#7'TBitBtn'#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'Cance'
+  +'lBitBtn'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7
+  +#9'asrBottom'#4'Left'#3'4'#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'An'
+  +'chors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#5'&'#195#142#195#138#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'N'
+  +'umGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSide'
+  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anchor'
+  +'SideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
+  +'eft'#3#148#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akR'
+  +'ight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#12
+  +#195#142#195#178#195#172#195#165#195#173#195#160#4'Kind'#7#8'bkCancel'#11'Mo'
+  +'dalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#22'TSelectDirectoryDial'
+  +'og'#12'BrowseDialog'#7'Options'#11#15'ofFileMustExist'#14'ofEnableSizing'#12
+  +'ofViewDetail'#0#4'left'#3#184#1#3'top'#3#168#0#0#0#0#17'TPathEditorDialog'
+  +#16'PathEditorDialog'#4'Left'#3''''#1#6'Height'#3#144#1#3'Top'#3#158#0#5'Wid'
+  +'th'#3#244#1#13'ActiveControl'#7#16'TemplatesListBox'#7'Caption'#6#16'PathEd'
+  +'itorDialog'#12'ClientHeight'#3#144#1#11'ClientWidth'#3#244#1#21'Constraints'
+  +'.MinHeight'#3#144#1#20'Constraints.MinWidth'#3#244#1#8'OnCreate'#7#10'FormC'
+  +'reate'#8'OnResize'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#10'LCL'
+  +'Version'#6#6'0.9.25'#0#9'TGroupBox'#12'PathGroupBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Con'
+  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
+  ,'ht'#3#194#0#3'Top'#2#6#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSp'
+  +'acing.Right'#2#6#7'Caption'#6#12'PathGroupBox'#12'ClientHeight'#3#175#0#11
+  +'ClientWidth'#3#228#1#8'TabOrder'#2#0#0#8'TSynEdit'#8'PathEdit'#22'AnchorSid'
+  +'eLeft.Control'#7#12'PathGroupBox'#21'AnchorSideTop.Control'#7#12'PathGroupB'
+  +'ox'#23'AnchorSideRight.Control'#7#12'PathGroupBox'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'MoveUpButton'#4'Left'#2#6#6
+  +'Height'#3#128#0#3'Top'#2#6#5'Width'#3#216#1#20'BorderSpacing.Around'#2#6#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2
+  +#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#0#23'BookMark'
+  +'Options.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14
+  +#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'S'
+  +'hortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8
+  +'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0
+  +#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8
+  +'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8
+  +'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8
+  +'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
+  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
+  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
+  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
+  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
+  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
+  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
+  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
+  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
+  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
@ -65,53 +183,53 @@ LazarusResources.Add('TPathEditorDialog','FORMDATA',[
  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
  +#0#0#13'Lines.Strings'#1#6#8'PathEdit'#0#7'Options'#11#17'eoDragDropEditing'
-  ,#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15'eoScrollPastEol'#11'eoSmartTa'
+  +#16'eoHalfPageScroll'#17'eoScrollByOneLess'#15'eoScrollPastEol'#11'eoSmartTa'
  +'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#17'e'
-  +'oHideRightMargin'#0#22'SelectedColor.OnChange'#13#0#0#7'TButton'#12'MoveUpB'
-  +'utton'#22'AnchorSideLeft.Control'#7#12'PathGroupBox'#24'AnchorSideBottom.Co'
-  +'ntrol'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akB'
-  +'ottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'MoveUpB'
-  +'utton'#7'OnClick'#7#17'MoveUpButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#14
-  +'MoveDownButton'#22'AnchorSideLeft.Control'#7#12'MoveUpButton'#19'AnchorSide'
-  +'Left.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'n'#6'Height'#2#23#3'Top'#3
-  +#147#0#5'Width'#2'p'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#14'MoveDownButton'#7'OnClick'#7#19'M'
-  +'oveDownButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#12'BrowseButton'#22'Anch'
-  +'orSideLeft.Control'#7#14'MoveDownButton'#19'AnchorSideLeft.Side'#7#9'asrBot'
-  +'tom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrBottom'#4'Left'#3#228#0#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2
-  +'\'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
-  +'und'#2#6#7'Caption'#6#12'BrowseButton'#7'OnClick'#7#17'BrowseButtonClick'#8
-  +'TabOrder'#2#3#0#0#7'TButton'#12'DeleteButton'#22'AnchorSideLeft.Control'#7
-  +#12'BrowseButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
-  +'.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3'F'#1#6'Height'#2#23#3'Top'#3#147#0#5'Width'#2'X'#7'Anchors'#11#6'akLef'
-  +'t'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12
-  +'DeleteButton'#7'OnClick'#7#17'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TG'
-  +'roupBox'#16'TemplateGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#12'PathGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#24'AnchorSideBottom.Control'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#152#0
-  +#3'Top'#3#206#0#5'Width'#3#232#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'
-  +#12'ClientHeight'#3#134#0#11'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListB'
-  +'ox'#16'TemplatesListBox'#22'AnchorSideLeft.Control'#7#16'TemplateGroupBox'
-  +#21'AnchorSideTop.Control'#7#16'TemplateGroupBox'#23'AnchorSideRight.Control'
-  +#7#16'TemplateGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
-  +'eBottom.Control'#7#17'AddTemplateButton'#4'Left'#2#6#6'Height'#2']'#3'Top'#2
-  +#6#5'Width'#3#216#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'Template'
-  +'sListBoxDblClick'#8'TabOrder'#2#0#0#0#7'TButton'#17'AddTemplateButton'#22'A'
-  +'nchorSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSideBottom.Control'#7
-  +#16'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2#23#3'Top'#2'i'#5'Width'#2'x'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
-  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'AddTemplateButto'
-  +'n'#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'
-  +#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24'AnchorSideBot'
-  +'tom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +'4'#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akRight'#8
+  +'oHideRightMargin'#0#0#0#7'TButton'#12'MoveUpButton'#22'AnchorSideLeft.Contr'
+  +'ol'#7#12'PathGroupBox'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'A'
+  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#3#140
+  +#0#5'Width'#2'k'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Bord'
+  +'erSpacing.Around'#2#6#7'Caption'#6#12'MoveUpButton'#7'OnClick'#7#17'MoveUpB'
+  +'uttonClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'MoveDownButton'#22'AnchorSide'
+  +'Left.Control'#7#12'MoveUpButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24
+  +'AnchorSideBottom.Control'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9
+  ,'asrBottom'#4'Left'#2'w'#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'|'#7'Ancho'
+  +'rs'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#14'MoveDownButton'#7'OnClick'#7#19'MoveDownButtonClick'#8'TabOrd'
+  +'er'#2#2#0#0#7'TButton'#12'BrowseButton'#22'AnchorSideLeft.Control'#7#14'Mov'
+  +'eDownButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Con'
+  +'trol'#7#12'PathGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#249#0#6'Height'#2#29#3'Top'#3#140#0#5'Width'#2'e'#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Brow'
+  +'seButton'#7'OnClick'#7#17'BrowseButtonClick'#8'TabOrder'#2#3#0#0#7'TButton'
+  +#12'DeleteButton'#22'AnchorSideLeft.Control'#7#12'BrowseButton'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PathGroupBox'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'd'#1#6'Height'#2#29#3'To'
+  +'p'#3#140#0#5'Width'#2'a'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'DeleteButton'#7'OnClick'#7#17
+  +'DeleteButtonClick'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#16'TemplateGroupBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#12'PathGr'
+  +'oupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
+  +'l'#7#8'OKBitBtn'#4'Left'#2#6#6'Height'#3#152#0#3'Top'#3#206#0#5'Width'#3#232
+  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'#3#133#0#11
+  +'ClientWidth'#3#228#1#8'TabOrder'#2#1#0#8'TListBox'#16'TemplatesListBox'#22
+  +'AnchorSideLeft.Control'#7#16'TemplateGroupBox'#21'AnchorSideTop.Control'#7
+  +#16'TemplateGroupBox'#23'AnchorSideRight.Control'#7#16'TemplateGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'AddT'
+  +'emplateButton'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3#216#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aroun'
+  +'d'#2#6#11'MultiSelect'#9#10'OnDblClick'#7#24'TemplatesListBoxDblClick'#8'Ta'
+  +'bOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#17'AddTemplateButton'#22'Ancho'
+  +'rSideLeft.Control'#7#16'TemplateGroupBox'#24'AnchorSideBottom.Control'#7#16
+  +'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
+  +'ight'#2#29#3'Top'#2'b'#5'Width'#3#138#0#7'Anchors'#11#6'akLeft'#8'akBottom'
+  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'AddTemplateBut'
+  +'ton'#7'OnClick'#7#22'AddTemplateButtonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBt'
+  +'n'#8'OKBitBtn'#23'AnchorSideRight.Control'#7#12'CancelBitBtn'#24'AnchorSide'
+  +'Bottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +#3'4'#1#6'Height'#2#30#3'Top'#3'l'#1#5'Width'#2'Z'#7'Anchors'#11#7'akRight'#8
  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'&'#195#142#195#138#7
  +'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrde'
  +'r'#2#2#0#0#7'TBitBtn'#12'CancelBitBtn'#23'AnchorSideRight.Control'#7#5'Owne'