IDE: collect common resource strings in one place, remove duplicates

git-svn-id: trunk@35321 -
This commit is contained in:
juha 2012-02-12 13:04:36 +00:00
parent c82d1b544d
commit 4ef51619f5
69 changed files with 129 additions and 173 deletions

View File

@ -732,7 +732,7 @@ begin
ButtonPanel1.OKButton.Caption:=lisStartConversion;
ButtonPanel1.HelpButton.Caption:=lisMenuHelp;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
end;
procedure TConvertSettingsForm.FormDestroy(Sender: TObject);

View File

@ -388,7 +388,7 @@ begin
Caption:=lisReplacementFuncs;
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := dlgCancel;
ButtonPanel.CancelButton.Caption := lisCancel;
end;
procedure TReplaceFuncsForm.CategoryListBoxClickCheck(Sender: TObject);

View File

@ -287,7 +287,7 @@ begin
Caption:=lisReplacements;
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := dlgCancel;
ButtonPanel.CancelButton.Caption := lisCancel;
end;
procedure TReplaceForm.PopupMenu1Popup(Sender: TObject);

View File

@ -428,7 +428,7 @@ begin
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
end;
destructor TBreakPropertyDlg.Destroy;

View File

@ -73,8 +73,8 @@ constructor TIDEExceptionDlg.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
Caption := lisExceptionDialog;
btnBreak.Caption := lisBtnBreak;
btnContinue.Caption := lisBtnContinue;
btnBreak.Caption := lisBreak;
btnContinue.Caption := lisContinue;
cbIgnoreExceptionType.Caption := lisIgnoreExceptionType;
btnBreak.LoadGlyphFromLazarusResource('menu_pause');

View File

@ -86,11 +86,10 @@ begin
ButtonPanel1.HelpButton.Visible := False;
end;
ButtonPanel1.OKButton.Visible := frOk in AButtons;
ButtonPanel1.CancelButton.Visible := frStop in AButtons;
ButtonPanel1.OKButton.Caption := lisDebuggerFeedbackOk;
ButtonPanel1.OKButton.Caption := lisOk;
ButtonPanel1.CancelButton.Caption := lisDebuggerFeedbackStop;
case ShowModal of

View File

@ -83,8 +83,8 @@ end;
procedure TDebuggerSignalsOptions.Setup(ADialog: TAbstractOptionsEditorDialog);
begin
gbSignals.Caption := lisDebugOptionsFrmSignals;
lvSignals.Column[0].Caption := lisDebugOptionsFrmName;
lvSignals.Column[1].Caption := lisDebugOptionsFrmID;
lvSignals.Column[0].Caption := lisName;
lvSignals.Column[1].Caption := lisId;
lvSignals.Column[2].Caption := lisDebugOptionsFrmHandledBy;
lvSignals.Column[3].Caption := lisDebugOptionsFrmResume;
cmdSignalAdd.Caption := lisAdd;

View File

@ -124,8 +124,8 @@ begin
SnapshotNotification.OnCurrent := @LocalsChanged;
Caption:= lisLocals;
lvLocals.Columns[0].Caption:= lisLocalsDlgName;
lvLocals.Columns[1].Caption:= lisLocalsDlgValue;
lvLocals.Columns[0].Caption:= lisName;
lvLocals.Columns[1].Caption:= lisValue;
actInspect.Caption := lisInspect;
actWath.Caption := lisWatch;
actEvaluate.Caption := lisEvaluateModify;

View File

@ -120,8 +120,8 @@ begin
FRegistersNotification.AddReference;
FRegistersNotification.OnChange := @RegistersChanged;
Caption:= lisRegisters;
lvRegisters.Columns[0].Caption:= lisRegistersDlgName;
lvRegisters.Columns[1].Caption:= lisRegistersDlgValue;
lvRegisters.Columns[0].Caption:= lisName;
lvRegisters.Columns[1].Caption:= lisValue;
ActionList1.Images := IDEImages.Images_16;
ToolBar1.Images := IDEImages.Images_16;

View File

@ -240,8 +240,8 @@ constructor TThreadsDlg.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
Caption:= lisThreads;
lvThreads.Column[1].Caption := lisThreadsID;
lvThreads.Column[2].Caption := lisThreadsName;
lvThreads.Column[1].Caption := lisId;
lvThreads.Column[2].Caption := lisName;
lvThreads.Column[3].Caption := lisThreadsState;
lvThreads.Column[4].Caption := lisThreadsSrc;
lvThreads.Column[5].Caption := lisThreadsLine;

View File

@ -155,7 +155,7 @@ begin
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
end;
destructor TWatchPropertyDlg.destroy;

View File

@ -85,7 +85,7 @@ begin
Caption:=lisChooseName;
Label1.Caption:=lisChooseANameForTheNewComponent;
NameEdit.Hint:=lisTheComponentNameMustBeUniqueInAllComponentsOnTheFo;
OkButton.Caption:=dlgMouseOptBtnOk;
OkButton.Caption:=lisOk;
OkButton.Enabled:=false;
end;

View File

@ -440,7 +440,7 @@ begin
with CancelButton do begin
Name:='CancelButton';
SetBounds(120,100,80,25);
Caption:=dlgCancel;
Caption:=lisCancel;
Parent:=Self;
ModalResult:=mrCancel;
end;

View File

@ -160,7 +160,7 @@ begin
AddFirstBitBtn.Caption:=lisSAMOverrideFirstSelected;
AddAllBitBtn.Caption:=lisSAMOverrideAllSelected;
CancelBitBtn.Caption:=dlgCancel;
CancelBitBtn.Caption:=lisCancel;
SelectNoneButton.Caption:=lisSAMSelectNone;
SelectAllButton.Caption:=lisMenuSelectAll;

View File

@ -36,7 +36,7 @@ implementation
procedure TAddProfileForm.FormCreate(Sender:TObject);
begin
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
end;
end.

View File

