diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 5073d26ec3..6d2087fcf4 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -964,6 +964,7 @@ resourcestring lisPEUnitnameAndFilenameDoNotMatchExampleUnit1PasAndUni = 'Unitname and ' +'Filename do not match.%sExample: unit1.pas and Unit1'; lisOk = '&OK'; + lisCancel = 'Cancel'; lisCMParameter = 'Parameter'; lisCTPleaseSelectAMacro = 'please select a macro'; lisA2PCreateNewFile = 'Create new file'; @@ -1157,8 +1158,8 @@ resourcestring lisRemove = 'remove'; lisKeep = 'keep'; lisConfirmNewPackageSetForTheIDE = 'Confirm new package set for the IDE'; - lisConfirmPackageNewPackage = 'New package'; - lisConfirmPackageOldPackage = 'Old package'; + lisConfirmPackageNewPackageSet = 'New package set'; + lisConfirmPackageOldPackageSet = 'Old package set'; lisConfirmPackageAction = 'Action'; lisSaveFileAs = 'Save file as'; lisOpenExistingFile = 'Open existing file'; diff --git a/packager/confirmpkglistdlg.pas b/packager/confirmpkglistdlg.pas index f9e90c23c1..ed7d6fc146 100644 --- a/packager/confirmpkglistdlg.pas +++ b/packager/confirmpkglistdlg.pas @@ -70,9 +70,9 @@ var begin with PackagesGrid do begin RowCount := AChangesReport.Count + 1; - Cells[0, 0] := 'Install package'; - Cells[1, 0] := 'State'; - Cells[2, 0] := lisConfirmPackageOldPackage; + Cells[0, 0] := lisConfirmPackageNewPackageSet; + Cells[1, 0] := lisConfirmPackageAction; + Cells[2, 0] := lisConfirmPackageOldPackageSet; d := RowCount * DefaultRowHeight + GridLineWidth - Height; end; // Auto-grow dialog up to 3/4 of the screen height. @@ -80,6 +80,7 @@ begin Height := Height + d; Caption := lisConfirmNewPackageSetForTheIDE; OkButton.Caption := lisContinue; + CancelButton.Caption := lisCancel; for i := 1 to AChangesReport.Count do begin s := AChangesReport[i - 1];