diff --git a/ide/projectopts.lfm b/ide/projectopts.lfm
index 7a3ff2ce20..20acf78f90 100644
--- a/ide/projectopts.lfm
+++ b/ide/projectopts.lfm
@@ -1,41 +1,36 @@
 object ProjectOptionsDialog: TProjectOptionsDialog
-  Caption = 'ProjectOptionsDialog'
-  ClientHeight = 378
-  ClientWidth = 457
-  OnClose = ProjectOptionsClose
-  OnResize = ProjectOptionsResize
-  PixelsPerInch = 96
-  Position = poScreenCenter
+  Left = 327
+  Height = 378
+  Top = 80
+  Width = 457
   HorzScrollBar.Page = 456
   VertScrollBar.Page = 377
-  Left = 234
-  Height = 378
-  Top = 296
-  Width = 457
+  ActiveControl = BuildEdit
+  Caption = 'ProjectOptionsDialog'
+  OnClose = ProjectOptionsClose
+  Position = poScreenCenter
   object Notebook: TNotebook
+    Height = 341
+    Width = 457
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     PageIndex = 5
-    Height = 341
-    Width = 457
     object ApplicationPage: TPage
       Caption = 'ApplicationPage'
-      ClientWidth = 449
-      ClientHeight = 315
-      Height = 315
-      Width = 449
       object AppSettingsGroupBox: TGroupBox
-        Align = alTop
-        BorderSpacing.Around = 6
-        Caption = 'AppSettingsGroupBox'
-        ClientHeight = 55
-        ClientWidth = 433
-        TabOrder = 0
         Left = 6
         Height = 73
         Top = 6
         Width = 437
+        Align = alTop
+        BorderSpacing.Around = 6
+        Caption = 'AppSettingsGroupBox'
+        TabOrder = 0
         object TitleLabel: TLabel
+          Left = 6
+          Height = 14
+          Top = 6
+          Width = 421
           Align = alTop
           BorderSpacing.Left = 6
           BorderSpacing.Top = 6
@@ -43,35 +38,33 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Caption = 'TitleLabel'
           Color = clNone
           ParentColor = False
-          Left = 6
-          Height = 14
-          Top = 6
-          Width = 421
         end
         object TitleEdit: TEdit
+          Left = 6
+          Height = 23
+          Top = 20
+          Width = 421
           Align = alTop
           BorderSpacing.Left = 6
           BorderSpacing.Right = 6
           TabOrder = 0
           Text = 'TitleEdit'
-          Left = 6
-          Height = 23
-          Top = 20
-          Width = 421
         end
       end
       object OutputSettingsGroupBox: TGroupBox
-        Align = alTop
-        BorderSpacing.Around = 6
-        Caption = 'OutputSettingsGroupBox'
-        ClientHeight = 55
-        ClientWidth = 433
-        TabOrder = 1
         Left = 6
         Height = 73
         Top = 85
         Width = 437
+        Align = alTop
+        BorderSpacing.Around = 6
+        Caption = 'OutputSettingsGroupBox'
+        TabOrder = 1
         object TargetFileLabel: TLabel
+          Left = 6
+          Height = 14
+          Top = 6
+          Width = 421
           Align = alTop
           BorderSpacing.Left = 6
           BorderSpacing.Top = 6
@@ -79,324 +72,305 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Caption = 'TargetFileLabel'
           Color = clNone
           ParentColor = False
-          Left = 6
-          Height = 14
-          Top = 6
-          Width = 421
         end
         object TargetFileEdit: TEdit
+          Left = 6
+          Height = 23
+          Top = 20
+          Width = 421
           Align = alTop
           BorderSpacing.Left = 6
           BorderSpacing.Right = 6
           TabOrder = 0
           Text = 'TargetFileEdit'
-          Left = 6
-          Height = 23
-          Top = 20
-          Width = 421
         end
       end
     end
     object FormsPage: TPage
       Caption = 'FormsPage'
-      ClientWidth = 449
-      ClientHeight = 315
       OnResize = FormsPageResize
-      Height = 315
-      Width = 449
       object FormsAutoCreatedLabel: TLabel
-        Caption = 'FormsAutoCreatedLabel'
-        Color = clNone
-        ParentColor = False
         Left = 36
         Height = 14
         Top = 10
         Width = 117
-      end
-      object FormsAvailFormsLabel: TLabel
-        Caption = 'FormsAvailFormsLabel'
+        Caption = 'FormsAutoCreatedLabel'
         Color = clNone
         ParentColor = False
+      end
+      object FormsAvailFormsLabel: TLabel
         AnchorSideLeft.Control = FormsAvailFormsListBox
         Left = 240
         Height = 14
         Top = 10
         Width = 107
+        Caption = 'FormsAvailFormsLabel'
+        Color = clNone
+        ParentColor = False
       end
       object FormsAutoCreatedListBox: TListBox
-        Anchors = [akTop, akLeft, akBottom]
-        BorderSpacing.Around = 6
-        MultiSelect = True
-        TabOrder = 0
-        TopIndex = -1
         AnchorSideLeft.Control = FormsMoveAutoCreatedFormUpBtn
         AnchorSideLeft.Side = asrBottom
         AnchorSideBottom.Control = FormsAutoCreateNewFormsCheckBox
         Left = 36
-        Height = 254
+        Height = 258
         Top = 32
         Width = 168
-      end
-      object FormsAvailFormsListBox: TListBox
-        Anchors = [akTop, akLeft, akRight, akBottom]
+        Anchors = [akTop, akLeft, akBottom]
         BorderSpacing.Around = 6
         MultiSelect = True
-        TabOrder = 1
-        TopIndex = -1
+        TabOrder = 0
+      end
+      object FormsAvailFormsListBox: TListBox
         AnchorSideLeft.Control = FormsAddToAutoCreatedFormsBtn
         AnchorSideLeft.Side = asrBottom
         AnchorSideBottom.Control = FormsAutoCreateNewFormsCheckBox
         Left = 240
-        Height = 254
+        Height = 258
         Top = 32
         Width = 199
+        Anchors = [akTop, akLeft, akRight, akBottom]
+        BorderSpacing.Around = 6
+        MultiSelect = True
+        TabOrder = 1
       end
       object FormsMoveAutoCreatedFormUpBtn: TArrow
-        ArrowType = atUp
-        OnClick = FormsMoveAutoCreatedFormUpBtnClick
         Left = 6
         Height = 24
         Top = 32
         Width = 24
+        ArrowType = atUp
+        OnClick = FormsMoveAutoCreatedFormUpBtnClick
       end
       object FormsMoveAutoCreatedFormsDownBtn: TArrow
-        ArrowType = atDown
-        OnClick = FormsMoveAutoCreatedFormDownBtnClick
         Left = 6
         Height = 24
         Top = 60
         Width = 24
+        ArrowType = atDown
+        OnClick = FormsMoveAutoCreatedFormDownBtnClick
       end
       object FormsRemoveFromAutoCreatedFormsBtn: TArrow
-        ArrowType = atRight
-        BorderSpacing.Around = 6
-        OnClick = FormsRemoveFromAutoCreatedFormsBtnClick
         AnchorSideLeft.Control = FormsAutoCreatedListBox
         AnchorSideLeft.Side = asrBottom
         Left = 210
         Height = 24
         Top = 32
         Width = 24
+        ArrowType = atRight
+        BorderSpacing.Around = 6
+        OnClick = FormsRemoveFromAutoCreatedFormsBtnClick
       end
       object FormsAddToAutoCreatedFormsBtn: TArrow
-        OnClick = FormsAddToAutoCreatedFormsBtnClick
         AnchorSideLeft.Control = FormsRemoveFromAutoCreatedFormsBtn
         Left = 210
         Height = 24
         Top = 60
         Width = 24
+        OnClick = FormsAddToAutoCreatedFormsBtnClick
       end
       object FormsAutoCreateNewFormsCheckBox: TCheckBox
+        Left = 6
+        Height = 13
+        Top = 296
+        Width = 437
         Align = alBottom
         BorderSpacing.Around = 6
         Caption = 'FormsAutoCreateNewFormsCheckBox'
         TabOrder = 2
-        Left = 6
-        Height = 13
-        Top = 292
-        Width = 441
       end
     end
     object MiscPage: TPage
       Caption = 'MiscPage'
-      ClientWidth = 449
-      ClientHeight = 315
-      Height = 315
-      Width = 449
       object MainUnitHasUsesSectionForAllUnitsCheckBox: TCheckBox
-        Align = alTop
-        BorderSpacing.Left = 6
-        BorderSpacing.Top = 2
-        BorderSpacing.Right = 6
-        Caption = 'MainUnitHasUsesSectionForAllUnitsCheckBox'
-        TabOrder = 0
         AnchorSideTop.Control = MainUnitIsPascalSourceCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 13
         Top = 25
         Width = 441
-      end
-      object MainUnitHasCreateFormStatementsCheckBox: TCheckBox
         Align = alTop
         BorderSpacing.Left = 6
         BorderSpacing.Top = 2
         BorderSpacing.Right = 6
-        Caption = 'MainUnitHasCreateFormStatementsCheckBox'
-        TabOrder = 1
+        Caption = 'MainUnitHasUsesSectionForAllUnitsCheckBox'
+        TabOrder = 0
+      end
+      object MainUnitHasCreateFormStatementsCheckBox: TCheckBox
         AnchorSideTop.Control = MainUnitHasUsesSectionForAllUnitsCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 13
         Top = 40
         Width = 441
+        Align = alTop
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 2
+        BorderSpacing.Right = 6
+        Caption = 'MainUnitHasCreateFormStatementsCheckBox'
+        TabOrder = 1
       end
       object MainUnitIsPascalSourceCheckBox: TCheckBox
+        Left = 6
+        Height = 13
+        Top = 10
+        Width = 441
         Align = alTop
         BorderSpacing.Left = 6
         BorderSpacing.Top = 10
         BorderSpacing.Right = 6
         Caption = 'MainUnitIsPascalSourceCheckBox'
         TabOrder = 2
-        Left = 6
-        Height = 13
-        Top = 10
-        Width = 441
       end
       object MainUnitHasTitleStatementCheckBox: TCheckBox