@ -671,7 +671,7 @@ begin
CompileButton.Caption := lisLazBuildBuild;
CompileAdvancedButton.Caption := lisLazBuildBuildMany;
SaveSettingsButton.Caption := lisSaveSettings;
CancelButton.Caption := lisLazBuildCancel;
CancelButton.Caption := lisCancel;
HelpButton.Caption := lisMenuHelp;
DefinesLabel.Caption := lisLazBuildDefines;

View File

@ -519,12 +519,12 @@ begin
AddButton.Caption:=lisAdd;
RemoveButton.Caption:=lisLazBuildRemove;
EditButton.Caption:=lisLazBuildRename;
MoveUpButton.Caption:=lisExtToolMoveUp;
MoveDownButton.Caption:=lisExtToolMoveDown;
MoveUpButton.Caption:=lisUp;
MoveDownButton.Caption:=lisDown;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
fProfsToManage:=TBuildLazarusProfiles.Create;
end;

View File

@ -130,9 +130,9 @@ begin
ButtonPanel1.OKButton.Caption:=lisCleanUpAndBuild;
ButtonPanel1.HelpButton.Caption:=lisMenuHelp;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
DeleteButton.Caption:=dlgMouseOptBtnDel;
DeleteButton.Caption:=lisDelete;
FilesTreeView.Images:=IDEImages.Images_16;
ImageIndexDirectory := IDEImages.LoadImage(16, 'pkg_files');

View File

@ -788,7 +788,7 @@ begin
LFMGroupBox.Caption:=lisLFMFile;
RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
RemoveAllButton.LoadGlyphFromLazarusResource('laz_delete');
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
EditorOpts.GetHighlighterSettings(SynLFMSyn1);
EditorOpts.GetSynEditSettings(LFMSynEdit);
end;

View File

@ -130,7 +130,7 @@ begin
ButtonPanel.OKButton.Caption:=lisClDirClean;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
ButtonPanel.OKButton.OnClick := @OKButtonClick;
ButtonPanel.HelpButton.OnClick := @HelpButtonClick;

View File

@ -851,7 +851,7 @@ begin
with OkButton do begin
Name:='OkButton';
Parent:=Self;
Caption:=lisLazBuildOk;
Caption:=lisOk;
OnClick:=@OkButtonClick;
Left:=50;
Top:=Self.ClientHeight-Height-12;
@ -863,7 +863,7 @@ begin
with CancelButton do begin
Name:='CancelButton';
Parent:=Self;
Caption:=dlgCancel;
Caption:=lisCancel;
ModalResult:=mrCancel;
Width:=80;
Left:=Self.ClientWidth-50-Width;
@ -948,7 +948,7 @@ begin
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
FilenameGroupBox.Caption:=lisDebugOptionsFrmModule;
UseMacrosCheckBox.Caption:=lisEnableMacros;

View File

@ -1075,8 +1075,8 @@ begin
ValueNotebook.Page[1].Caption := lisCodeToolsDefsValueAsFilePaths;
ValueNotebook.PageIndex := 0;
MoveFilePathUpBitBtn.Caption:=dlgUpWord;
MoveFilePathDownBitBtn.Caption:=dlgDownWord;
MoveFilePathUpBitBtn.Caption:=lisUp;
MoveFilePathDownBitBtn.Caption:=lisDown;
DeleteFilePathBitBtn.Caption:=dlgEdDelete;
InsertFilePathBitBtn.Caption:=lisEdtExtToolInsert;

View File

@ -447,7 +447,7 @@ begin
ListColumn.Caption:=lisCTDefVariableName;
ListColumn.Width:=150;
ListColumn:=ValuesListview.Columns.Add;
ListColumn.Caption:=dlgRunOValue;
ListColumn.Caption:=lisValue;
DirectoryGroupbox.Caption:=lisCodeToolsDefsInsertBehindDirectory;
ButtonPanel.HelpButton.OnClick := @HelpButtonClick;

View File

@ -1177,8 +1177,7 @@ begin
then begin
MsgResult:=IDEQuestionDialog(lisExecutionStopped,
lisExecutionStopped, mtInformation,
[mrOK, dlgMouseOptBtnOk, mrYesToAll, lisDoNotShowThisMessageAgain],
'');
[mrOK, lisOk, mrYesToAll, lisDoNotShowThisMessageAgain], '');
if MsgResult=mrYesToAll then
EnvironmentOptions.DebuggerShowStopMessage:=false;
end;

View File

@ -293,7 +293,7 @@ begin
Sections:=AllPascalClassSections;
ButtonPanel1.OKButton.Caption:=lisEMDRemoveMethods;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
EditorOpts.GetSynEditSettings(MethodsSynEdit);
end;

View File

@ -525,8 +525,8 @@ begin
AddButton.Caption:=lisAdd;
RemoveButton.Caption:=lisExtToolRemove;
EditButton.Caption:=lisCodeToolsDefsEdit;
MoveUpButton.Caption:=lisExtToolMoveUp;
MoveDownButton.Caption:=lisExtToolMoveDown;
MoveUpButton.Caption:=lisUp;
MoveDownButton.Caption:=lisDown;
ButtonPanel.HelpButton.OnClick := @HelpButtonClick;

View File

@ -271,7 +271,7 @@ begin
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
fOptions:=TExternalToolOptions.Create;
end;

View File

@ -168,7 +168,7 @@ begin
IncludeSubDirsCheckBox.Caption := lisFindFileIncludeSubDirectories;
ButtonPanel1.HelpButton.Caption := lisMenuHelp;
ButtonPanel1.CancelButton.Caption := dlgCancel;
ButtonPanel1.CancelButton.Caption := lisCancel;
ReplaceCheckBox.Enabled:=true;

View File

@ -523,7 +523,7 @@ begin
CurrentGroupBox.Caption:=lisCodeToolsOptsIdentifier;
ExtraFilesGroupBox.Caption:=lisFRIAdditionalFilesToSearchEGPathPasPath2Pp;
ButtonPanel1.OKButton.Caption:=lisFRIFindReferences;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
NewGroupBox.Caption:=lisFRIRenameTo;
RenameCheckBox.Caption:=lisFRIRename;
ScopeCommentsCheckBox.Caption:=lisFRISearchInCommentsToo;

