diff --git a/components/exctrls/examples/QuestionDlgEx/main.lfm b/components/exctrls/examples/QuestionDlgEx/main.lfm
index 08845524f..12c4e1cea 100644
--- a/components/exctrls/examples/QuestionDlgEx/main.lfm
+++ b/components/exctrls/examples/QuestionDlgEx/main.lfm
@@ -8,7 +8,7 @@ object DemoForm: TDemoForm
   ClientHeight = 563
   ClientWidth = 686
   OnCreate = FormCreate
-  LCLVersion = '2.0.12.0'
+  LCLVersion = '2.3.0.0'
   object rgButtons: TRadioGroup
     AnchorSideLeft.Control = rgBtnAlignment
     AnchorSideTop.Control = rgMessage
@@ -16,7 +16,7 @@ object DemoForm: TDemoForm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = rgMessage
     AnchorSideBottom.Side = asrBottom
-    Left = 190
+    Left = 188
     Height = 115
     Top = 280
     Width = 112
@@ -50,7 +50,7 @@ object DemoForm: TDemoForm
     Left = 24
     Height = 115
     Top = 280
-    Width = 134
+    Width = 132
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
     AutoSize = True
@@ -64,7 +64,7 @@ object DemoForm: TDemoForm
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 95
-    ClientWidth = 130
+    ClientWidth = 128
     ItemIndex = 2
     Items.Strings = (
       'very short'
@@ -82,7 +82,7 @@ object DemoForm: TDemoForm
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = rgTextAlignment
     AnchorSideBottom.Side = asrBottom
-    Left = 334
+    Left = 332
     Height = 77
     Top = 179
     Width = 322
@@ -97,7 +97,7 @@ object DemoForm: TDemoForm
       Left = 22
       Height = 19
       Top = 0
-      Width = 57
+      Width = 55
       Caption = 'default'
       Checked = True
       OnChange = cbDefaultFontChange
@@ -137,7 +137,7 @@ object DemoForm: TDemoForm
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = rgTextAlignment
     AnchorSideBottom.Side = asrBottom
-    Left = 190
+    Left = 188
     Height = 77
     Top = 179
     Width = 112
@@ -172,7 +172,7 @@ object DemoForm: TDemoForm
     Left = 24
     Height = 77
     Top = 179
-    Width = 134
+    Width = 132
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
     AutoSize = True
@@ -185,7 +185,7 @@ object DemoForm: TDemoForm
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 57
-    ClientWidth = 130
+    ClientWidth = 128
     ItemIndex = 0
     Items.Strings = (
       'left'
@@ -202,15 +202,15 @@ object DemoForm: TDemoForm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = rgGlyphShowMode
     AnchorSideBottom.Side = asrBottom
-    Left = 490
+    Left = 486
     Height = 115
     Top = 280
-    Width = 166
+    Width = 168
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 24
     Caption = 'Dialog size limits'
     ClientHeight = 95
-    ClientWidth = 162
+    ClientWidth = 164
     TabOrder = 5
     object Label1: TLabel
       AnchorSideLeft.Control = gbMaxWidth
@@ -222,13 +222,12 @@ object DemoForm: TDemoForm
       Width = 56
       BorderSpacing.Left = 16
       Caption = 'Max width'
-      ParentColor = False
     end
     object seMaxWidth: TSpinEdit
       AnchorSideTop.Control = gbMaxWidth
       AnchorSideRight.Control = gbMaxWidth
       AnchorSideRight.Side = asrBottom
-      Left = 88
+      Left = 90
       Height = 23
       Top = 12
       Width = 58
@@ -236,8 +235,9 @@ object DemoForm: TDemoForm
       Anchors = [akTop, akRight]
       BorderSpacing.Top = 12
       BorderSpacing.Right = 16
+      MaxValue = 10000
       TabOrder = 0
-      Value = 100
+      Value = 500
     end
     object Label2: TLabel
       AnchorSideTop.Control = seMinWidth
@@ -247,14 +247,13 @@ object DemoForm: TDemoForm
       Top = 55
       Width = 54
       Caption = 'Min width'
-      ParentColor = False
     end
     object seMinWidth: TSpinEdit
       AnchorSideTop.Control = seMaxWidth
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = gbMaxWidth
       AnchorSideRight.Side = asrBottom
-      Left = 88
+      Left = 90
       Height = 23
       Top = 51
       Width = 58
@@ -262,8 +261,9 @@ object DemoForm: TDemoForm
       Anchors = [akTop, akRight]
       BorderSpacing.Top = 16
       BorderSpacing.Right = 16
+      MaxValue = 10000
       TabOrder = 1
-      Value = 100
+      Value = 250
     end
   end
   object rgPosition: TRadioGroup
@@ -273,7 +273,7 @@ object DemoForm: TDemoForm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = rgMsgType
     AnchorSideBottom.Side = asrBottom
-    Left = 190
+    Left = 188
     Height = 115
     Top = 419
     Width = 466
@@ -331,7 +331,7 @@ object DemoForm: TDemoForm
     Left = 24
     Height = 115
     Top = 419
-    Width = 134
+    Width = 132
     AutoFill = True
     AutoSize = True
     BorderSpacing.Top = 24
@@ -345,7 +345,7 @@ object DemoForm: TDemoForm
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 95
-    ClientWidth = 130
+    ClientWidth = 128
     ItemIndex = 0
     Items.Strings = (
       'mtWarning'
@@ -362,10 +362,10 @@ object DemoForm: TDemoForm
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = rgMessage
     AnchorSideBottom.Side = asrBottom
-    Left = 334
+    Left = 332
     Height = 115
     Top = 280
-    Width = 132
+    Width = 130
     Anchors = [akTop, akLeft, akBottom]
     AutoFill = True
     AutoSize = True
@@ -379,7 +379,7 @@ object DemoForm: TDemoForm
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 95
-    ClientWidth = 128
+    ClientWidth = 126
     ItemIndex = 2
     Items.Strings = (
       'gsmAlways   '
@@ -431,7 +431,6 @@ object DemoForm: TDemoForm
       Top = 57
       Width = 45
       Caption = 'lblResult'
-      ParentColor = False
     end
   end
   object gbTestStd: TGroupBox
@@ -439,7 +438,7 @@ object DemoForm: TDemoForm
     AnchorSideTop.Control = gbTest
     AnchorSideRight.Control = gbFont
     AnchorSideRight.Side = asrBottom
-    Left = 334
+    Left = 332
     Height = 104
     Top = 24
     Width = 322
@@ -479,7 +478,6 @@ object DemoForm: TDemoForm
       Top = 57
       Width = 62
       Caption = 'lblResultStd'
-      ParentColor = False
     end
     object btnMessageDlg: TButton
       AnchorSideLeft.Control = btnQuestionDlg
diff --git a/components/exctrls/examples/QuestionDlgEx/main.pas b/components/exctrls/examples/QuestionDlgEx/main.pas
index 3c5fcab35..1810b667d 100644
--- a/components/exctrls/examples/QuestionDlgEx/main.pas
+++ b/components/exctrls/examples/QuestionDlgEx/main.pas
@@ -70,13 +70,13 @@ uses
   {$IF FPC_FullVersion >= 30202}System.{$IFEND}UITypes;
 
 const
-  DLG_TITLE = 'Meine Anfrage';
+  DLG_TITLE = 'This is the caption of the dialog';
   MSG_TEXT: array[0..4] of String = (
-    'abc',
-    'Kurzer Text.',
-    'Das ist ein einigermaßen langer Text.',
-    'Dies ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Text',
-    'Dies ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Text'
+    'msg',
+    'Short text',
+    'Text text text text text text text.',
+    'This is a very very very very very very very very very very very very very very long text.',
+    'This is even longer, another very very very very very very very very very very very very very very very very very very very very very very long text.'
   );
     
   
@@ -129,28 +129,12 @@ begin
     Y := MaxInt;
   end;
   
-//  if cbDefaultFont.Checked then
-    case rgButtons.ItemIndex of
-      0: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', 'IsCancel'], 'HTML/index.html', X, Y);
-      1: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbNo, 'Nein', 'IsDefault', mbCancel, 'Abbrechen', 'IsCancel'], 'HTML/index.html', X, Y);
-      2: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch', 'IsCancel'], 'HTML/index.html', X, Y);
-      3: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch', 'IsCancel', mbClose, 'Schließen', mbHelp, 'Hilfe'], 'HTML/index.html', X, Y);
-    end;
-    {
-  else begin
-    case rgButtons.ItemIndex of
-      0: F := CreateQuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja'], 0, X, Y);
-      1: F := CreateQuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbNo, 'Nein', 'IsDefault', mbCancel, 'Abbrechen'], 0, X, Y);
-      2: F := CreateQuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch'], 0, X, Y);
-      3: F := CreateQuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch', mbClose, 'Schließen', mbHelp, 'Hilfe'], 0, X, Y);
-      else exit;
-    end;
-    F.Font.Name := cbFontName.Text;
-    F.Font.Size := seFontSize.Value;
-    res := F.ShowModal;
-    F.Free;
+  case rgButtons.ItemIndex of
+    0: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', 'IsCancel'], 'HTML/index.html', X, Y);
+    1: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbNo, 'No sir', 'IsDefault', mbCancel, 'Changed my mind', 'IsCancel'], 'HTML/index.html', X, Y);
+    2: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbYesToAll, 'I fully agree', mbNo, 'No sir', 'IsDefault', mbNoToAll, 'I fully disagree', mbCancel, 'Changed my mind', 'IsCancel'], 'HTML/index.html', X, Y);
+    3: res := QuestionDlgEx(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbYesToAll, 'I fully agree', mbNo, 'No sir', 'IsDefault', mbNoToAll, 'I fully disagree', mbCancel, 'Changed my mind', 'IsCancel', mbClose, 'Close it', mbHelp, 'I need help'], 'HTML/index.html', X, Y);
   end;