-        Align = alTop
-        BorderSpacing.Left = 6
-        BorderSpacing.Top = 2
-        BorderSpacing.Right = 6
-        Caption = 'MainUnitHasTitleStatementCheckBox'
-        TabOrder = 5
         AnchorSideTop.Control = MainUnitHasCreateFormStatementsCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 13
         Top = 55
         Width = 441
-      end
-      object RunnableCheckBox: TCheckBox
         Align = alTop
         BorderSpacing.Left = 6
-        BorderSpacing.Top = 10
+        BorderSpacing.Top = 2
         BorderSpacing.Right = 6
-        Caption = 'RunnableCheckBox'
-        TabOrder = 3
+        Caption = 'MainUnitHasTitleStatementCheckBox'
+        TabOrder = 5
+      end
+      object RunnableCheckBox: TCheckBox
         AnchorSideTop.Control = MainUnitHasTitleStatementCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 13
         Top = 78
         Width = 441
+        Align = alTop
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 10
+        BorderSpacing.Right = 6
+        Caption = 'RunnableCheckBox'
+        TabOrder = 3
       end
       object AlwaysBuildCheckBox: TCheckBox
-        Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Left = 6
-        BorderSpacing.Top = 2
-        BorderSpacing.Right = 6
-        Caption = 'AlwaysBuildCheckBox'
-        TabOrder = 4
         AnchorSideTop.Control = RunnableCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 13
         Top = 93
         Width = 441
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 2
+        BorderSpacing.Right = 6
+        Caption = 'AlwaysBuildCheckBox'
+        TabOrder = 4
       end
     end
     object LazDocPage: TPage
       Caption = 'LazDocPage'
-      ClientWidth = 449
-      ClientHeight = 315
-      Height = 315
-      Width = 449
       object Label2: TLabel
+        Height = 14
+        Top = 222
+        Width = 449
         Align = alTop
         Caption = 'NOTE: only absolute paths are supported now'
         Color = clNone
         ParentColor = False
-        Height = 14
-        Top = 222
-        Width = 453
       end
       object LazDocPathsGroupBox: TGroupBox
-        Align = alTop
-        BorderSpacing.Around = 6
-        Caption = 'LazDocPathsGroupBox'
-        ClientHeight = 210
-        ClientWidth = 441
-        TabOrder = 0
         Left = 6
         Height = 210
         Top = 6
-        Width = 441
+        Width = 437
+        Align = alTop
+        BorderSpacing.Around = 6
+        Caption = 'LazDocPathsGroupBox'
+        TabOrder = 0
         object LazDocListBox: TListBox
-          Align = alTop
-          BorderSpacing.Around = 6
-          TabOrder = 0
-          TopIndex = -1
           Left = 6
           Height = 108
           Top = 6
-          Width = 429
+          Width = 421
+          Align = alTop
+          BorderSpacing.Around = 6
+          TabOrder = 0
         end
         object LazDocAddPathButton: TButton
+          Left = 6
+          Height = 25
+          Top = 122
+          Width = 75
           BorderSpacing.InnerBorder = 4
           Caption = 'LazDocAddPathButton'
           OnClick = LazDocAddPathButtonClick
           TabOrder = 1
-          Left = 6
-          Height = 25
-          Top = 122
-          Width = 75
         end
         object LazDocDeletePathButton: TButton
-          BorderSpacing.InnerBorder = 4
-          Caption = 'LazDocDeletePathButton'
-          OnClick = LazDocDeletePathButtonClick
-          TabOrder = 2
           Left = 90
           Height = 25
           Top = 122
           Width = 75
+          BorderSpacing.InnerBorder = 4
+          Caption = 'LazDocDeletePathButton'
+          OnClick = LazDocDeletePathButtonClick
+          TabOrder = 2
         end
         object LazDocPathEdit: TEdit
-          Anchors = [akTop, akLeft, akRight]
-          TabOrder = 3
-          Text = 'LazDocPathEdit'
           Left = 6
           Height = 23
           Top = 154
-          Width = 381
+          Width = 369
+          Anchors = [akTop, akLeft, akRight]
+          TabOrder = 3
+          Text = 'LazDocPathEdit'
         end
         object LazDocBrowseButton: TButton
+          Left = 380
+          Height = 23
+          Top = 154
+          Width = 23
           Anchors = [akTop, akRight]
           BorderSpacing.InnerBorder = 4
           Caption = '...'
           OnClick = LazDocBrowseButtonClick
           TabOrder = 4
-          Left = 392
-          Height = 23
-          Top = 154
-          Width = 23
         end
       end
     end
     object SavePage: TPage
       Caption = 'SavePage'
-      ClientWidth = 449
-      ClientHeight = 315
-      Height = 315
-      Width = 449
       object SaveClosedUnitInfoCheckBox: TCheckBox
+        Left = 6
+        Height = 13
+        Top = 6
+        Width = 437
         Align = alTop
         BorderSpacing.Left = 6
         BorderSpacing.Top = 6
         BorderSpacing.Right = 6
         Caption = 'SaveClosedUnitInfoCheckBox'
         TabOrder = 0
-        Left = 6
-        Height = 13
-        Top = 6
-        Width = 441
       end
       object SaveOnlyProjectUnitInfoCheckBox: TCheckBox
+        AnchorSideTop.Control = SaveClosedUnitInfoCheckBox
+        AnchorSideTop.Side = asrBottom
+        Left = 6
+        Height = 13
+        Top = 21
+        Width = 437
         Align = alTop
         BorderSpacing.Left = 6
         BorderSpacing.Top = 2
         BorderSpacing.Right = 6
         Caption = 'SaveOnlyProjectUnitInfoCheckBox'
         TabOrder = 1
-        AnchorSideTop.Control = SaveClosedUnitInfoCheckBox
-        AnchorSideTop.Side = asrBottom
-        Left = 6
-        Height = 13
-        Top = 21
-        Width = 441
       end
       object SaveSessionLocationRadioGroup: TRadioGroup
+        AnchorSideTop.Control = SaveOnlyProjectUnitInfoCheckBox
+        AnchorSideTop.Side = asrBottom
+        Left = 7
+        Height = 117
+        Top = 45
+        Width = 413
         AutoFill = True
         BorderSpacing.Top = 5
         BorderSpacing.Around = 6
@@ -410,266 +384,279 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
         TabOrder = 2
-        AnchorSideTop.Control = SaveOnlyProjectUnitInfoCheckBox
-        AnchorSideTop.Side = asrBottom
-        Left = 7
-        Height = 117
-        Top = 45
-        Width = 413
       end
     end
     object VersionInfoPage: TPage
       Caption = 'VersionInfoPage'
-      ClientWidth = 449
-      ClientHeight = 315
-      Height = 315
-      Width = 449
       object VersionInfoGroupBox: TGroupBox
-        Anchors = [akTop, akLeft, akRight]
-        Caption = 'Version Numbering'
-        ClientHeight = 55
-        ClientWidth = 437
-        TabOrder = 0
+        AnchorSideLeft.Control = LanguageSettingsGroupBox
+        AnchorSideTop.Control = UseVersionInfoCheckBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = LanguageSettingsGroupBox
+        AnchorSideRight.Side = asrBottom
         Left = 6
         Height = 73
-        Top = 32
-        Width = 441
+        Top = 25
+        Width = 437
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
+        Caption = 'Version Numbering'
+        TabOrder = 0
         object VersionLabel: TLabel
-          Caption = 'Version:'
-          Color = clNone
-          ParentColor = False
+          Left = 6
           Height = 14
           Top = 2
           Width = 40
+          Caption = 'Version:'
+          Color = clNone
+          ParentColor = False
         end
         object MajorRevisionLabel: TLabel
+          AnchorSideLeft.Control = VersionSpinEdit
+          AnchorSideLeft.Side = asrBottom
+          Left = 94
+          Height = 14
+          Top = 4
+          Width = 75
           BorderSpacing.Left = 10
           Caption = 'Major Revision:'
           Color = clNone
           ParentColor = False
-          AnchorSideLeft.Control = VersionSpinEdit
-          AnchorSideLeft.Side = asrBottom
-          Left = 88
-          Height = 14
-          Top = 4
-          Width = 75
         end
         object MinorRevisionLabel: TLabel
+          AnchorSideLeft.Control = MajorRevisionSpinEdit
+          AnchorSideLeft.Side = asrBottom
+          Left = 217
+          Height = 14
+          Top = 5
+          Width = 74
           BorderSpacing.Left = 10
           Caption = 'Minor Revision:'
           Color = clNone
           ParentColor = False
-          AnchorSideLeft.Control = MajorRevisionSpinEdit
-          AnchorSideLeft.Side = asrBottom
-          Left = 211
-          Height = 14
-          Top = 5
-          Width = 74
         end
         object BuildLabel: TLabel
+          AnchorSideLeft.Control = MinorRevisionSpinEdit
+          AnchorSideLeft.Side = asrBottom
+          Left = 335
+          Height = 14
+          Top = 5
+          Width = 27
           BorderSpacing.Left = 6
           Caption = 'Build:'
           Color = clNone
           ParentColor = False
-          AnchorSideLeft.Control = MinorRevisionSpinEdit
-          AnchorSideLeft.Side = asrBottom
-          Left = 329
-          Height = 14
-          Top = 5
-          Width = 27
         end
         object BuildEdit: TEdit
+          AnchorSideLeft.Control = BuildLabel
+          AnchorSideLeft.Side = asrBottom
+          Left = 368
+          Height = 20
+          Top = 2
+          Width = 32
           BorderSpacing.Left = 6
           TabOrder = 0
           Text = '0'
-          AnchorSideLeft.Control = BuildLabel
-          AnchorSideLeft.Side = asrBottom
-          Left = 362
-          Height = 20
-          Top = 2
-          Width = 32
         end
         object VersionSpinEdit: TSpinEdit
-          BorderSpacing.Left = 6
-          TabOrder = 1
           AnchorSideLeft.Control = VersionLabel
           AnchorSideLeft.Side = asrBottom
-          Left = 46
+          Left = 52
           Height = 20
           Top = 1
           Width = 32
+          BorderSpacing.Left = 6
+          TabOrder = 1
         end
         object MajorRevisionSpinEdit: TSpinEdit