View File

@ -184,7 +184,7 @@ begin
HelpButton.Caption:=lisMenuHelp;
ReplaceAllButton.Caption:=dlgReplaceAll;
OKButton.Caption:=lisOk;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
fReplaceAllClickedLast:=false;
UpdateHints;

View File

@ -218,8 +218,8 @@ begin
fQuickFixes:=TFPList.Create;
Caption:=lisFindMissingUnit;
CancelButton.Caption:=dlgCancel;
OkButton.Caption:=dlgMouseOptBtnOk;
CancelButton.Caption:=lisCancel;
OkButton.Caption:=lisOk;
OkButton.Enabled:=false;
InfoGroupBox.Caption:=lisInformation;
QuickFixRadioGroup.Caption:=lisQuickFixes;

View File

@ -454,7 +454,7 @@ begin
BuildModesStringGrid.Columns[fModeInSessionCol].SizePriority:=1;
BuildModesStringGrid.Columns[fModeInSessionCol].ButtonStyle:=cbsCheckboxColumn;
end;
BuildModesStringGrid.Columns[fModeNameCol].Title.Caption:=lisDebugOptionsFrmName;
BuildModesStringGrid.Columns[fModeNameCol].Title.Caption:=lisName;
BuildModesStringGrid.Columns[fModeNameCol].SizePriority:=10;
BuildModesStringGrid.Columns[fModeNameCol].ButtonStyle:=cbsAuto;
Grid.EndUpdate(true);

View File

@ -85,10 +85,10 @@ begin
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeCaretMove);
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypePosOnly);
EditorTrimSpaceTypeLabel.Caption := dlgTrimSpaceTypeCaption;
EditorTabPositionCheckBox.Items.Add(dlgNotebookTabPosTop);
EditorTabPositionCheckBox.Items.Add(dlgNotebookTabPosBottom);
EditorTabPositionCheckBox.Items.Add(dlgNotebookTabPosLeft);
EditorTabPositionCheckBox.Items.Add(dlgNotebookTabPosRight);
EditorTabPositionCheckBox.Items.Add(lisTop);
EditorTabPositionCheckBox.Items.Add(lisBottom);
EditorTabPositionCheckBox.Items.Add(lisLeft);
EditorTabPositionCheckBox.Items.Add(lisRight);
EditorTabPositionLabel.Caption := dlgNotebookTabPos;
end;

View File

@ -696,7 +696,7 @@ begin
BtnExport.Caption := dlgMouseOptBtnExport;
UpdateButton.Caption := lisChange;
AddNewButton.Caption := lisAdd;
DelButton.Caption := dlgMouseOptBtnDel;
DelButton.Caption := lisDelete;
OtherActionLabel.Caption := dlgMouseOptOtherAct;
OtherActionLabel.Hint := dlgMouseOptOtherActHint;
OtherActToggleBox.Caption := dlgMouseOptOtherActToggle;

View File

@ -293,7 +293,7 @@ begin
grdFileFilters.DefaultColWidth := 40;
grdFileFilters.RowCount := 1;
grdFileFilters.Columns[0].Title.Caption := lisFileFiltersName;
grdFileFilters.Columns[0].Title.Caption := lisName;
grdFileFilters.Columns[1].Title.Caption := lisFileFiltersMask;
pmiAddRow.Caption := lisFileFiltersAddRow;

View File

@ -106,8 +106,8 @@ begin
LanguageSelectionLabel.Caption := rsLanguageSelection;
CharacterSetLabel.Caption := rsCharacterSet;
OtherInfoGroupBox.Caption := rsOtherInfo;
StringInfo.Cells[0, 0] := rsKey;
StringInfo.Cells[0, 1] := rsValue;
StringInfo.Cells[0, 0] := lisKey;
StringInfo.Cells[0, 1] := lisValue;
// fill comboboxes
Items := TStringList.Create;
try

View File

@ -114,7 +114,7 @@ begin
CGOptions.Items.Add(lisCheckOptions);
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
// set all defaults to true
for i:=0 to CGOptions.Items.Count-1 do

View File

@ -37,7 +37,7 @@ var
BitButtonYes: TBitBtn;
begin
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
// save and compile
BitButtonYes:=TBitBtn.Create(ButtonPanel1);

View File

@ -34,7 +34,7 @@ implementation
procedure TGenericListEditForm.FormCreate(Sender:TObject);
begin
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
end;
end.

View File

@ -54,7 +54,7 @@ begin
Caption := lisGotoLine;
Label1.Caption := lisUEGotoLine;
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
Edit1.Caption := '';
end;

View File

@ -244,7 +244,7 @@ begin
NodeHasHelpCheckBox.Caption:=lisHasHelp;
NodeIsRootCheckBox.Caption:=lisCEIsARootControl;
NodePathLabel.Caption:=lisPath;
NodeNameLabel.Caption:=lisDebugOptionsFrmName;
NodeNameLabel.Caption:=lisName;
NodesGroupBox.Caption:=lisHelpEntries;
ButtonPanel.OKButton.OnClick:=@OkBitBtnClick;

View File

@ -1048,7 +1048,7 @@ begin
Caption := lisHelpSelectorDialog;
NodesGroupBox.Caption:=lisSelectAHelpItem;
BtnPanel.OKButton.Caption:=lisLazBuildOk;
BtnPanel.OKButton.Caption:=lisOk;
end;
{ TIDEHelpDatabases }

View File

@ -121,7 +121,7 @@ begin
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.OKButton.OnClick := @OKButtonClick;
ButtonPanel.OKButton.ModalResult := mrNone;
ButtonPanel.CancelButton.Caption := dlgCancel;
ButtonPanel.CancelButton.Caption := lisCancel;
ButtonPanel.CancelButton.OnClick := @CancelButtonClick;
ButtonPanel.HelpButton.Caption:= lisMenuHelp;
ButtonPanel.HelpButton.OnClick := @HelpButtonClick;

View File