-  }
   
   lblResult.Caption := GetModalResultStr(res);
 end;
@@ -189,10 +173,10 @@ begin
   msg := MSG_TEXT[rgMessage.ItemIndex];
   helpkwd := 'HTML/index.html';
   case rgButtons.ItemIndex of
-    0: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Ja'], helpkwd);
-    1: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbNo, 'Nein', 'IsDefault', mbCancel, 'Abbrechen'], helpkwd);
-    2: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch', 'IsCancel'], helpkwd);
-    3: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Ja', mbYesToAll, 'Ja zu allen', mbNo, 'Nein', 'IsDefault', mbNoToAll, 'Nein zu allen', mbCancel, 'Abbruch', 'IsCancel', mbClose, 'Schließen', mbHelp, 'Hilfe'], helpkwd);
+    0: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Yes sir'], helpkwd);
+    1: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbNo, 'No sir', 'IsDefault', mbCancel, 'Changed my mind'], helpkwd);
+    2: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbYesToAll, 'I fully agree', mbNo, 'No sir', 'IsDefault', mbNoToAll, 'I fully disagree', mbCancel, 'Changed my mind', 'IsCancel'], helpkwd);
+    3: res := QuestionDlg(DLG_TITLE, msg, mt, [mbYes, 'Yes sir', mbYesToAll, 'I fully agree', mbNo, 'No sir', 'IsDefault', mbNoToAll, 'I fully disagree', mbCancel, 'Changed my mind', 'IsCancel', mbClose, 'Schließen', mbHelp, 'Hilfe'], helpkwd);
   end;
   lblResultStd.Caption := GetModalResultStr(res);
 end;