-          BorderSpacing.Left = 6
-          TabOrder = 2
           AnchorSideLeft.Control = MajorRevisionLabel
           AnchorSideLeft.Side = asrBottom
-          Left = 169
+          Left = 175
           Height = 20
           Width = 32
+          BorderSpacing.Left = 6
+          TabOrder = 2
         end
         object MinorRevisionSpinEdit: TSpinEdit
-          BorderSpacing.Left = 6
-          TabOrder = 3
           AnchorSideLeft.Control = MinorRevisionLabel
           AnchorSideLeft.Side = asrBottom
-          Left = 291
+          Left = 297
           Height = 20
           Top = 2
           Width = 32
+          BorderSpacing.Left = 6
+          TabOrder = 3
         end
         object AutomaticallyIncreaseBuildCheckBox: TCheckBox
-          Caption = 'Automatically increase Build'
-          Enabled = False
-          TabOrder = 4
+          Left = 6
           Height = 13
           Top = 28
           Width = 151
+          Caption = 'Automatically increase Build'
+          Enabled = False
+          TabOrder = 4
         end
       end
       object UseVersionInfoCheckBox: TCheckBox
-        Caption = 'Include Version Info in executable'
-        OnChange = UseVersionInfoCheckBoxChange
-        TabOrder = 1
         Left = 12
         Height = 13
         Top = 6
         Width = 180
+        Caption = 'Include Version Info in executable'
+        OnChange = UseVersionInfoCheckBoxChange
+        TabOrder = 1
       end
       object LanguageSettingsGroupBox: TGroupBox
-        Anchors = [akTop, akLeft, akRight]
-        Caption = 'Language Options'
-        ClientHeight = 63
-        ClientWidth = 437
-        TabOrder = 2
+        AnchorSideLeft.Control = OtherInfoGroupBox
+        AnchorSideTop.Control = VersionInfoGroupBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = OtherInfoGroupBox
+        AnchorSideRight.Side = asrBottom
         Left = 6
         Height = 81
-        Top = 112
-        Width = 441
+        Top = 104
+        Width = 437
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
+        Caption = 'Language Options'
+        TabOrder = 2
         object LanguageSelectionLabel: TLabel
-          Caption = 'Language Selection:'
-          Color = clNone
-          ParentColor = False
-          Left = 12
+          Left = 6
           Height = 14
           Top = 6
           Width = 98
-        end
-        object CharacterSetLabel: TLabel
-          Caption = 'Character Set:'
+          Caption = 'Language Selection:'
           Color = clNone
           ParentColor = False
+        end
+        object CharacterSetLabel: TLabel
           Left = 268
           Height = 14
           Top = 6
           Width = 72
+          Caption = 'Character Set:'
+          Color = clNone
+          ParentColor = False
         end
         object LanguageSelectionComboBox: TComboBox
+          AnchorSideTop.Control = LanguageSelectionLabel
+          AnchorSideTop.Side = asrBottom
+          Left = 6
+          Height = 21
+          Top = 22
+          Width = 248
           AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
           BorderSpacing.Top = 2
           MaxLength = 0
           TabOrder = 0
           Text = 'U.S. English'
-          AnchorSideTop.Control = LanguageSelectionLabel
-          AnchorSideTop.Side = asrBottom
-          Left = 12
-          Height = 21
-          Top = 22
-          Width = 248
         end
         object CharacterSetComboBox: TComboBox
-          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
-          MaxLength = 0
-          TabOrder = 1
-          Text = 'Multilingual'
           AnchorSideTop.Control = LanguageSelectionComboBox
           Left = 268
           Height = 21
           Top = 22
-          Width = 128
+          Width = 120
+          Anchors = [akTop, akLeft, akRight]
+          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+          MaxLength = 0
+          TabOrder = 1
+          Text = 'Multilingual'
         end
       end
       object OtherInfoGroupBox: TGroupBox
-        Anchors = [akTop, akLeft, akRight]
-        Caption = 'Other Info'
-        ClientHeight = 87
-        ClientWidth = 437
-        TabOrder = 3
+        AnchorSideTop.Control = LanguageSettingsGroupBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 105
-        Top = 197
-        Width = 441
+        Height = 118
+        Top = 191
+        Width = 437
+        Align = alBottom
+        Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Around = 6
+        Caption = 'Other Info'
+        TabOrder = 3
         object DescriptionLabel: TLabel
-          Caption = 'Description:'
-          Color = clNone
-          ParentColor = False
           AnchorSideTop.Control = DescriptionEdit
           AnchorSideTop.Side = asrCenter
-          Left = 5
+          Left = 6
           Height = 14
           Top = 2
           Width = 58
-        end
-        object CopyrightLabel: TLabel
-          Caption = 'Copyright:'
+          Caption = 'Description:'
           Color = clNone
           ParentColor = False
+        end
+        object CopyrightLabel: TLabel
           AnchorSideTop.Control = CopyrightEdit
           AnchorSideTop.Side = asrCenter
-          Left = 5
+          Left = 6
           Height = 14
           Top = 29
           Width = 52
+          Caption = 'Copyright:'
+          Color = clNone
+          ParentColor = False
         end
         object DescriptionEdit: TEdit
-          Anchors = [akTop, akLeft, akRight]
-          BorderSpacing.Left = 6
-          BorderSpacing.Right = 6
-          TabOrder = 0
           AnchorSideLeft.Control = DescriptionLabel
           AnchorSideLeft.Side = asrBottom
           AnchorSideRight.Control = OtherInfoGroupBox
           AnchorSideRight.Side = asrBottom
-          Left = 69
+          Left = 70
           Height = 21
           Top = -1
-          Width = 362
-        end
-        object CopyrightEdit: TEdit
+          Width = 357
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Left = 6
-          BorderSpacing.Top = 6
           BorderSpacing.Right = 6
-          TabOrder = 1
+          TabOrder = 0
+        end
+        object CopyrightEdit: TEdit
           AnchorSideLeft.Control = CopyrightLabel
           AnchorSideLeft.Side = asrBottom
           AnchorSideTop.Control = DescriptionEdit
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = OtherInfoGroupBox
           AnchorSideRight.Side = asrBottom
-          Left = 63
+          Left = 64
           Height = 21
           Top = 26
-          Width = 368
+          Width = 363
+          Anchors = [akTop, akLeft, akRight]
+          BorderSpacing.Left = 6
+          BorderSpacing.Top = 6
+          BorderSpacing.Right = 6
+          TabOrder = 1
         end
         object AdditionalInfoButton: TButton
+          AnchorSideTop.Control = CopyrightEdit
+          AnchorSideTop.Side = asrBottom
+          AnchorSideRight.Control = OtherInfoGroupBox
+          AnchorSideRight.Side = asrBottom
+          AnchorSideBottom.Control = OtherInfoGroupBox
+          AnchorSideBottom.Side = asrBottom
+          Left = 332
+          Height = 25
+          Top = 69
+          Width = 95
+          Anchors = [akRight, akBottom]
           AutoSize = True
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 4
           Caption = 'Additional Info'
           OnClick = AdditionalInfoButtonClick
           TabOrder = 2
-          AnchorSideTop.Control = CopyrightEdit
-          AnchorSideTop.Side = asrBottom
-          Left = 315
-          Height = 33
-          Top = 53
-          Width = 95
         end
       end
     end
   end
   object CancelButton: TButton
+    Left = 371
+    Height = 25
+    Top = 347
+    Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.InnerBorder = 4
@@ -678,12 +665,13 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     Constraints.MinWidth = 75
     ModalResult = 2
     TabOrder = 1
-    Left = 371
-    Height = 33
-    Top = 339
-    Width = 75
   end
   object OKButton: TButton
+    AnchorSideRight.Control = CancelButton
+    Left = 280
+    Height = 25
+    Top = 347
+    Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Right = 10
@@ -694,16 +682,10 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     Default = True
     ModalResult = 1
     TabOrder = 2
-    AnchorSideRight.Control = CancelButton
-    Left = 280
-    Height = 33
-    Top = 339
-    Width = 75
   end
   object SelectDirectoryDialog: TSelectDirectoryDialog
     Title = 'Select Directory'
     FilterIndex = 0
-    Title = 'Select Directory'
     left = 344
     top = 8
   end