@ -202,7 +202,7 @@ begin
OpenRecentButton.Caption:=lisIECOOpenRecent;
SaveButton.Caption:=lisIECOSaveToFile;
OpenButton.Caption:=lisIECOLoadFromFile;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
OpenButton.LoadGlyphFromStock(idButtonOpen);
if OpenButton.Glyph.Empty then
OpenButton.LoadGlyphFromLazarusResource('laz_open');

View File

@ -565,7 +565,7 @@ begin
with OkButton do begin
Name:='OkButton';
Parent:=Self;
Caption:=lisIFDOK;
Caption:=lisOk;
OnClick:=@OkButtonClick;
Visible:=true;
end;
@ -574,7 +574,7 @@ begin
with CancelButton do begin
Name:='CancelButton';
Parent:=Self;
Caption:=dlgCancel;
Caption:=lisCancel;
OnClick:=@CancelButtonClick;
Visible:=true;
end;

View File

@ -265,8 +265,8 @@ begin
ecNone : Result:= dlgEnvNone;
ecLeft : Result:= lisLeft;
ecRight : Result:= lisRight;
ecUp : Result:= dlgUpWord;
ecDown : Result:= dlgDownWord;
ecUp : Result:= lisUp;
ecDown : Result:= lisDown;
ecWordLeft : Result:= srkmecWordLeft;
ecWordRight : Result:= srkmecWordRight;
ecWordEndLeft : Result:= srkmecWordEndLeft;

View File