@@ -260,27 +244,27 @@ begin
   
   btns := TDialogButtons.Create(TDialogButton);
   case rgButtons.ItemIndex of
-    0: AddBtn('Ja', mrYes);
+    0: AddBtn('Yes sir', mrYes);
     1: begin
-         AddBtn('Ja', mrYes);
-         AddBtn('Nein', mrNo, true);
-         AddBtn('Abbrechen', mrCancel);
+         AddBtn('Yes sir', mrYes);
+         AddBtn('No sir', mrNo, true);
+         AddBtn('Changed my mind', mrCancel);
        end;
     2: begin
-         AddBtn('Ja', mrYes);
-         AddBtn('Ja zu allen', mrYesToAll);
-         AddBtn('Nein', mrNo, true);
-         AddBtn('Nein zu allen', mrNoToAll);
-         AddBtn('Abbrechen', mrCancel);
+         AddBtn('Yes sir', mrYes);
+         AddBtn('I fully agree', mrYesToAll);
+         AddBtn('No sir', mrNo, true);
+         AddBtn('I fully disagree', mrNoToAll);
+         AddBtn('Changed my mind', mrCancel);
        end;  
     3: begin
-         AddBtn('Ja', mrYes);
-         AddBtn('Ja zu allen', mrYesToAll);
-         AddBtn('Nein', mrNo, true);
-         AddBtn('Nein zu allen', mrNoToAll);
-         AddBtn('Abbrechen', mrCancel);
-         AddBtn('Schließen', mrClose);
-         AddBtn('Hilfe', 100);
+         AddBtn('Yes sir', mrYes);
+         AddBtn('I fully agree', mrYesToAll);
+         AddBtn('No sir', mrNo, true);
+         AddBtn('I fully disagree', mrNoToAll);
+         AddBtn('Changed my mind', mrCancel);
+         AddBtn('Close it', mrClose);
+         AddBtn('Help me', 100);
        end;  
   end;