diff --git a/ide/projectopts.lrs b/ide/projectopts.lrs
index 27c43a4189..0cf0d4b246 100644
--- a/ide/projectopts.lrs
+++ b/ide/projectopts.lrs
@@ -1,225 +1,226 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
-  'TPF0'#21'TProjectOptionsDialog'#20'ProjectOptionsDialog'#7'Caption'#6#20'Pro'
-  +'jectOptionsDialog'#12'ClientHeight'#3'z'#1#11'ClientWidth'#3#201#1#7'OnClos'
-  +'e'#7#19'ProjectOptionsClose'#8'OnResize'#7#20'ProjectOptionsResize'#13'Pixe'
-  +'lsPerInch'#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3
-  +#200#1#18'VertScrollBar.Page'#3'y'#1#4'Left'#3#234#0#6'Height'#3'z'#1#3'Top'
-  +#3'('#1#5'Width'#3#201#1#0#9'TNotebook'#8'Notebook'#5'Align'#7#5'alTop'#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#5#6'He'
-  +'ight'#3'U'#1#5'Width'#3#201#1#0#5'TPage'#15'ApplicationPage'#7'Caption'#6#15
-  +'ApplicationPage'#11'ClientWidth'#3#193#1#12'ClientHeight'#3';'#1#6'Height'#3
-  +';'#1#5'Width'#3#193#1#0#9'TGroupBox'#19'AppSettingsGroupBox'#5'Align'#7#5'a'
-  +'lTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'AppSettingsGroupBox'#12
-  +'ClientHeight'#2'7'#11'ClientWidth'#3#177#1#8'TabOrder'#2#0#4'Left'#2#6#6'He'
-  +'ight'#2'I'#3'Top'#2#6#5'Width'#3#181#1#0#6'TLabel'#10'TitleLabel'#5'Align'#7
-  +#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpac'
-  +'ing.Right'#2#6#7'Caption'#6#10'TitleLabel'#5'Color'#7#6'clNone'#11'ParentCo'
-  +'lor'#8#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#165#1#0#0#5'TEdit'#9
-  +'TitleEdit'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.'
-  +'Right'#2#6#8'TabOrder'#2#0#4'Text'#6#9'TitleEdit'#4'Left'#2#6#6'Height'#2#23
-  +#3'Top'#2#20#5'Width'#3#165#1#0#0#0#9'TGroupBox'#22'OutputSettingsGroupBox'#5
-  +'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'OutputSettin'
-  +'gsGroupBox'#12'ClientHeight'#2'7'#11'ClientWidth'#3#177#1#8'TabOrder'#2#1#4
-  +'Left'#2#6#6'Height'#2'I'#3'Top'#2'U'#5'Width'#3#181#1#0#6'TLabel'#15'Target'
-  +'FileLabel'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#15'TargetFileLabel'#5'Col'
-  +'or'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'W'
-  +'idth'#3#165#1#0#0#5'TEdit'#14'TargetFileEdit'#5'Align'#7#5'alTop'#18'Border'
-  +'Spacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#4'Text'#6#14
-  +'TargetFileEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3#165#1#0#0
-  +#0#0#5'TPage'#9'FormsPage'#7'Caption'#6#9'FormsPage'#11'ClientWidth'#3#193#1
-  +#12'ClientHeight'#3';'#1#8'OnResize'#7#15'FormsPageResize'#6'Height'#3';'#1#5
-  +'Width'#3#193#1#0#6'TLabel'#21'FormsAutoCreatedLabel'#7'Caption'#6#21'FormsA'
-  +'utoCreatedLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2'$'#6'Heig'
-  +'ht'#2#14#3'Top'#2#10#5'Width'#2'u'#0#0#6'TLabel'#20'FormsAvailFormsLabel'#7
-  +'Caption'#6#20'FormsAvailFormsLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8
-  +#22'AnchorSideLeft.Control'#7#22'FormsAvailFormsListBox'#4'Left'#3#240#0#6'H'
-  +'eight'#2#14#3'Top'#2#10#5'Width'#2'k'#0#0#8'TListBox'#23'FormsAutoCreatedLi'
-  +'stBox'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Arou'
-  +'nd'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0#8'TopIndex'#2#255#22'AnchorSideLe'
-  +'ft.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#31'FormsAutoCreateNewFormsCheckBo'
-  +'x'#4'Left'#2'$'#6'Height'#3#254#0#3'Top'#2' '#5'Width'#3#168#0#0#0#8'TListB'
-  +'ox'#22'FormsAvailFormsListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#1#8
-  +'TopIndex'#2#255#22'AnchorSideLeft.Control'#7#29'FormsAddToAutoCreatedFormsB'
-  +'tn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#31
-  +'FormsAutoCreateNewFormsCheckBox'#4'Left'#3#240#0#6'Height'#3#254#0#3'Top'#2
-  +' '#5'Width'#3#199#0#0#0#6'TArrow'#29'FormsMoveAutoCreatedFormUpBtn'#9'Arrow'
-  +'Type'#7#4'atUp'#7'OnClick'#7'"FormsMoveAutoCreatedFormUpBtnClick'#4'Left'#2
-  +#6#6'Height'#2#24#3'Top'#2' '#5'Width'#2#24#0#0#6'TArrow FormsMoveAutoCreate'
-  +'dFormsDownBtn'#9'ArrowType'#7#6'atDown'#7'OnClick'#7'$FormsMoveAutoCreatedF'
-  +'ormDownBtnClick'#4'Left'#2#6#6'Height'#2#24#3'Top'#2'<'#5'Width'#2#24#0#0#6
-  +'TArrow"FormsRemoveFromAutoCreatedFormsBtn'#9'ArrowType'#7#7'atRight'#20'Bor'
-  +'derSpacing.Around'#2#6#7'OnClick'#7'''FormsRemoveFromAutoCreatedFormsBtnCli'
-  +'ck'#22'AnchorSideLeft.Control'#7#23'FormsAutoCreatedListBox'#19'AnchorSideL'
-  +'eft.Side'#7#9'asrBottom'#4'Left'#3#210#0#6'Height'#2#24#3'Top'#2' '#5'Width'
-  +#2#24#0#0#6'TArrow'#29'FormsAddToAutoCreatedFormsBtn'#7'OnClick'#7'"FormsAdd'
-  +'ToAutoCreatedFormsBtnClick'#22'AnchorSideLeft.Control'#7'"FormsRemoveFromAu'
-  +'toCreatedFormsBtn'#4'Left'#3#210#0#6'Height'#2#24#3'Top'#2'<'#5'Width'#2#24
-  +#0#0#9'TCheckBox'#31'FormsAutoCreateNewFormsCheckBox'#5'Align'#7#8'alBottom'
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#31'FormsAutoCreateNewFormsCheckBo'
-  +'x'#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2#13#3'Top'#3'$'#1#5'Width'#3#185#1
-  +#0#0#0#5'TPage'#8'MiscPage'#7'Caption'#6#8'MiscPage'#11'ClientWidth'#3#193#1
-  +#12'ClientHeight'#3';'#1#6'Height'#3';'#1#5'Width'#3#193#1#0#9'TCheckBox)Mai'
-  +'nUnitHasUsesSectionForAllUnitsCheckBox'#5'Align'#7#5'alTop'#18'BorderSpacin'
-  ,'g.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'
-  +#6')MainUnitHasUsesSectionForAllUnitsCheckBox'#8'TabOrder'#2#0#21'AnchorSide'
-  +'Top.Control'#7#30'MainUnitIsPascalSourceCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2#25#5'Width'#3#185#1#0#0#9'TC'
-  +'heckBox''MainUnitHasCreateFormStatementsCheckBox'#5'Align'#7#5'alTop'#18'Bo'
-  +'rderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6
-  +#7'Caption'#6'''MainUnitHasCreateFormStatementsCheckBox'#8'TabOrder'#2#1#21
-  +'AnchorSideTop.Control'#7')MainUnitHasUsesSectionForAllUnitsCheckBox'#18'Anc'
-  +'horSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'('#5'Wi'
-  +'dth'#3#185#1#0#0#9'TCheckBox'#30'MainUnitIsPascalSourceCheckBox'#5'Align'#7
-  +#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#10#19'BorderSpa'
-  +'cing.Right'#2#6#7'Caption'#6#30'MainUnitIsPascalSourceCheckBox'#8'TabOrder'
-  +#2#2#4'Left'#2#6#6'Height'#2#13#3'Top'#2#10#5'Width'#3#185#1#0#0#9'TCheckBox'
-  +'!MainUnitHasTitleStatementCheckBox'#5'Align'#7#5'alTop'#18'BorderSpacing.Le'
-  +'ft'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6
-  +'!MainUnitHasTitleStatementCheckBox'#8'TabOrder'#2#5#21'AnchorSideTop.Contro'
-  +'l'#7'''MainUnitHasCreateFormStatementsCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'7'#5'Width'#3#185#1#0#0#9'TC'
-  +'heckBox'#16'RunnableCheckBox'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6
-  +#17'BorderSpacing.Top'#2#10#19'BorderSpacing.Right'#2#6#7'Caption'#6#16'Runn'
-  +'ableCheckBox'#8'TabOrder'#2#3#21'AnchorSideTop.Control'#7'!MainUnitHasTitle'
-  +'StatementCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
-  +'ht'#2#13#3'Top'#2'N'#5'Width'#3#185#1#0#0#9'TCheckBox'#19'AlwaysBuildCheckB'
-  +'ox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6
-  +#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'Alway'
-  +'sBuildCheckBox'#8'TabOrder'#2#4#21'AnchorSideTop.Control'#7#16'RunnableChec'
-  +'kBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'To'
-  +'p'#2']'#5'Width'#3#185#1#0#0#0#5'TPage'#10'LazDocPage'#7'Caption'#6#10'LazD'
-  +'ocPage'#11'ClientWidth'#3#193#1#12'ClientHeight'#3';'#1#6'Height'#3';'#1#5
-  +'Width'#3#193#1#0#6'TLabel'#6'Label2'#5'Align'#7#5'alTop'#7'Caption'#6'+NOTE'
-  +': only absolute paths are supported now'#5'Color'#7#6'clNone'#11'ParentColo'
-  +'r'#8#6'Height'#2#14#3'Top'#3#222#0#5'Width'#3#197#1#0#0#9'TGroupBox'#19'Laz'
-  +'DocPathsGroupBox'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Captio'
-  +'n'#6#19'LazDocPathsGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#185
-  +#1#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#3#210#0#3'Top'#2#6#5'Width'#3#185#1
-  +#0#8'TListBox'#13'LazDocListBox'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
-  +#2#6#8'TabOrder'#2#0#8'TopIndex'#2#255#4'Left'#2#6#6'Height'#2'l'#3'Top'#2#6
-  +#5'Width'#3#173#1#0#0#7'TButton'#19'LazDocAddPathButton'#25'BorderSpacing.In'
-  +'nerBorder'#2#4#7'Caption'#6#19'LazDocAddPathButton'#7'OnClick'#7#24'LazDocA'
-  +'ddPathButtonClick'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#25#3'Top'#2'z'#5
-  +'Width'#2'K'#0#0#7'TButton'#22'LazDocDeletePathButton'#25'BorderSpacing.Inne'
-  +'rBorder'#2#4#7'Caption'#6#22'LazDocDeletePathButton'#7'OnClick'#7#27'LazDoc'
-  +'DeletePathButtonClick'#8'TabOrder'#2#2#4'Left'#2'Z'#6'Height'#2#25#3'Top'#2
-  +'z'#5'Width'#2'K'#0#0#5'TEdit'#14'LazDocPathEdit'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'#6#14'LazDocPathEdit'#4'Left'#2#6
-  +#6'Height'#2#23#3'Top'#3#154#0#5'Width'#3'}'#1#0#0#7'TButton'#18'LazDocBrows'
-  +'eButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2
-  +#4#7'Caption'#6#3'...'#7'OnClick'#7#23'LazDocBrowseButtonClick'#8'TabOrder'#2
-  +#4#4'Left'#3#136#1#6'Height'#2#23#3'Top'#3#154#0#5'Width'#2#23#0#0#0#0#5'TPa'
-  +'ge'#8'SavePage'#7'Caption'#6#8'SavePage'#11'ClientWidth'#3#193#1#12'ClientH'
-  +'eight'#3';'#1#6'Height'#3';'#1#5'Width'#3#193#1#0#9'TCheckBox'#26'SaveClose'
-  +'dUnitInfoCheckBox'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'Border'
-  +'Spacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#26'SaveClosedUnit'
-  +'InfoCheckBox'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#13#3'Top'#2#6#5'Width'
-  +#3#185#1#0#0#9'TCheckBox'#31'SaveOnlyProjectUnitInfoCheckBox'#5'Align'#7#5'a'
-  +'lTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing'
-  +'.Right'#2#6#7'Caption'#6#31'SaveOnlyProjectUnitInfoCheckBox'#8'TabOrder'#2#1
-  +#21'AnchorSideTop.Control'#7#26'SaveClosedUnitInfoCheckBox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2#21#5'Width'#3#185
-  +#1#0#0#11'TRadioGroup'#29'SaveSessionLocationRadioGroup'#8'AutoFill'#9#17'Bo'
-  +'rderSpacing.Top'#2#5#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'SaveSessi'
-  +'onLocationRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.T'
-  +'opBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousCh'
-  +'ildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28
-  ,'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer'
-  +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT'
-  +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#2#21'AnchorSi'
-  +'deTop.Control'#7#31'SaveOnlyProjectUnitInfoCheckBox'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#4'Left'#2#7#6'Height'#2'u'#3'Top'#2'-'#5'Width'#3#157#1#0#0#0
-  +#5'TPage'#15'VersionInfoPage'#7'Caption'#6#15'VersionInfoPage'#11'ClientWidt'
-  +'h'#3#193#1#12'ClientHeight'#3';'#1#6'Height'#3';'#1#5'Width'#3#193#1#0#9'TG'
-  +'roupBox'#19'VersionInfoGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#0#7'Caption'#6#17'Version Numbering'#12'ClientHeight'#2'7'#11'ClientWidth'#3
-  +#181#1#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2'I'#3'Top'#2' '#5'Width'#3#185
-  +#1#0#6'TLabel'#12'VersionLabel'#7'Caption'#6#8'Version:'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#6'Height'#2#14#3'Top'#2#2#5'Width'#2'('#0#0#6'TLabel'#18
-  +'MajorRevisionLabel'#18'BorderSpacing.Left'#2#10#7'Caption'#6#15'Major Revis'
-  +'ion:'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#15
-  +'VersionSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'X'#6'Heig'
-  +'ht'#2#14#3'Top'#2#4#5'Width'#2'K'#0#0#6'TLabel'#18'MinorRevisionLabel'#18'B'
-  +'orderSpacing.Left'#2#10#7'Caption'#6#15'Minor Revision:'#5'Color'#7#6'clNon'
-  +'e'#11'ParentColor'#8#22'AnchorSideLeft.Control'#7#21'MajorRevisionSpinEdit'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#211#0#6'Height'#2#14#3'Top'
-  +#2#5#5'Width'#2'J'#0#0#6'TLabel'#10'BuildLabel'#18'BorderSpacing.Left'#2#6#7
-  +'Caption'#6#6'Build:'#5'Color'#7#6'clNone'#11'ParentColor'#8#22'AnchorSideLe'
-  +'ft.Control'#7#21'MinorRevisionSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBott'
-  +'om'#4'Left'#3'I'#1#6'Height'#2#14#3'Top'#2#5#5'Width'#2#27#0#0#5'TEdit'#9'B'
-  +'uildEdit'#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#0#4'Text'#6#1'0'#22'Anch'
-  +'orSideLeft.Control'#7#10'BuildLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#4'Left'#3'j'#1#6'Height'#2#20#3'Top'#2#2#5'Width'#2' '#0#0#9'TSpinEdit'#15
-  +'VersionSpinEdit'#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#1#22'AnchorSideLe'
-  +'ft.Control'#7#12'VersionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2'.'#6'Height'#2#20#3'Top'#2#1#5'Width'#2' '#0#0#9'TSpinEdit'#21'MajorRe'
-  +'visionSpinEdit'#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#2#22'AnchorSideLef'
-  +'t.Control'#7#18'MajorRevisionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
-  +'Left'#3#169#0#6'Height'#2#20#5'Width'#2' '#0#0#9'TSpinEdit'#21'MinorRevisio'
-  +'nSpinEdit'#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#3#22'AnchorSideLeft.Con'
-  +'trol'#7#18'MinorRevisionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3'#'#1#6'Height'#2#20#3'Top'#2#2#5'Width'#2' '#0#0#9'TCheckBox"Automatic'
-  +'allyIncreaseBuildCheckBox'#7'Caption'#6#28'Automatically increase Build'#7
-  +'Enabled'#8#8'TabOrder'#2#4#6'Height'#2#13#3'Top'#2#28#5'Width'#3#151#0#0#0#0
-  +#9'TCheckBox'#22'UseVersionInfoCheckBox'#7'Caption'#6'"Include Version Info '
-  +'in executable'#8'OnChange'#7#28'UseVersionInfoCheckBoxChange'#8'TabOrder'#2
-  +#1#4'Left'#2#12#6'Height'#2#13#3'Top'#2#6#5'Width'#3#180#0#0#0#9'TGroupBox'
-  +#24'LanguageSettingsGroupBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7
-  +'Caption'#6#16'Language Options'#12'ClientHeight'#2'?'#11'ClientWidth'#3#181
-  +#1#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'Q'#3'Top'#2'p'#5'Width'#3#185#1#0
-  +#6'TLabel'#22'LanguageSelectionLabel'#7'Caption'#6#19'Language Selection:'#5
-  +'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#2#6
-  +#5'Width'#2'b'#0#0#6'TLabel'#17'CharacterSetLabel'#7'Caption'#6#14'Character'
-  +' Set:'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#3#12#1#6'Height'#2#14
-  +#3'Top'#2#6#5'Width'#2'H'#0#0#9'TComboBox'#25'LanguageSelectionComboBox'#16
-  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
-  +#17'BorderSpacing.Top'#2#2#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#12'U.S'
-  +'. English'#21'AnchorSideTop.Control'#7#22'LanguageSelectionLabel'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#21#3'Top'#2#22#5'Widt'
-  +'h'#3#248#0#0#0#9'TComboBox'#20'CharacterSetComboBox'#16'AutoCompleteText'#11
-  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'Ta'
-  +'bOrder'#2#1#4'Text'#6#12'Multilingual'#21'AnchorSideTop.Control'#7#25'Langu'
-  +'ageSelectionComboBox'#4'Left'#3#12#1#6'Height'#2#21#3'Top'#2#22#5'Width'#3
-  +#128#0#0#0#0#9'TGroupBox'#17'OtherInfoGroupBox'#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#7'akRight'#0#7'Caption'#6#10'Other Info'#12'ClientHeight'#2'W'#11'Clie'
-  +'ntWidth'#3#181#1#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2'i'#3'Top'#3#197#0#5
-  +'Width'#3#185#1#0#6'TLabel'#16'DescriptionLabel'#7'Caption'#6#12'Description'
-  +':'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#15'De'
-  +'scriptionEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2
-  +#14#3'Top'#2#2#5'Width'#2':'#0#0#6'TLabel'#14'CopyrightLabel'#7'Caption'#6#10
-  +'Copyright:'#5'Color'#7#6'clNone'#11'ParentColor'#8#21'AnchorSideTop.Control'
-  ,#7#13'CopyrightEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Hei'
-  +'ght'#2#14#3'Top'#2#29#5'Width'#2'4'#0#0#5'TEdit'#15'DescriptionEdit'#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'Borde'
-  +'rSpacing.Right'#2#6#8'TabOrder'#2#0#22'AnchorSideLeft.Control'#7#16'Descrip'
-  +'tionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Contro'
-  +'l'#7#17'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
-  +'E'#6'Height'#2#21#3'Top'#2#255#5'Width'#3'j'#1#0#0#5'TEdit'#13'CopyrightEdi'
-  +'t'#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#8'TabOrder'#2#1#22'An'
-  +'chorSideLeft.Control'#7#14'CopyrightLabel'#19'AnchorSideLeft.Side'#7#9'asrB'
-  +'ottom'#21'AnchorSideTop.Control'#7#15'DescriptionEdit'#18'AnchorSideTop.Sid'
-  +'e'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20'An'
-  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#2'?'#6'Height'#2#21#3'Top'#2#26#5
-  +'Width'#3'p'#1#0#0#7'TButton'#20'AdditionalInfoButton'#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#15'Add'
-  +'itional Info'#7'OnClick'#7#25'AdditionalInfoButtonClick'#8'TabOrder'#2#2#21
+  'TPF0'#21'TProjectOptionsDialog'#20'ProjectOptionsDialog'#4'Left'#3'G'#1#6'He'
+  +'ight'#3'z'#1#3'Top'#2'P'#5'Width'#3#201#1#18'HorzScrollBar.Page'#3#200#1#18
+  +'VertScrollBar.Page'#3'y'#1#13'ActiveControl'#7#9'BuildEdit'#7'Caption'#6#20
+  +'ProjectOptionsDialog'#7'OnClose'#7#19'ProjectOptionsClose'#8'Position'#7#14
+  +'poScreenCenter'#0#9'TNotebook'#8'Notebook'#6'Height'#3'U'#1#5'Width'#3#201#1
+  +#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
+  +#0#9'PageIndex'#2#5#0#5'TPage'#15'ApplicationPage'#7'Caption'#6#15'Applicati'
+  +'onPage'#0#9'TGroupBox'#19'AppSettingsGroupBox'#4'Left'#2#6#6'Height'#2'I'#3
+  +'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#19'AppSettingsGroupBox'#8'TabOrder'#2#0#0#6'TLabel'#10'TitleLabe'
+  +'l'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#165#1#5'Align'#7#5'alTo'
+  +'p'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Ri'
+  +'ght'#2#6#7'Caption'#6#10'TitleLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8
+  +#0#0#5'TEdit'#9'TitleEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3
+  +#165#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'
+  +#2#6#8'TabOrder'#2#0#4'Text'#6#9'TitleEdit'#0#0#0#9'TGroupBox'#22'OutputSett'
+  +'ingsGroupBox'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2'U'#5'Width'#3#181#1#5'Ali'
+  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'OutputSettingsG'
+  +'roupBox'#8'TabOrder'#2#1#0#6'TLabel'#15'TargetFileLabel'#4'Left'#2#6#6'Heig'
+  +'ht'#2#14#3'Top'#2#6#5'Width'#3#165#1#5'Align'#7#5'alTop'#18'BorderSpacing.L'
+  +'eft'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6
+  +#15'TargetFileLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#14
+  +'TargetFileEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#3#165#1#5'A'
+  +'lign'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'T'
+  +'abOrder'#2#0#4'Text'#6#14'TargetFileEdit'#0#0#0#0#5'TPage'#9'FormsPage'#7'C'
+  +'aption'#6#9'FormsPage'#8'OnResize'#7#15'FormsPageResize'#0#6'TLabel'#21'For'
+  +'msAutoCreatedLabel'#4'Left'#2'$'#6'Height'#2#14#3'Top'#2#10#5'Width'#2'u'#7
+  +'Caption'#6#21'FormsAutoCreatedLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8
+  +#0#0#6'TLabel'#20'FormsAvailFormsLabel'#22'AnchorSideLeft.Control'#7#22'Form'
+  +'sAvailFormsListBox'#4'Left'#3#240#0#6'Height'#2#14#3'Top'#2#10#5'Width'#2'k'
+  +#7'Caption'#6#20'FormsAvailFormsLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8
+  +#0#0#8'TListBox'#23'FormsAutoCreatedListBox'#22'AnchorSideLeft.Control'#7#29
+  +'FormsMoveAutoCreatedFormUpBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'An'
+  +'chorSideBottom.Control'#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#2'$'#6
+  +'Height'#3#2#1#3'Top'#2' '#5'Width'#3#168#0#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#0
+  +#0#0#8'TListBox'#22'FormsAvailFormsListBox'#22'AnchorSideLeft.Control'#7#29
+  +'FormsAddToAutoCreatedFormsBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'An'
+  +'chorSideBottom.Control'#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#3#240
+  +#0#6'Height'#3#2#1#3'Top'#2' '#5'Width'#3#199#0#7'Anchors'#11#5'akTop'#6'akL'
+  +'eft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9
+  +#8'TabOrder'#2#1#0#0#6'TArrow'#29'FormsMoveAutoCreatedFormUpBtn'#4'Left'#2#6
+  +#6'Height'#2#24#3'Top'#2' '#5'Width'#2#24#9'ArrowType'#7#4'atUp'#7'OnClick'#7
+  +'"FormsMoveAutoCreatedFormUpBtnClick'#0#0#6'TArrow FormsMoveAutoCreatedForms'
+  +'DownBtn'#4'Left'#2#6#6'Height'#2#24#3'Top'#2'<'#5'Width'#2#24#9'ArrowType'#7
+  +#6'atDown'#7'OnClick'#7'$FormsMoveAutoCreatedFormDownBtnClick'#0#0#6'TArrow"'
+  +'FormsRemoveFromAutoCreatedFormsBtn'#22'AnchorSideLeft.Control'#7#23'FormsAu'
+  +'toCreatedListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#210#0#6
+  +'Height'#2#24#3'Top'#2' '#5'Width'#2#24#9'ArrowType'#7#7'atRight'#20'BorderS'
+  +'pacing.Around'#2#6#7'OnClick'#7'''FormsRemoveFromAutoCreatedFormsBtnClick'#0
+  +#0#6'TArrow'#29'FormsAddToAutoCreatedFormsBtn'#22'AnchorSideLeft.Control'#7
+  +'"FormsRemoveFromAutoCreatedFormsBtn'#4'Left'#3#210#0#6'Height'#2#24#3'Top'#2
+  +'<'#5'Width'#2#24#7'OnClick'#7'"FormsAddToAutoCreatedFormsBtnClick'#0#0#9'TC'
+  +'heckBox'#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#2#6#6'Height'#2#13#3'T'
+  +'op'#3'('#1#5'Width'#3#181#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#31'FormsAutoCreateNewFormsCheckBox'#8'TabOrder'#2#2#0#0#0#5
+  +'TPage'#8'MiscPage'#7'Caption'#6#8'MiscPage'#0#9'TCheckBox)MainUnitHasUsesSe'
+  +'ctionForAllUnitsCheckBox'#21'AnchorSideTop.Control'#7#30'MainUnitIsPascalSo'
+  +'urceCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#13#3'Top'#2#25#5'Width'#3#185#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2
+  +#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6')MainU'
+  +'nitHasUsesSectionForAllUnitsCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox''Main'
+  +'UnitHasCreateFormStatementsCheckBox'#21'AnchorSideTop.Control'#7')MainUnitH'
+  +'asUsesSectionForAllUnitsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  ,'eft'#2#6#6'Height'#2#13#3'Top'#2'('#5'Width'#3#185#1#5'Align'#7#5'alTop'#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2
+  +#6#7'Caption'#6'''MainUnitHasCreateFormStatementsCheckBox'#8'TabOrder'#2#1#0
+  +#0#9'TCheckBox'#30'MainUnitIsPascalSourceCheckBox'#4'Left'#2#6#6'Height'#2#13
+  +#3'Top'#2#10#5'Width'#3#185#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6
+  +#17'BorderSpacing.Top'#2#10#19'BorderSpacing.Right'#2#6#7'Caption'#6#30'Main'
+  +'UnitIsPascalSourceCheckBox'#8'TabOrder'#2#2#0#0#9'TCheckBox!MainUnitHasTitl'
+  +'eStatementCheckBox'#21'AnchorSideTop.Control'#7'''MainUnitHasCreateFormStat'
+  +'ementsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2#13#3'Top'#2'7'#5'Width'#3#185#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'
+  +#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6'!Mai'
+  +'nUnitHasTitleStatementCheckBox'#8'TabOrder'#2#5#0#0#9'TCheckBox'#16'Runnabl'
+  +'eCheckBox'#21'AnchorSideTop.Control'#7'!MainUnitHasTitleStatementCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'N'
+  +#5'Width'#3#185#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#10#19'BorderSpacing.Right'#2#6#7'Caption'#6#16'RunnableCheckBo'
+  +'x'#8'TabOrder'#2#3#0#0#9'TCheckBox'#19'AlwaysBuildCheckBox'#21'AnchorSideTo'
+  +'p.Control'#7#16'RunnableCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2#6#6'Height'#2#13#3'Top'#2']'#5'Width'#3#185#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2
+  +#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'AlwaysBuildCheckBox'#8'TabOrder'
+  +#2#4#0#0#0#5'TPage'#10'LazDocPage'#7'Caption'#6#10'LazDocPage'#0#6'TLabel'#6
+  +'Label2'#6'Height'#2#14#3'Top'#3#222#0#5'Width'#3#193#1#5'Align'#7#5'alTop'#7
+  +'Caption'#6'+NOTE: only absolute paths are supported now'#5'Color'#7#6'clNon'
+  +'e'#11'ParentColor'#8#0#0#9'TGroupBox'#19'LazDocPathsGroupBox'#4'Left'#2#6#6
+  +'Height'#3#210#0#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#19'LazDocPathsGroupBox'#8'TabOrder'#2#0#0#8
+  +'TListBox'#13'LazDocListBox'#4'Left'#2#6#6'Height'#2'l'#3'Top'#2#6#5'Width'#3
+  +#165#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#7
+  +'TButton'#19'LazDocAddPathButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'z'#5'W'
+  +'idth'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#19'LazDocAddPathB'
+  +'utton'#7'OnClick'#7#24'LazDocAddPathButtonClick'#8'TabOrder'#2#1#0#0#7'TBut'
+  +'ton'#22'LazDocDeletePathButton'#4'Left'#2'Z'#6'Height'#2#25#3'Top'#2'z'#5'W'
+  +'idth'#2'K'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#22'LazDocDeletePa'
+  +'thButton'#7'OnClick'#7#27'LazDocDeletePathButtonClick'#8'TabOrder'#2#2#0#0#5
+  +'TEdit'#14'LazDocPathEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#154#0#5'Width'
+  +#3'q'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'
+  +#6#14'LazDocPathEdit'#0#0#7'TButton'#18'LazDocBrowseButton'#4'Left'#3'|'#1#6
+  +'Height'#2#23#3'Top'#3#154#0#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'
+  +#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#23'Laz'
+  +'DocBrowseButtonClick'#8'TabOrder'#2#4#0#0#0#0#5'TPage'#8'SavePage'#7'Captio'
+  +'n'#6#8'SavePage'#0#9'TCheckBox'#26'SaveClosedUnitInfoCheckBox'#4'Left'#2#6#6
+  +'Height'#2#13#3'Top'#2#6#5'Width'#3#181#1#5'Align'#7#5'alTop'#18'BorderSpaci'
+  +'ng.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Captio'
+  +'n'#6#26'SaveClosedUnitInfoCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#31'Sav'
+  +'eOnlyProjectUnitInfoCheckBox'#21'AnchorSideTop.Control'#7#26'SaveClosedUnit'
+  +'InfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#13#3'Top'#2#21#5'Width'#3#181#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2
+  +#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6#31'Sav'
+  +'eOnlyProjectUnitInfoCheckBox'#8'TabOrder'#2#1#0#0#11'TRadioGroup'#29'SaveSe'
+  +'ssionLocationRadioGroup'#21'AnchorSideTop.Control'#7#31'SaveOnlyProjectUnit'
+  +'InfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#7#6'Height'#2
+  +'u'#3'Top'#2'-'#5'Width'#3#157#1#8'AutoFill'#9#17'BorderSpacing.Top'#2#5#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#29'SaveSessionLocationRadioGroup'#28
+  +'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'C'
+  +'hildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing'
+  +'.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHoriz'
+  +'ontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChi'
+  +'lds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSiz'
+  +'ing.ControlsPerLine'#2#1#8'TabOrder'#2#2#0#0#0#5'TPage'#15'VersionInfoPage'
+  +#7'Caption'#6#15'VersionInfoPage'#0#9'TGroupBox'#19'VersionInfoGroupBox'#22
+  +'AnchorSideLeft.Control'#7#24'LanguageSettingsGroupBox'#21'AnchorSideTop.Con'
+  +'trol'#7#22'UseVersionInfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
+  +'AnchorSideRight.Control'#7#24'LanguageSettingsGroupBox'#20'AnchorSideRight.'
+  ,'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2#25#5'Width'#3#181#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'C'
+  +'aption'#6#17'Version Numbering'#8'TabOrder'#2#0#0#6'TLabel'#12'VersionLabel'
+  +#4'Left'#2#6#6'Height'#2#14#3'Top'#2#2#5'Width'#2'('#7'Caption'#6#8'Version:'
+  +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#18'MajorRevisionLabel'
+  +#22'AnchorSideLeft.Control'#7#15'VersionSpinEdit'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#4'Left'#2'^'#6'Height'#2#14#3'Top'#2#4#5'Width'#2'K'#18'BorderSp'
+  +'acing.Left'#2#10#7'Caption'#6#15'Major Revision:'#5'Color'#7#6'clNone'#11'P'
+  +'arentColor'#8#0#0#6'TLabel'#18'MinorRevisionLabel'#22'AnchorSideLeft.Contro'
+  +'l'#7#21'MajorRevisionSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#3#217#0#6'Height'#2#14#3'Top'#2#5#5'Width'#2'J'#18'BorderSpacing.Left'#2
+  +#10#7'Caption'#6#15'Minor Revision:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
+  +#0#6'TLabel'#10'BuildLabel'#22'AnchorSideLeft.Control'#7#21'MinorRevisionSpi'
+  +'nEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'O'#1#6'Height'#2#14
+  +#3'Top'#2#5#5'Width'#2#27#18'BorderSpacing.Left'#2#6#7'Caption'#6#6'Build:'#5
+  +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#9'BuildEdit'#22'AnchorSid'
+  +'eLeft.Control'#7#10'BuildLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#3'p'#1#6'Height'#2#20#3'Top'#2#2#5'Width'#2' '#18'BorderSpacing.Left'#2
+  +#6#8'TabOrder'#2#0#4'Text'#6#1'0'#0#0#9'TSpinEdit'#15'VersionSpinEdit'#22'An'
+  +'chorSideLeft.Control'#7#12'VersionLabel'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2'4'#6'Height'#2#20#3'Top'#2#1#5'Width'#2' '#18'BorderSpacing.'
+  +'Left'#2#6#8'TabOrder'#2#1#0#0#9'TSpinEdit'#21'MajorRevisionSpinEdit'#22'Anc'
+  +'horSideLeft.Control'#7#18'MajorRevisionLabel'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#4'Left'#3#175#0#6'Height'#2#20#5'Width'#2' '#18'BorderSpacing.Lef'
+  +'t'#2#6#8'TabOrder'#2#2#0#0#9'TSpinEdit'#21'MinorRevisionSpinEdit'#22'Anchor'
+  +'SideLeft.Control'#7#18'MinorRevisionLabel'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#4'Left'#3')'#1#6'Height'#2#20#3'Top'#2#2#5'Width'#2' '#18'BorderSpac'
+  +'ing.Left'#2#6#8'TabOrder'#2#3#0#0#9'TCheckBox"AutomaticallyIncreaseBuildChe'
+  +'ckBox'#4'Left'#2#6#6'Height'#2#13#3'Top'#2#28#5'Width'#3#151#0#7'Caption'#6
+  +#28'Automatically increase Build'#7'Enabled'#8#8'TabOrder'#2#4#0#0#0#9'TChec'
+  +'kBox'#22'UseVersionInfoCheckBox'#4'Left'#2#12#6'Height'#2#13#3'Top'#2#6#5'W'
+  +'idth'#3#180#0#7'Caption'#6'"Include Version Info in executable'#8'OnChange'
+  +#7#28'UseVersionInfoCheckBoxChange'#8'TabOrder'#2#1#0#0#9'TGroupBox'#24'Lang'
+  +'uageSettingsGroupBox'#22'AnchorSideLeft.Control'#7#17'OtherInfoGroupBox'#21
+  +'AnchorSideTop.Control'#7#19'VersionInfoGroupBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'Q'#3'Top'#2'h'#5'Width'
+  +#3#181#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'
+  +#2#6#7'Caption'#6#16'Language Options'#8'TabOrder'#2#2#0#6'TLabel'#22'Langua'
+  +'geSelectionLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'b'#7'Cap'
+  +'tion'#6#19'Language Selection:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6
+  +'TLabel'#17'CharacterSetLabel'#4'Left'#3#12#1#6'Height'#2#14#3'Top'#2#6#5'Wi'
+  +'dth'#2'H'#7'Caption'#6#14'Character Set:'#5'Color'#7#6'clNone'#11'ParentCol'
+  +'or'#8#0#0#9'TComboBox'#25'LanguageSelectionComboBox'#21'AnchorSideTop.Contr'
+  +'ol'#7#22'LanguageSelectionLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#2#6#6'Height'#2#21#3'Top'#2#22#5'Width'#3#248#0#16'AutoCompleteText'#11
+  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#17'BorderSpacing.Top'
+  +#2#2#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#12'U.S. English'#0#0#9'TComb'
+  +'oBox'#20'CharacterSetComboBox'#21'AnchorSideTop.Control'#7#25'LanguageSelec'
+  +'tionComboBox'#4'Left'#3#12#1#6'Height'#2#21#3'Top'#2#22#5'Width'#2'x'#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEn'
+  +'dOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#1
+  +#4'Text'#6#12'Multilingual'#0#0#0#9'TGroupBox'#17'OtherInfoGroupBox'#21'Anch'
+  +'orSideTop.Control'#7#24'LanguageSettingsGroupBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'v'#3'Top'#3#191#0#5'Width'#3#181#1#5'Align'#7#8'alBottom'#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'O'
+  +'ther Info'#8'TabOrder'#2#3#0#6'TLabel'#16'DescriptionLabel'#21'AnchorSideTo'
+  +'p.Control'#7#15'DescriptionEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Le'
+  +'ft'#2#6#6'Height'#2#14#3'Top'#2#2#5'Width'#2':'#7'Caption'#6#12'Description'
+  +':'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'CopyrightLabel'
+  +#21'AnchorSideTop.Control'#7#13'CopyrightEdit'#18'AnchorSideTop.Side'#7#9'as'
+  +'rCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#29#5'Width'#2'4'#7'Caption'#6
+  +#10'Copyright:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#15'Descr'
+  ,'iptionEdit'#22'AnchorSideLeft.Control'#7#16'DescriptionLabel'#19'AnchorSide'
+  +'Left.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBo'
+  +'x'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#21#3'To'
+  +'p'#2#255#5'Width'#3'e'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
+  +'orderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#0#0#5'TE'
+  +'dit'#13'CopyrightEdit'#22'AnchorSideLeft.Control'#7#14'CopyrightLabel'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#15'Descripti'
+  +'onEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#17'OtherInfoGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'@'#6
+  +'Height'#2#21#3'Top'#2#26#5'Width'#3'k'#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#8'TabOrder'#2#1#0#0#7'TButton'#20'AdditionalInfoButton'#21
   +'AnchorSideTop.Control'#7#13'CopyrightEdit'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#3';'#1#6'Height'#2'!'#3'Top'#2'5'#5'Width'#2'_'#0#0#0#0#0#7'T'
-  +'Button'#12'CancelButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
-  +#9#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'C'
-  +'onstraints.MinWidth'#2'K'#11'ModalResult'#2#2#8'TabOrder'#2#1#4'Left'#3's'#1
-  +#6'Height'#2'!'#3'Top'#3'S'#1#5'Width'#2'K'#0#0#7'TButton'#8'OKButton'#7'Anc'
-  +'hors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#10
+  +'ttom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'OtherInfoGroupBox'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'L'#1#6'Height'#2#25#3'To'
+  +'p'#2'E'#5'Width'#2'_'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
   +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
-  +#2'OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#11'ModalResult'#2#1#8'TabO'
-  +'rder'#2#2#23'AnchorSideRight.Control'#7#12'CancelButton'#4'Left'#3#24#1#6'H'
-  +'eight'#2'!'#3'Top'#3'S'#1#5'Width'#2'K'#0#0#22'TSelectDirectoryDialog'#21'S'
-  +'electDirectoryDialog'#5'Title'#6#16'Select Directory'#11'FilterIndex'#2#0#5
-  +'Title'#6#16'Select Directory'#4'left'#3'X'#1#3'top'#2#8#0#0#0
+  +#15'Additional Info'#7'OnClick'#7#25'AdditionalInfoButtonClick'#8'TabOrder'#2
+  +#2#0#0#0#0#0#7'TButton'#12'CancelButton'#4'Left'#3's'#1#6'Height'#2#25#3'Top'
+  +#3'['#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25
+  +'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constr'
+  +'aints.MinWidth'#2'K'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#8'O'
+  +'KButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#4'Left'#3#24#1#6'He'
+  +'ight'#2#25#3'Top'#3'['#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'
+  +#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#10#20'BorderSpacing.Around'#2#6#25
+  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2'OK'#20'Constraints.MinWidth'#2
+  +'K'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#2#0#0#22'TSelectDirectory'
+  +'Dialog'#21'SelectDirectoryDialog'#5'Title'#6#16'Select Directory'#11'Filter'
+  +'Index'#2#0#4'left'#3'X'#1#3'top'#2#8#0#0#0
 ]);