@ -43,6 +43,24 @@ resourcestring
// Common strings that can be used around Lazarus:
lisAdd = 'Add';
lisChange = 'Change';
lisDelete = 'Delete';
lisOk = '&OK';
rsOk = 'OK';
lisCancel = 'Cancel';
lisContinue = 'Continue';
lisBreak = 'Break';
lisDown = 'Down';
lisUp = 'Up';
lisRight = 'Right';
lisLeft = 'Left';
lisTop = 'Top';
lisBottom = 'Bottom';
lisName = 'Name';
lisKey = 'Key';
lisValue = 'Value';
lisVariable = 'Variable';
lisPath = 'Path';
lisId = 'ID';
// errors
lisErrInvalidOption = 'Invalid option at position %d: "%s"';
@ -363,7 +381,6 @@ resourcestring
lisMenuRunToCursor = 'Run to &Cursor';
lisKMStopProgram = 'Stop Program';
lisMenuStop = 'Stop';
lisContinue = 'Continue';
lisContinueAndDoNotAskAgain = 'Continue and do not ask again';
lisSuspiciousUnitPath = 'Suspicious unit path';
lisThePackageAddsThePathToTheUnitPathOfTheIDEThisIsPr = 'The package %s '
@ -1026,7 +1043,6 @@ resourcestring
lisIncludeFilter = 'Include filter';
dlgEnvBckup = 'Backup';
dlgNaming = 'Naming';
dlgCancel = 'Cancel';
lisInformation = 'Information';
lisQuickFixes = 'Quick fixes';
lisAutoCompletionOn = 'Auto completion: on';
@ -1059,8 +1075,6 @@ resourcestring
+'this name.%sFile: %s';
lisPEUnitnameAndFilenameDoNotMatchExampleUnit1PasAndUni = 'Unitname and '
+'Filename do not match.%sExample: unit1.pas and Unit1';
lisOk = '&OK';
lisCancel = 'Cancel';
lisCMParameter = 'Parameter';
lisInsertMacro = 'Insert Macro';
lisCTPleaseSelectAMacro = 'please select a macro';
@ -1111,7 +1125,6 @@ resourcestring
dlgProjFiles = 'Project Files';
dlgEnvType = 'Type';
dlgEnvNone = 'None';
lisLeft = 'Left';
dlgSmbFront = 'Symbol in front (.~pp)';
lisNoBackupFiles = 'No backup files';
dlgSmbBehind = 'Symbol behind (.pp~)';
@ -1251,10 +1264,9 @@ resourcestring
dlgAllFiles = 'All files';
lisExecutable = 'Executable';
lisEditorFileTypes = 'Editor file types';
lisOld = 'old';
lisNew = 'new';
lisRemove = 'remove';
lisKeep = 'keep';
lisPkgMgrNew = 'new';
lisPkgMgrRemove = 'remove';
lisPkgMgrKeep = 'keep';
lisConfirmNewPackageSetForTheIDE = 'Confirm new package set for the IDE';
lisConfirmPackageNewPackageSet = 'New package set';
lisConfirmPackageOldPackageSet = 'Old package set';
@ -1298,10 +1310,6 @@ resourcestring
dlgTabNumbersNotebook = 'Show tab numbers in notebook';
dlgNotebookTabPos = 'Source notebook tabs position';
dlgUseTabsHistory = 'Use tab history when closing tabs';
dlgNotebookTabPosTop = 'Top';
dlgNotebookTabPosBottom = 'Bottom';
dlgNotebookTabPosLeft = 'Left';
dlgNotebookTabPosRight = 'Right';
dlgShowScrollHint = 'Show scroll hint';
dlgShowGutterHints = 'Show gutter hints';
dlgSmartTabs = 'Smart tabs';
@ -1431,8 +1439,6 @@ resourcestring
dlgMouseOptBtnExtra2 = 'Extra 2';
dlgMouseOptBtnWheelUp = 'Wheel up';
dlgMouseOptBtnWheelDown = 'Wheel down';
dlgMouseOptBtnDown = 'Down';
dlgMouseOptBtnUp = 'Up';
dlgMouseOptBtn1 = 'Single';
dlgMouseOptBtn2 = 'Double';
dlgMouseOptBtn3 = 'Triple';
@ -1447,15 +1453,12 @@ resourcestring
dlgMouseOptModShift = 'Shift';
dlgMouseOptModAlt = 'Alt';
dlgMouseOptModCtrl = 'Ctrl';
dlgMouseOptBtnDel = 'Delete';
dlgMouseOptOtherAct = 'Other actions using the same button';
dlgMouseOptOtherActHint = 'They may be executed depending on the Modifier Keys, Fallthrough settings, Single/Double, Up/Down ...';
dlgMouseOptOtherActToggle = 'Filter Mod-Keys';
dlgMouseOptBtnImport = 'Import';
dlgMouseOptBtnExport = 'Export';
dlgMouseOptBtnOk = 'OK';
lisDoNotShowThisMessageAgain = 'Do not show this message again';
dlgMouseOptBtnCancel = 'Cancel';
dlgMouseOptBtnModDef = 'Make Fallback';
dlgMouseOptPriorLabel = 'Priority';
dlgMouseOptOpt2Label = 'Opt';
@ -1818,18 +1821,13 @@ resourcestring
+'that: Error in the base directory:';
lisErrorInTheSearchPathForOtherUnitFiles = 'Error in the search path for "'
+'Other unit files":';
lisErrorInTheSearchPathForIncludeFiles = 'Error in the search path for "'
+'Include files":';
lisErrorInTheSearchPathForObjectFiles = 'Error in the search path for "'
+'Object files":';
lisErrorInTheSearchPathForLibraries = 'Error in the search path for "'
+'Libraries":';
lisErrorInTheSearchPathForOtherSources = 'Error in the search path for "'
+'Other sources":';
lisErrorInTheSearchPathForIncludeFiles = 'Error in the search path for "Include files":';
lisErrorInTheSearchPathForObjectFiles = 'Error in the search path for "Object files":';
lisErrorInTheSearchPathForLibraries = 'Error in the search path for "Libraries":';
lisErrorInTheSearchPathForOtherSources = 'Error in the search path for "Other sources":';
lisErrorInTheCustomLinkerOptionsLinkingPassOptionsToL = 'Error in the '
+'custom linker options (Linking / Pass options to linker):';
lisErrorInTheCustomCompilerOptionsOther = 'Error in the custom compiler '
+'options (Other):';
lisErrorInTheCustomCompilerOptionsOther = 'Error in the custom compiler options (Other):';
lisErrorInTheUnitOutputDirectory = 'Error in the "unit output directory":';
lisErrorInTheCompilerFileName = 'Error in the compiler file name:';
lisErrorInTheDebuggerPathAddition = 'Error in the "Debugger path addition":';
@ -2140,8 +2138,6 @@ resourcestring
rsLanguageSelection = 'Language selection:';
rsCharacterSet = 'Character set:';
rsOtherInfo = 'Other info';
rsKey = 'Key';
rsValue = 'Value';
dlgPOSaveSession = 'Session';
dlgApplicationSettings = 'Application settings';
dlgPOTitle = 'Title:';
@ -2193,8 +2189,6 @@ resourcestring
dlgRunODisplay = 'Display (not for win32, e.g. 198.112.45.11:0, x.org:1, hydra:0.1)';
dlgRunOUsedisplay = 'Use display';
dlgRunOSystemVariables = 'System variables';
dlgRunOVariable = 'Variable';
dlgRunOValue = 'Value';
dlgRunOUserOverrides = 'User overrides';
dlgIncludeSystemVariables = 'Include system variables';
dlgDirectoryDoesNotExist = 'Directory does not exist';
@ -2282,9 +2276,6 @@ resourcestring
dlgDirection = 'Direction';
lisFRForwardSearch = 'Forwar&d search';
lisFRBackwardSearch = '&Backward search';
dlgUpWord = 'Up';
lisRight = 'Right';
dlgDownWord = 'Down';
dlgReplaceAll = 'Replace &All';
// IDEOptionDefs
@ -2927,7 +2918,6 @@ resourcestring
lisLazBuildUpdateRevInc = 'Update revision.inc';
lisLazBuildCommonSettings = 'Common Settings';
lisLazBuildConfirmBuild = 'Confirm before build';
lisLazBuildOk = 'OK';
lisPERemoveFiles = 'Remove files';
lisLazBuildNewProf = 'Add New Profile';
lisLazBuildNewProfInfo = 'Current build options will be associated with:';
@ -2942,7 +2932,6 @@ resourcestring
lisLazBuildRenameProfInfo = 'New name for profile:';
lisCTDTemplates = 'Templates';
lisSaveSettings = 'Save Settings';
lisLazBuildCancel = 'Cancel';
lisLazBuildBuild = 'Build';
lisLazBuildBuildMany = 'Build Many';
lisLazBuildBuildingIDE = 'Building IDE';
@ -3000,7 +2989,6 @@ resourcestring
+'config file not found - using defaults';
// codetools options dialog
lisCodeToolsOptsOk = 'Ok';
lisCodeToolsOptsNone = 'None';
lisCodeToolsOptsKeyword = 'Keyword';
lisCodeToolsOptsIdentifier = 'Identifier';
@ -3038,26 +3026,21 @@ resourcestring
lisUnableToWriteTheProjectSessionFileError = 'Unable to write the project '
+'session file%s"%s".%sError: %s';
lisStopDebugging2 = 'Stop debugging?';
lisStopCurrentDebuggingAndRebuildProject = 'Stop current debugging and '
+'rebuild project?';
lisErrorWritingPackageListToFile = 'Error writing package list to file%s%s%'
+'s%s';
lisStopCurrentDebuggingAndRebuildProject = 'Stop current debugging and rebuild project?';
lisErrorWritingPackageListToFile = 'Error writing package list to file%s%s%s%s';
lisCodeToolsDefsErrorWhileWriting = 'Error while writing %s%s%s%s%s';
lisCodeToolsDefsErrorWhileWritingProjectInfoFile = 'Error while writing '
+'project info file %s%s%s%s%s';
lisCodeToolsDefsReadError = 'Read error';
lisUnableToRead = 'Unable to read %s';
lisErrorReadingPackageListFromFile = 'Error reading package list from file%'
+'s%s%s%s';
lisErrorReadingPackageListFromFile = 'Error reading package list from file%s%s%s%s';
lisDuplicate = 'Duplicate';
lisThePackageIsAlreadyInTheList = 'The package %s is already in the list';
lisConflict = 'Conflict';
lisThereIsAlreadyAPackageInTheList = 'There is already a package %s in the '
+'list';
lisThereIsAlreadyAPackageInTheList = 'There is already a package %s in the list';
lisNotADesigntimePackage = 'Not a designtime package';
lisThePackageCanNotBeInstalledBecauseItRequiresWhichI = 'The package %s can '
+'not be installed, because it requires the package "%s", which is a runtime only '
+'package.';
lisThePackageCanNotBeInstalledBecauseItRequiresWhichI = 'The package %s can not be '
+'installed, because it requires the package "%s", which is a runtime only package.';
lisUninstall = 'Uninstall %s';
lisThePackageIsNotADesignTimePackageItCanNotBeInstall = 'The package %s is '
+'not a design time package. It can not be installed in the IDE';
@ -3288,8 +3271,6 @@ resourcestring
lisUIDClear = 'Clear';
lisUIDPathsReadOnly = 'Paths (Read Only)';
lisUIDUnit = 'Unit';
lisUIDSrc = 'Src';
lisUIDOk = 'Ok';
lisUIDSize = 'Size:';
lisUIDLines = 'Lines:';
lisUIShowCodeToolsValues = 'Show CodeTools Values';
@ -3334,7 +3315,6 @@ resourcestring
lisSortSelCaseSensitive = '&Case Sensitive';
lisSortSelIgnoreSpace = 'Ignore Space';
lisSortSelSort = 'Accept';
lisSortSelCancel = 'Cancel';
// publish project dialog
lisPublProjInvalidIncludeFilter = 'Invalid include filter';
@ -3601,8 +3581,6 @@ resourcestring
+'the project.';
lisKeepThemAndContinue = 'Keep them and continue';
lisRemoveThem = 'Remove them';
lisExtToolMoveUp = 'Up';
lisExtToolMoveDown = 'Down';
lisExtToolMaximumToolsReached = 'Maximum Tools reached';
lisExtToolThereIsAMaximumOfTools = 'There is a maximum of %s tools.';
lisExtToolTitleCompleted = '"%s" completed';
@ -4223,7 +4201,6 @@ resourcestring
lisMenuEditorSelectTemplate = 'Select Template:';
lisMenuEditorTemplatePreview = 'Template Preview';
lisMenuEditorNewTemplateDescription = 'New Template Description ...';
lisMenuEditorCancel = 'Cancel';
lisMenuEditorInsertNewItemAfter = 'Insert New Item (after)';
lisMenuEditorInsertNewItemBefore = 'Insert New Item (before)';
lisMenuEditorDeleteItem = 'Delete Item';
@ -4577,12 +4554,10 @@ resourcestring
lisDebugOptionsFrmNotifyOnLazarusExceptions = 'Notify on Lazarus Exceptions';
lisDebugOptionsFrmOSExceptions = 'OS Exceptions';
lisDebugOptionsFrmSignals = 'Signals';
lisDebugOptionsFrmName = 'Name';
lisMacroName = 'Macro name';
lisIDEMacroValuesForFPCMacrosUseCustomOptions = 'IDE macro values (for FPC '
+'macros use custom options)';
lisMacroValue = 'Macro value';
lisDebugOptionsFrmID = 'ID';
lisDebugOptionsFrmHandledBy = 'Handled by';
lisDebugOptionsFrmResume = 'Resume';
lisDebugOptionsFrmHandledByProgram = 'Handled by Program';
@ -4602,7 +4577,6 @@ resourcestring
lisKMNoteAllKeysWillBeSetToTheValuesOfTheChosenScheme = 'Note: All keys '
+'will be set to the values of the chosen scheme.';
lisKMKeymappingScheme = 'Keymapping Scheme';
lisIFDOK = 'OK';
lisPVUEditVirtualUnit = 'Edit virtual unit';
// version info tab
@ -4699,8 +4673,6 @@ resourcestring
lisViewSourceDisass = 'View Assembler';
lisMaxS = 'Max %d';
lisMore = 'More';
lisTop = 'Top';
lisBottom = 'Bottom';
lisGotoSelectedSourceLine = 'Goto selected source line';
lisCopyAll = 'Copy All';
lisIndex = 'Index';
@ -4736,7 +4708,6 @@ resourcestring
lisGroupSetNone = 'Clear group(s)';
lisGroupEmptyDelete = 'No more breakpoints are assigned to group "%s", delete it?';
lisGroupEmptyDeleteMore = '%sThere are %d more empty groups, delete all?';
lisBreak = 'Break';
lisEnableGroups = 'Enable Groups';
lisDisableGroups = 'Disable Groups';
lisLogMessage = 'Log Message';
@ -4809,8 +4780,6 @@ resourcestring
// Locals Dialog
lisLocals = 'Locals';
lisLocalsDlgName = 'Name';
lisLocalsDlgValue = 'Value';
lisLocalsNotEvaluated = 'Locals not evaluated';
lisEvaluateModify = '&Evaluate/Modify';
lisLocalsDlgCopyName = '&Copy Name';
@ -4818,13 +4787,9 @@ resourcestring
// Registers Dialog
lisRegisters = 'Registers';
lisRegistersDlgName = 'Name';
lisRegistersDlgValue = 'Value';
// ThreadDlg
lisThreads = 'Threads';
lisThreadsId = 'Id';
lisThreadsName = 'Name';
lisThreadsState = 'State';
lisThreadsSrc = 'Source';
lisThreadsLine = 'Line';
@ -4850,8 +4815,6 @@ resourcestring
// Exception Dialog
lisExceptionDialog = 'Debugger Exception Notification';
lisBtnBreak = 'Break';
lisBtnContinue = 'Continue';
lisIgnoreExceptionType = 'Ignore this exception type';
lisetEditCustomScanners = 'Edit custom scanners (%s)';
@ -4935,7 +4898,6 @@ resourcestring
lisTheProjectInformationFileHasChangedOnDisk = 'The project information '
+'file %s%s%s%shas changed on disk.';
lisReopenProject = 'Reopen project';
rsOk = 'OK';
rsScanners = 'Scanners';
rsAvailableScanners = 'Available scanners';
rsSelectAnInheritedEntry = 'Select an inherited entry';
@ -4953,7 +4915,6 @@ resourcestring
// Edit context help dialog (IDEContextHelpEdit.pas)
lisHelpEntries = 'Help entries';
lisPath = 'Path';
lisCEIsARootControl = 'Is a root control';
lisHasHelp = 'Has Help';
lisCreateHelpNode = 'Create Help node';
@ -4993,7 +4954,6 @@ resourcestring
lisResult = 'Result :=';
lisPropertiesOfConditionalCompilerOption = 'Properties of conditional compiler option';
lisAction = 'Action:';
lisValue = 'Value:';
lisValues = 'Values';
lisDefaultValue = 'Default value';
lisIDEMacros = 'IDE Macros';
@ -5455,7 +5415,6 @@ resourcestring
lisDebuggerFeedbackStop = 'Stop';
lisDebuggerFeedbackLess = 'Less';
lisDebuggerFeedbackMore = 'More';
lisDebuggerFeedbackOk = 'OK';
// breakpointgroups
dbgBreakGroupDlgCaptionEnable = 'Select Groups';
@ -5506,7 +5465,6 @@ resourcestring
lisFileFilters = 'File Filters';
lisConfirm = 'Confirm';
lisResetAllFileFiltersToDefaults = 'Reset all file filters to defaults?';
lisFileFiltersName = 'Name';
lisFileFiltersMask = 'File mask';
lisFileFiltersAddRow = 'Add Row';
lisFileFiltersDeleteRow = 'Delete Row';

