IDE: improved 'Clean and rebuild' dialog localization

git-svn-id: trunk@31036 -

ide/buildprojectdlg.lfm

@@ -14,11 +14,12 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
   LCLVersion = '0.9.31'
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 42
-    Top = 444
+    Height = 34
+    Top = 452
     Width = 525
     OKButton.Name = 'OKButton'
     OKButton.Caption = '&OK'
+    OKButton.OnClick = ButtonPanel1OKButtonClick
     HelpButton.Name = 'HelpButton'
     HelpButton.Caption = '&Help'
     CloseButton.Name = 'CloseButton'
@@ -33,9 +34,9 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideTop.Control = ProjOutMaskComboBox
     AnchorSideTop.Side = asrCenter
     Left = 10
-    Height = 22
+    Height = 17
     Top = 12
-    Width = 148
+    Width = 102
     BorderSpacing.Left = 10
     Caption = 'ProjOutCheckBox'
     Checked = True
@@ -48,9 +49,9 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideTop.Control = ProjSrcMaskComboBox
     AnchorSideTop.Side = asrCenter
     Left = 10
-    Height = 22
-    Top = 45
-    Width = 144
+    Height = 17
+    Top = 39
+    Width = 99
     Caption = 'ProjSrcCheckBox'
     Checked = True
     OnChange = ProjSrcCheckBoxChange
@@ -62,9 +63,9 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideTop.Control = PkgOutMaskComboBox
     AnchorSideTop.Side = asrCenter
     Left = 10
-    Height = 22
-    Top = 78
-    Width = 145
+    Height = 17
+    Top = 66
+    Width = 100
     Caption = 'PkgOutCheckBox'
     Checked = True
     OnChange = PkgOutCheckBoxChange
@@ -76,9 +77,9 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideTop.Control = PkgSrcMaskComboBox
     AnchorSideTop.Side = asrCenter
     Left = 10
-    Height = 22
-    Top = 111
-    Width = 141
+    Height = 17
+    Top = 93
+    Width = 97
     Caption = 'PkgSrcCheckBox'
     Checked = True
     OnChange = PkgSrcCheckBoxChange
@@ -90,13 +91,13 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Control = ButtonPanel1
     AnchorSideRight.Side = asrBottom
     Left = 241
-    Height = 27
+    Height = 21
     Top = 10
     Width = 280
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 10
     BorderSpacing.Right = 10
-    ItemHeight = 0
+    ItemHeight = 13
     OnChange = ProjOutMaskComboBoxChange
     TabOrder = 9
     Text = 'ProjOutMaskComboBox'
@@ -108,12 +109,12 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Control = ProjOutMaskComboBox
     AnchorSideRight.Side = asrBottom
     Left = 241
-    Height = 27
-    Top = 43
+    Height = 21
+    Top = 37
     Width = 280
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
-    ItemHeight = 0
+    ItemHeight = 13
     OnChange = ProjOutMaskComboBoxChange
     TabOrder = 5
     Text = 'ProjSrcMaskComboBox'
@@ -125,12 +126,12 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Control = ProjOutMaskComboBox
     AnchorSideRight.Side = asrBottom
     Left = 241
-    Height = 27
-    Top = 76
+    Height = 21
+    Top = 64
     Width = 280
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
-    ItemHeight = 0
+    ItemHeight = 13
     OnChange = ProjOutMaskComboBoxChange
     TabOrder = 6
     Text = 'PkgOutMaskComboBox'
@@ -142,12 +143,12 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Control = ProjOutMaskComboBox
     AnchorSideRight.Side = asrBottom
     Left = 241
-    Height = 27
-    Top = 109
+    Height = 21
+    Top = 91
     Width = 280
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
-    ItemHeight = 0
+    ItemHeight = 13
     OnChange = ProjOutMaskComboBoxChange
     TabOrder = 7
     Text = 'PkgSrcMaskComboBox'
@@ -160,23 +161,23 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = DeleteButton
     Left = 6
-    Height = 259
-    Top = 146
+    Height = 295
+    Top = 122
     Width = 525
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Top = 4
     BorderSpacing.Around = 6
     Caption = 'PreviewGroupBox'
