From d4baafc62da9676b6353995d628ed4494a6f6bbf Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 31 Jul 2012 11:10:19 +0000
Subject: [PATCH] IDE: setup dialog: fixed make label

git-svn-id: trunk@38096 -
---
 ide/initialsetupdlgs.pas    | 38 +++++++++++++++++++++----------------
 ide/lazarusidestrconsts.pas | 12 +++++++-----
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas
index 8e452a6d05..8bad45e26e 100644
--- a/ide/initialsetupdlgs.pas
+++ b/ide/initialsetupdlgs.pas
@@ -88,32 +88,32 @@ type
     CompilerComboBox: TComboBox;
     CompilerLabel: TLabel;
     CompilerMemo: TMemo;
-    FPCSrcDirBrowseButton: TButton;
-    MakeExeBrowseButton: TButton;
+    CompilerTabSheet: TTabSheet;
     DebuggerBrowseButton: TButton;
-    FPCSrcDirComboBox: TComboBox;
-    MakeExeComboBox: TComboBox;
     DebuggerComboBox: TComboBox;
-    FPCSrcDirLabel: TLabel;
-    MakeExeLabel: TLabel;
     DebuggerLabel: TLabel;
-    FPCSrcDirMemo: TMemo;
-    MakeExeMemo: TMemo;
     DebuggerMemo: TMemo;
+    DebuggerTabSheet: TTabSheet;
+    FPCSourcesTabSheet: TTabSheet;
+    FPCSrcDirBrowseButton: TButton;
+    FPCSrcDirComboBox: TComboBox;
+    FPCSrcDirLabel: TLabel;
+    FPCSrcDirMemo: TMemo;
     ImageList1: TImageList;
+    LazarusTabSheet: TTabSheet;
     LazDirBrowseButton: TButton;
-    LazDirLabel: TLabel;
     LazDirComboBox: TComboBox;
+    LazDirLabel: TLabel;
     LazDirMemo: TMemo;
+    MakeExeBrowseButton: TButton;
+    MakeExeComboBox: TComboBox;
+    MakeExeLabel: TLabel;
+    MakeExeMemo: TMemo;
+    MakeExeTabSheet: TTabSheet;
     PropertiesPageControl: TPageControl;
     PropertiesTreeView: TTreeView;
     Splitter1: TSplitter;
     StartIDEBitBtn: TBitBtn;
-    LazarusTabSheet: TTabSheet;
-    CompilerTabSheet: TTabSheet;
-    FPCSourcesTabSheet: TTabSheet;
-    MakeExeTabSheet: TTabSheet;
-    DebuggerTabSheet: TTabSheet;
     WelcomePaintBox: TPaintBox;
     procedure CompilerBrowseButtonClick(Sender: TObject);
     procedure CompilerComboBoxChange(Sender: TObject);
@@ -1288,6 +1288,8 @@ end;
 { TInitialSetupDialog }
 
 procedure TInitialSetupDialog.FormCreate(Sender: TObject);
+var
+  s: String;
 begin
   Caption:=Format(lisWelcomeToLazarusIDE, [GetLazarusVersionString]);
 
@@ -1330,8 +1332,12 @@ begin
     lisTheMakeExecutableTypicallyHasTheName, ['make'+GetExecutableExt('')]);
 
   DebuggerBrowseButton.Caption:=lisPathEditBrowse;
-  DebuggerLabel.Caption:=Format(
-    lisTheDebuggerExecutableTypicallyHasTheName, ['gdb'+GetExecutableExt('')]);
+  s:=Format(lisTheDebuggerExecutableTypicallyHasTheNamePleaseGive, [
+    'gdb'+GetExecutableExt]);
+  {$IFDEF Windows}
+  s+=' '+lisAUsefulSettingOnWindowsSystemsIsLazarusDirMingwBin;
+  {$ENDIF}
+  DebuggerLabel.Caption:=s;
 end;
 
 procedure TInitialSetupDialog.CompilerComboBoxChange(Sender: TObject);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 033e096bed..9c572b9b12 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -5451,11 +5451,13 @@ resourcestring
   lisTheFreePascalCompilerExecutableTypicallyHasTheName = 'The Free Pascal '
     +'compiler executable typically has the name "%s". You can also use the '
     +'target specific compiler like "%s". Please give the full file path.';
-  lisTheMakeExecutableTypicallyHasTheName = 'The make executable typically '
-    +'has the name "%s". Please give the full file path.';
-  lisTheDebuggerExecutableTypicallyHasTheName = 'The debugger executable '
-    +'typically has the name "%s". Pleae give the full file path. '
-    +'A useful setting on Windows systems is: $(LazarusDir)\mingw\bin\$(TargetCPU)-$(TargetOS)\gdb.exe';
+  lisTheMakeExecutableTypicallyHasTheName = 'The "make" executable typically '
+    +'has the name "%s". It is needed for building the IDE. Please give the full file path.';
+  lisTheDebuggerExecutableTypicallyHasTheNamePleaseGive = 'The debugger '
+    +'executable typically has the name "%s". Please give the full file path.';
+  lisAUsefulSettingOnWindowsSystemsIsLazarusDirMingwBin = 'A useful setting on'
+    +' Windows systems is: $(LazarusDir)\mingw\bin\$(TargetCPU)-$(TargetOS)\'
+    +'gdb.exe';
   lisFoundVersionExpected = 'Found version %s, expected %s';
   lisInvalidVersionIn = 'invalid version in %s';
   lisWrongVersionIn = 'wrong version in %s: %s';