diff --git a/ide/projectopts.pp b/ide/projectopts.pp
index f6e593ed58..3617a60708 100644
--- a/ide/projectopts.pp
+++ b/ide/projectopts.pp
@@ -102,27 +102,27 @@ type
     // VersionInfo
     UseVersionInfoCheckBox: TCheckBox;
     VersionInfoGroupBox: TGroupBox;
-      VersionLabel: TLabel;
-      MajorRevisionLabel: TLabel;
-      MinorRevisionLabel: TLabel;
-      BuildLabel: TLabel;
-      VersionSpinEdit: TSpinEdit;
-      MajorRevisionSpinEdit: TSpinEdit;
-      MinorRevisionSpinEdit: TSpinEdit;
-      BuildEdit: TEdit;
-      AutomaticallyIncreaseBuildCheckBox: TCheckBox;
+    VersionLabel: TLabel;
+    MajorRevisionLabel: TLabel;
+    MinorRevisionLabel: TLabel;
+    BuildLabel: TLabel;
+    VersionSpinEdit: TSpinEdit;
+    MajorRevisionSpinEdit: TSpinEdit;
+    MinorRevisionSpinEdit: TSpinEdit;
+    BuildEdit: TEdit;
+    AutomaticallyIncreaseBuildCheckBox: TCheckBox;
     LanguageSettingsGroupBox: TGroupBox;