View File

@ -112,7 +112,7 @@ begin
Name:='OkButton';
Parent:=Self;
SetBounds(Self.ClientWidth-200,Self.ClientHeight-40,80,25);
Caption:=lisLazBuildOk;
Caption:=lisOk;
OnClick:=@OkButtonClick;
Visible:=true;
end;
@ -122,7 +122,7 @@ begin
Name:='CancelButton';
Parent:=Self;
SetBounds(Self.ClientWidth-100,Self.ClientHeight-40,80,25);
Caption:=dlgCancel;
Caption:=lisCancel;
OnClick:=@CancelButtonClick;
Visible:=true;
end;

View File

@ -293,7 +293,7 @@ begin
// OK, Cancel, Help buttons
OkButton.Caption:=lisOk;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
HelpButton.Caption:=lisMenuHelp;
end;

View File

@ -101,8 +101,8 @@ begin
ClickName[ccQuad]:=dlgMouseOptBtn4;
ClickName[ccAny]:=dlgMouseOptBtnAny;
ButtonDirName[cdUp]:=dlgMouseOptBtnUp;
ButtonDirName[cdDown]:=dlgMouseOptBtnDown;
ButtonDirName[cdUp]:=lisUp;
ButtonDirName[cdDown]:=lisDown;
Caption := dlgMouseOptDlgTitle;
CapturePanel.Caption := dlgMouseOptCapture;