-    ClientHeight = 238
-    ClientWidth = 517
+    ClientHeight = 277
+    ClientWidth = 521
     TabOrder = 8
     object FilesTreeView: TTreeView
       Left = 0
-      Height = 238
+      Height = 277
       Top = 0
-      Width = 517
+      Width = 521
       Align = alClient
-      DefaultItemHeight = 19
+      DefaultItemHeight = 15
       ReadOnly = True
       TabOrder = 0
       OnMouseDown = FilesTreeViewMouseDown
@@ -187,10 +188,10 @@ object CleanBuildProjectDialog: TCleanBuildProjectDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel1
-    Left = 422
-    Height = 27
-    Top = 411
-    Width = 109
+    Left = 442
+    Height = 23
+    Top = 423
+    Width = 89
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6

ide/buildprojectdlg.pas

@@ -129,13 +129,15 @@ begin
   PreviewGroupBox.Caption:=lisTheseFilesWillBeDeleted;
 
   ButtonPanel1.OKButton.Caption:=lisCleanUpAndBuild;
+  ButtonPanel1.HelpButton.Caption:=lisMenuHelp;
+  ButtonPanel1.CancelButton.Caption:=dlgCancel;
+
   DeleteButton.Caption:=dlgMouseOptBtnDel;
 
   FilesTreeView.Images:=IDEImages.Images_16;
   ImageIndexDirectory := IDEImages.LoadImage(16, 'pkg_files');
   ImageIndexFile := IDEImages.LoadImage(16, 'laz_delete');
 
-  ButtonPanel1.OKButton.OnClick:=@ButtonPanel1OKButtonClick;
   ButtonPanel1.OKButton.ModalResult:=mrNone;
 end;
 
@@ -288,7 +290,7 @@ procedure TCleanBuildProjectDialog.UpdateFilesTreeView(Immediately: boolean);
       // has children, but no grand children => is a directory
       inc(Result,TVNode.Count);
     if Result>0 then
-      TVNode.Text:=TVNode.Text+' ('+IntToStr(Result)+' files)';
+      TVNode.Text:=Format(lisCBPFiles, [TVNode.Text, IntToStr(Result)]);
   end;
 
 var
@@ -320,14 +322,14 @@ end;
 
 procedure TCleanBuildProjectDialog.AddProjOutDirectory;
 begin
-  AddDirectory('Project output directory',
+  AddDirectory(lisProjectOutputDirectory,
     FProject.CompilerOptions.GetUnitOutputDirectory(false),
     ProjOutMaskComboBox.Text);
 end;
 
 procedure TCleanBuildProjectDialog.AddProjSrcDirectories;
 begin
-  AddDirectories('Project output directory',
+  AddDirectories(lisProjectOutputDirectory,
     FProject.SourceDirectories.CreateSearchPathFromAllFiles,
     ProjSrcMaskComboBox.Text);
 end;
@@ -520,9 +522,9 @@ begin
       Node:=Files.Tree.FindSuccessor(Node);
     end;
     if SourceFiles.Count>0 then begin
-      Result:=IDEMessageDialog('Warning',
-        'Really delete '+IntToStr(SourceFiles.Count)+' source files'#13#13
-        +copy(SourceFiles.Text,1,1000),mtWarning,[mbYes,mbNo]);
+      Result:=IDEMessageDialog(lisCCOWarningCaption,
+        Format(lisCBPReallyDeleteSourceFiles, [IntToStr(SourceFiles.Count), #13
+          +#13, copy(SourceFiles.Text, 1, 1000)]), mtWarning, [mbYes, mbNo]);
       if Result<>mrYes then exit(mrCancel);
     end;
 

ide/lazarusidestrconsts.pas

@@ -5329,6 +5329,8 @@ resourcestring
   lisTheseFilesWillBeDeleted = 'These files will be deleted:';
   lisCleanUpAndBuild = 'Clean up and build';
   lisBuildProject = 'Build project';
+  lisCBPFiles = '%s (%s files)';
+  lisCBPReallyDeleteSourceFiles = 'Really delete %s source files%s%s';
 
 implementation