-      LanguageSelectionLabel: TLabel;
-      CharacterSetLabel: TLabel;
-      LanguageSelectionComboBox: TComboBox;
-      CharacterSetComboBox: TComboBox;
+    LanguageSelectionLabel: TLabel;
+    CharacterSetLabel: TLabel;
+    LanguageSelectionComboBox: TComboBox;
+    CharacterSetComboBox: TComboBox;
     OtherInfoGroupBox: TGroupBox;
-      AdditionalInfoButton: TButton;
-      DescriptionEdit: TEdit;
-      CopyrightEdit: TEdit;
-      DescriptionLabel: TLabel;
-      CopyrightLabel: TLabel;
-      AdditionalInfoForm: TVersionInfoAdditinalInfoForm;
+    AdditionalInfoButton: TButton;
+    DescriptionEdit: TEdit;
+    CopyrightEdit: TEdit;
+    DescriptionLabel: TLabel;
+    CopyrightLabel: TLabel;
+    AdditionalInfoForm: TVersionInfoAdditinalInfoForm;
 
     // buttons at bottom
     OKButton: TButton;
@@ -135,7 +135,6 @@ type
     procedure LazDocDeletePathButtonClick(Sender: TObject);
     procedure ProjectOptionsClose(Sender: TObject;
                                   var CloseAction: TCloseAction);