View File

@ -338,7 +338,7 @@ begin
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := dlgCancel;
ButtonPanel.CancelButton.Caption := lisCancel;
end;
procedure TNewOtherDialog.UpdateDescription;

View File

@ -117,7 +117,7 @@ begin
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := dlgCancel;
ButtonPanel.CancelButton.Caption := lisCancel;
end;
procedure TNewProjectDialog.HelpButtonClick(Sender: TObject);

View File

@ -167,7 +167,7 @@ begin
lisSaveEditorInfoOfNonProjectFiles;
SaveClosedEditorFilesInfoCheckbox.Caption:=lisSaveInfoOfClosedEditorFiles;
ButtonPanel1.OkButton.Caption := lisLazBuildOk;
ButtonPanel1.OkButton.Caption := lisOk;
ButtonPanel1.OKButton.OnClick := @OkButtonCLICK;
ButtonPanel1.CloseButton.Caption := lisSaveSettings;

View File

@ -370,7 +370,7 @@ begin
Caption := dlgRunParameters;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
SetupNotebook;
end;
@ -412,8 +412,8 @@ begin
with SystemVariablesListView do
begin
Columns.BeginUpdate;
Columns[0].Caption := dlgRunOVariable;
Columns[1].Caption := dlgRunOValue;
Columns[0].Caption := lisVariable;
Columns[1].Caption := lisValue;
Columns.EndUpdate;
end;
@ -422,8 +422,8 @@ begin
with UserOverridesListView do
begin
Columns.BeginUpdate;
Columns[0].Caption := dlgRunOVariable;
Columns[1].Caption := dlgRunOValue;
Columns[0].Caption := lisVariable;
Columns[1].Caption := lisValue;
Columns.EndUpdate;
end;

View File

@ -623,7 +623,7 @@ begin
SearchingLabel.Caption:=lissSearching;
SearchTextLabel.Caption:=lissSearchText;
Caption:=dlgSearchCaption;
btnCancel.Caption:=dlgCancel;
btnCancel.Caption:=lisCancel;
fProgress:=TIDESearchInTextProgress.Create;
FProgress.OnAddMatch:=@OnAddMatch;

View File

@ -555,7 +555,7 @@ begin
Parent:=Self;
Left:=Self.ClientWidth-100;
Top:=OkButton.Top;
Caption:=lisSortSelCancel;
Caption:=lisCancel;
ModalResult:=mrCancel;
Cancel:=true;
end;

View File

@ -104,7 +104,7 @@ begin
Caption:=lisSVUOOverrideSystemVariable;
VariableLabel.Caption:=lisCodeToolsDefsVariable;
VariableLabel.Caption:=lisVariable;
ValueLabel.Caption:=lisValue;
end;

View File

@ -143,7 +143,7 @@ begin
RemoveSelectedBitBtn.Caption:=lisRemoveSelectedUnits;
RemoveAllBitBtn.Caption:=lisRemoveAllUnits;
CancelBitBtn.Caption:=dlgCancel;
CancelBitBtn.Caption:=lisCancel;
UnitsTreeView.StateImages := IDEImages.Images_16;
ImgIDInterface := IDEImages.LoadImage(16, 'ce_interface');