-    procedure ProjectOptionsResize(Sender: TObject);
     procedure FormsAddToAutoCreatedFormsBtnClick(Sender: TObject);
     procedure FormsRemoveFromAutoCreatedFormsBtnClick(Sender: TObject);
     procedure FormsMoveAutoCreatedFormUpBtnClick(Sender: TObject);
@@ -150,6 +149,7 @@ type
     procedure SetupLazDocPage(PageIndex: Integer);
     procedure SetupSavePage(PageIndex: Integer);
     procedure SetupVersionInfoPage(PageIndex: Integer);
+    procedure EnableVersionInfo(UseVersionInfo: boolean);
     procedure FillAutoCreateFormsListbox;
     procedure FillAvailFormsListBox;
     function IndexOfAutoCreateForm(FormName: String): Integer;
@@ -229,8 +229,6 @@ begin
   SetupSavePage(4);
   SetupVersionInfoPage(5);
 
-  ProjectOptionsResize(TheOwner);
-
   IDEDialogLayoutList.ApplyLayout(Self, 430, 375);
 end;
 
@@ -297,6 +295,33 @@ begin
   NoteBook.Page[PageIndex].Caption := VersionInfoTitle;
 end;
 
+procedure TProjectOptionsDialog.EnableVersionInfo(UseVersionInfo: boolean);
+begin
+  VersionInfoGroupBox.Enabled := UseVersionInfo;
+  VersionLabel.Enabled := UseVersionInfo;
+  MajorRevisionLabel.Enabled := UseVersionInfo;
+  MinorRevisionLabel.Enabled := UseVersionInfo;
+  BuildLabel.Enabled := UseVersionInfo;
+  VersionSpinEdit.Enabled := UseVersionInfo;
+  MajorRevisionSpinEdit.Enabled := UseVersionInfo;
+  MinorRevisionSpinEdit.Enabled := UseVersionInfo;
+  BuildEdit.Enabled := UseVersionInfo;
+  AutomaticallyIncreaseBuildCheckBox.Enabled := UseVersionInfo;
+
+  LanguageSettingsGroupBox.Enabled := UseVersionInfo;
+  LanguageSelectionLabel.Enabled := UseVersionInfo;
+  CharacterSetLabel.Enabled := UseVersionInfo;
+  LanguageSelectionComboBox.Enabled := UseVersionInfo;
+  CharacterSetComboBox.Enabled := UseVersionInfo;
+
+  OtherInfoGroupBox.Enabled := UseVersionInfo;
+  DescriptionLabel.Enabled := UseVersionInfo;
+  CopyrightLabel.Enabled := UseVersionInfo;
+  DescriptionEdit.Enabled := UseVersionInfo;
+  CopyrightEdit.Enabled := UseVersionInfo;
+  AdditionalInfoButton.Enabled := UseVersionInfo;
+end;
+
 procedure TProjectOptionsDialog.SetProject(AProject: TProject);
 begin
   FProject := AProject;
@@ -337,34 +362,9 @@ begin
   MajorRevisionSpinEdit.Value := Project.VersionInfo.MajorRevNr;
   MinorRevisionSpinEdit.Value := Project.VersionInfo.MinorRevNr;
   BuildEdit.Text := IntToStr(Project.VersionInfo.BuildNr);
-  if Project.VersionInfo.UseVersionInfo then
-     begin
-        UseVersionInfoCheckBox.Checked := true;
+  
+  EnableVersionInfo(Project.VersionInfo.UseVersionInfo);
 
-        VersionInfoGroupBox.Enabled := true;
-        VersionLabel.Enabled := true;
-        MajorRevisionLabel.Enabled := true;
-        MinorRevisionLabel.Enabled := true;
-        BuildLabel.Enabled := true;
-        VersionSpinEdit.Enabled := true;
-        MajorRevisionSpinEdit.Enabled := true;
-        MinorRevisionSpinEdit.Enabled := true;
-        BuildEdit.Enabled := true;
-        AutomaticallyIncreaseBuildCheckBox.Enabled := true;
-        
-        LanguageSettingsGroupBox.Enabled := true;
-        LanguageSelectionLabel.Enabled := true;
-        CharacterSetLabel.Enabled := true;
-        LanguageSelectionComboBox.Enabled := true;
-        CharacterSetComboBox.Enabled := true;
-        
-        OtherInfoGroupBox.Enabled := true;
-        DescriptionLabel.Enabled := true;
-        CopyrightLabel.Enabled := true;
-        DescriptionEdit.Enabled := true;
-        CopyrightEdit.Enabled := true;
-        AdditionalInfoButton.Enabled := true;
-     end;
   if Project.VersionInfo.AutoIncrementBuild then
     AutomaticallyIncreaseBuildCheckBox.Checked := true;
   LanguageSelectionComboBox.Items.Assign(MSLanguages);
@@ -702,68 +702,7 @@ end;
 
 procedure TProjectOptionsDialog.UseVersionInfoCheckBoxChange(Sender: TObject);
 begin
-  if UseVersionInfoCheckBox.Checked then
-     begin
-        { checkbox is checked }
-        UseVersionInfoCheckBox.Checked := true;
-
-        VersionInfoGroupBox.Enabled := true;
-        VersionLabel.Enabled := true;
-        MajorRevisionLabel.Enabled := true;
-        MinorRevisionLabel.Enabled := true;
-        BuildLabel.Enabled := true;
-        VersionSpinEdit.Enabled := true;
-        MajorRevisionSpinEdit.Enabled := true;
-        MinorRevisionSpinEdit.Enabled := true;
-        BuildEdit.Enabled := true;
-        AutomaticallyIncreaseBuildCheckBox.Enabled := true;
-
-        LanguageSettingsGroupBox.Enabled := true;
-        LanguageSelectionLabel.Enabled := true;
-        CharacterSetLabel.Enabled := true;
-        LanguageSelectionComboBox.Enabled := true;
-        CharacterSetComboBox.Enabled := true;
-
-        OtherInfoGroupBox.Enabled := true;
-        DescriptionLabel.Enabled := true;
-        CopyrightLabel.Enabled := true;
-        DescriptionEdit.Enabled := true;
-        CopyrightEdit.Enabled := true;
-        AdditionalInfoButton.Enabled := true;
-     end
-  else
-     begin
-        { checkbox in unchecked }
-        UseVersionInfoCheckBox.Checked := false;
-
-        VersionInfoGroupBox.Enabled := false;
-        VersionLabel.Enabled := false;
-        MajorRevisionLabel.Enabled := false;
-        MinorRevisionLabel.Enabled := false;
-        BuildLabel.Enabled := false;
-        VersionSpinEdit.Enabled := false;
-        MajorRevisionSpinEdit.Enabled := false;
-        MinorRevisionSpinEdit.Enabled := false;
-        BuildEdit.Enabled := false;
-        AutomaticallyIncreaseBuildCheckBox.Enabled := false;
-
-        LanguageSettingsGroupBox.Enabled := false;
-        LanguageSelectionLabel.Enabled := false;
-        CharacterSetLabel.Enabled := false;
-        LanguageSelectionComboBox.Enabled := false;
-        CharacterSetComboBox.Enabled := false;
-
-        OtherInfoGroupBox.Enabled := false;
-        DescriptionLabel.Enabled := false;
-        CopyrightLabel.Enabled := false;
-        DescriptionEdit.Enabled := false;
-        CopyrightEdit.Enabled := false;
-        AdditionalInfoButton.Enabled := false;
-     end;
-end;
-
-procedure TProjectOptionsDialog.ProjectOptionsResize(Sender: TObject);
-begin
+  EnableVersionInfo(UseVersionInfoCheckBox.Checked);
 end;
 
 procedure TProjectOptionsDialog.SelectOnlyThisAutoCreateForm(Index: Integer);
diff --git a/ide/revision.inc b/ide/revision.inc
index 35ff3734a9..81a09d9e46 100644
--- a/ide/revision.inc
+++ b/ide/revision.inc
@@ -1,2 +1,2 @@
 // Created by Svn2RevisionInc
-const RevisionStr = '10208:10209M';
+const RevisionStr = '10227';