View File

@ -147,7 +147,7 @@ begin
SectionRadioGroup.Items.Add(dlgInsertImplementation);
SectionRadioGroup.ItemIndex:=0;
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
UnitImgInd := IDEImages.LoadImage(16, 'item_unit');
FProjUnits:=TStringList.Create;
end;

View File

@ -154,7 +154,7 @@ begin
mniMultiSelect.Caption := dlgMultiSelect;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=dlgCancel;
ButtonPanel.CancelButton.Caption:=lisCancel;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
SortAlphabeticallySpeedButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
end;

View File

@ -311,7 +311,7 @@ resourceString
ifsVK_UNKNOWN = 'Unknown';
ifsVK_LBUTTON = 'Mouse Button Left';
ifsVK_RBUTTON = 'Mouse Button Right';
ifsVK_CANCEL = 'Cancel'; //= dlgCancel
ifsVK_CANCEL = 'Cancel'; //= lisCancel
ifsVK_MBUTTON = 'Mouse Button Middle';
ifsVK_BACK = 'Backspace';
ifsVK_TAB = 'Tab';
@ -342,7 +342,7 @@ resourceString
ifsVK_LEFT = 'Left';
ifsVK_UP = 'Up';
ifsVK_RIGHT = 'Right';
ifsVK_DOWN = 'Down'; //= dlgdownword
ifsVK_DOWN = 'Down'; //= lisdown
ifsVK_SELECT = 'Select'; //= lismenuselect
ifsVK_PRINT = 'Print';
ifsVK_EXECUTE = 'Execute';

View File

@ -219,7 +219,7 @@ begin
HasRegisterProcCheckBox.Caption:=lisAF2PHasRegisterProcedure;
PackagesGroupBox.Caption:=lisAF2PDestinationPackage;
ShowAllCheckBox.Caption:=lisAF2PShowAll;
BtnPanel.OkButton.Caption:=lisLazBuildOk;
BtnPanel.OkButton.Caption:=lisOk;
BtnPanel.OkButton.OnClick:=@OkButtonClick;
BtnPanel.OkButton.ModalResult:=mrNone;
BtnPanel.HelpButton.OnClick:=@HelpButtonClick;

View File

@ -1123,7 +1123,7 @@ begin
NewComponentPage.Caption:=lisA2PNewComponent;
NewRequirementPage.Caption:=lisProjAddNewRequirement;
AddFilesPage.Caption:=lisA2PAddFiles;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
PageControl1.PageIndex:=0;
PageControl1Change(PageControl1);

View File

@ -187,7 +187,7 @@ begin
SaveAndRebuildButton.Caption:=lisSaveAndRebuildIDE;
SaveAndExitButton.Caption:=lisSaveAndExitDialog;
HelpButton.Caption:=lisMenuHelp;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
fAvailablePackages:=TAVLTree.Create(@CompareLazPackageIDNames);
FNewInstalledPackages:=TObjectList.Create(true);

View File

@ -69,7 +69,7 @@ end;
procedure TMissingPkgFilesDialog.FormCreate(Sender: TObject);
begin
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.CancelButton.Caption:=lisCancel;
end;
procedure TMissingPkgFilesDialog.ButtonPanel1Click(Sender: TObject);
@ -123,7 +123,7 @@ begin
if i>0 then begin
ButtonPanel1.OKButton.Caption:=lisPERemoveFiles;
end else begin
ButtonPanel1.OKButton.Caption:=lisLazBuildOk;
ButtonPanel1.OKButton.Caption:=lisOk;
end;
end;

View File

@ -157,7 +157,7 @@ begin
end;
OpenButton.Caption:=lisMenuOpen;
CancelButton.Caption:=dlgCancel;
CancelButton.Caption:=lisCancel;
HelpButton.Caption:=dlgGroupHelp;
end;

View File

@ -2438,7 +2438,7 @@ begin
Format(lisThePackageDoesNotHaveAnyRegisterProcedureWhichTypi, [APackage.
Name, #13, #13]),
mtWarning,
[mrIgnore, lisInstallItILikeTheFat, mrCancel, dlgCancel], '')<>mrIgnore
[mrIgnore, lisInstallItILikeTheFat, mrCancel, lisCancel], '')<>mrIgnore
then exit(mrCancel);
end;
if Assigned(OnInstallPackage) then

View File

@ -150,7 +150,7 @@ begin
PkgStringGrid.ColCount:=5;
PkgStringGrid.RowCount:=FLinks.Count+1;
PkgStringGrid.Cells[0, 0]:=lisDebugOptionsFrmName;
PkgStringGrid.Cells[0, 0]:=lisName;
PkgStringGrid.Cells[1, 0]:=lisVersion;
PkgStringGrid.Cells[2, 0]:=dlgPLDPackageGroup;
PkgStringGrid.Cells[3, 0]:=lisPLDExists;

View File

@ -3972,7 +3972,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
CurDependency.PackageName);
if OldDependency=nil then begin
// newly installed
s:=s+'|'+lisNew;
s:=s+'|'+lisPkgMgrNew;
Report.Add(s);
end;
CurDependency:=CurDependency.NextRequiresDependency;
@ -3985,7 +3985,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
CurDependency.PackageName);
if NewDependency=nil then
// this package will be removed
Report.Add('|'+lisRemove+'|'+CurDependency.AsString);
Report.Add('|'+lisPkgMgrRemove+'|'+CurDependency.AsString);
CurDependency:=CurDependency.NextRequiresDependency;
end;
@ -3998,7 +3998,7 @@ function TPkgManager.InstallPackages(PkgIdList: TObjectList;
if OldDependency<>nil then begin
// stay installed
if CurDependency.AsString<>OldDependency.AsString then
s:=s+'|'+lisKeep+'|'+OldDependency.AsString;
s:=s+'|'+lisPkgMgrKeep+'|'+OldDependency.AsString;
Report.Add(s);
end;
CurDependency:=CurDependency.NextRequiresDependency;