paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 21:41:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: unify some common resource strings. Add hints for Path Edit dialog

Browse Source 
git-svn-id: trunk@35361 -
This commit is contained in:
juha 2012-02-13 19:57:58 +00:00
parent bf33d9b810
commit 2550bbf3be
52 changed files with 103 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
converter/convertsettings.pas
View File

@ -697,7 +697,7 @@ begin
TargetGroupBox.Hint:=lisConvertTargetHint;
// Unit Replacements
UnitReplaceDivider.Caption:=lisConvUnitReplacements;
UnitReplaceButton.Caption:=lisCodeToolsDefsEdit; // Recycled string.
UnitReplaceButton.Caption:=lisEdit; // Recycled string.
UnitReplaceDivider.Hint:=lisConvUnitReplHint;
UnitReplaceButton.Hint:=lisConvUnitReplHint;
UnitReplaceComboBox.Items.Add(lisDisabled); // 'Disabled'
@ -710,21 +710,21 @@ begin
UnknownPropsComboBox.Items.Add(lisAutomatic);
// Type Replacements
TypeReplaceDivider.Caption:=lisConvTypeReplacements;
TypeReplaceButton.Caption:=lisCodeToolsDefsEdit;
TypeReplaceButton.Caption:=lisEdit;
TypeReplaceDivider.Hint:=lisConvTypeReplHint;
TypeReplaceButton.Hint:=lisConvTypeReplHint;
TypeReplaceComboBox.Items.Add(lisInteractive);
TypeReplaceComboBox.Items.Add(lisAutomatic);
// Func Replacements
FuncReplaceDivider.Caption:=lisConvFuncReplacements;
FuncReplaceButton.Caption:=lisCodeToolsDefsEdit;
FuncReplaceButton.Caption:=lisEdit;
FuncReplaceDivider.Hint:=lisConvFuncReplHint;
FuncReplaceButton.Hint:=lisConvFuncReplHint;
FuncReplaceComboBox.Items.Add(lisDisabled); // 'Disabled'
FuncReplaceComboBox.Items.Add(lisEnabled); // 'Enabled'
// Coordinate Offsets
CoordOffsDivider.Caption:=lisConvCoordOffs;
CoordOffsButton.Caption:=lisCodeToolsDefsEdit;
CoordOffsButton.Caption:=lisEdit;
CoordOffsDivider.Hint:=lisConvCoordHint;
CoordOffsButton.Hint:=lisConvCoordHint;
CoordOffsComboBox.Items.Add(lisDisabled);

2
converter/replacefuncsunit.pas
View File

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

2
converter/replacenamesunit.pas
View File

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

2
debugger/breakpropertydlg.pas
View File

@ -426,7 +426,7 @@ begin
FBreakpointsNotification.OnRemove := @BreakPointRemove;
UpdateInfo;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
end;

2
debugger/feedbackdlg.pp
View File

@ -89,7 +89,7 @@ begin
ButtonPanel1.OKButton.Visible := frOk in AButtons;
ButtonPanel1.CancelButton.Visible := frStop in AButtons;
ButtonPanel1.OKButton.Caption := lisOk;
ButtonPanel1.OKButton.Caption := lisMenuOk;
ButtonPanel1.CancelButton.Caption := lisDebuggerFeedbackStop;
case ShowModal of

2
debugger/frames/debugger_language_exceptions_options.pas
View File

@ -146,7 +146,7 @@ procedure TDebuggerLanguageExceptionsOptions.Setup(
begin
bgIgnoreExceptions.Caption := lisDebugOptionsFrmIgnoreTheseExceptions;
DbgLangExceptHint.Caption := lisTheseSettingsAreStoredWithTheProject;
cmdExceptionRemove.Caption := lisExtToolRemove;
cmdExceptionRemove.Caption := lisRemove;
cmdExceptionAdd.Caption := lisAdd;
cmdExceptionRemove.LoadGlyphFromLazarusResource('laz_delete');
cmdExceptionAdd.LoadGlyphFromLazarusResource('laz_add');

2
debugger/frames/debugger_signals_options.pas
View File

@ -88,7 +88,7 @@ begin
lvSignals.Column[2].Caption := lisDebugOptionsFrmHandledBy;
lvSignals.Column[3].Caption := lisDebugOptionsFrmResume;
cmdSignalAdd.Caption := lisAdd;
cmdSignalRemove.Caption := lisExtToolRemove;
cmdSignalRemove.Caption := lisRemove;
cmdSignalAdd.LoadGlyphFromLazarusResource('laz_add');
cmdSignalRemove.LoadGlyphFromLazarusResource('laz_delete');

2
debugger/watchpropertydlg.pp
View File

@ -153,7 +153,7 @@ begin
rgStyle.Items[8]:= lisMemoryDump;
//rgStyle.Items[9]:= lisFloatingPoin;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
end;

2
designer/askcompnamedlg.pas
View File

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

4
designer/designermenu.pp
View File

@ -1066,7 +1066,7 @@ begin
end;
2: begin
// Change a caption of selected designermenuitem fo "Edit"
ChangeCaption (temp_designermenuitem, lisMenuTemplateEdit);
ChangeCaption (temp_designermenuitem, lisEdit);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add an submenu with first item and set it's caption to "Undo"
@ -2129,7 +2129,7 @@ begin
ListBoxView.Items.Add(' ' + lisMenuTemplateExit);
end;
2: begin
ListBoxView.Items.Add(lisMenuTemplateEdit);
ListBoxView.Items.Add(lisEdit);
ListBoxView.Items.Add(' ' + lisUndo);
ListBoxView.Items.Add(' ' + lisRedo);
ListBoxView.Items.Add(' -');

2
designer/objinspext.pas
View File

@ -398,7 +398,7 @@ begin
OkButton.Caption:=lisAdd;
end else begin
Caption:=lisOIFRemoveFromFavouriteProperties;
OkButton.Caption:=lisExtToolRemove;
OkButton.Caption:=lisRemove;
end;
end;

2
ide/addprofiledialog.pas
View File

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

2
ide/addtoprojectdlg.pas
View File

@ -509,7 +509,7 @@ begin
end;
with FilesDeleteButton do begin
Caption:=dlgEdDelete;
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
LoadGlyphFromLazarusResource('laz_delete');

6
ide/buildprofilemanager.pas
View File

@ -517,12 +517,12 @@ begin
MoveDownButton.ImageIndex:=IDEImages.LoadImage(16, 'arrow_down');
AddButton.Caption:=lisAdd;
RemoveButton.Caption:=lisLazBuildRemove;
EditButton.Caption:=lisLazBuildRename;
RemoveButton.Caption:=lisRemove;
EditButton.Caption:=lisRename;
MoveUpButton.Caption:=lisUp;
MoveDownButton.Caption:=lisDown;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;

8
ide/codeexplorer.pas
View File

@ -372,15 +372,13 @@ var
begin
CodeExplorerMenuRoot:=RegisterIDEMenuRoot(CodeExplorerMenuRootName);
Path:=CodeExplorerMenuRoot.Name;
CEJumpToIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Jump to', lisMenuJumpTo
);
CEJumpToIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Jump to', lisMenuJumpTo);
CEJumpToImplementationIDEMenuCommand:=RegisterIDEMenuCommand(Path,
'Jump to implementation', lisMenuJumpToImplementation);
CEShowSrcEditPosIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Show position of source editor',
lisShowPositionOfSourceEditor);
CERefreshIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Refresh',
dlgUnitDepRefresh);
CERenameIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Rename', lisFRIRename);
CERefreshIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Refresh', dlgUnitDepRefresh);
CERenameIDEMenuCommand:=RegisterIDEMenuCommand(Path, 'Rename', lisRename);
end;
function GetToDoComment(const Src: string; CommentStartPos,

8
ide/codetemplatesdlg.pas
View File

@ -848,7 +848,7 @@ begin
with OkButton do begin
Name:='OkButton';
Parent:=Self;
Caption:=lisOk;
Caption:=lisMenuOk;
OnClick:=@OkButtonClick;
Left:=50;
Top:=Self.ClientHeight-Height-12;
@ -939,11 +939,11 @@ begin
// init captions
Caption:=dlgEdCodeTempl;
AddButton.Caption:=lisAdd;
RenameButton.Caption:=lisLazBuildRename;
DeleteButton.Caption:=dlgEdDelete;
RenameButton.Caption:=lisRename;
DeleteButton.Caption:=lisDelete;
TemplatesGroupBox.Caption:=lisCTDTemplates;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;

8
ide/codetoolsdefines.pas
View File

@ -972,12 +972,12 @@ var
DefAction: TDefineAction;
begin
// exit menu
ExitMenuItem.Caption := lisCodeToolsDefsExit;
ExitMenuItem.Caption := lisExit;
SaveAndExitMenuItem.Caption:=lisCodeToolsDefsSaveAndExit;
DontSaveAndExitMenuItem.Caption:=lisCodeToolsDefsExitWithoutSave;
// edit nodes
EditMenuItem.Caption := lisCodeToolsDefsEdit;
EditMenuItem.Caption := lisEdit;
MoveNodeUpMenuItem.Caption:=lisCodeToolsDefsMoveNodeUp;
MoveNodeDownMenuItem.Caption := lisCodeToolsDefsMoveNodeDown;
MoveNodeLvlUpMenuItem.Caption := lisCodeToolsDefsMoveNodeOneLevelUp;
@ -1077,8 +1077,8 @@ begin
MoveFilePathUpBitBtn.Caption:=lisUp;
MoveFilePathDownBitBtn.Caption:=lisDown;
DeleteFilePathBitBtn.Caption:=dlgEdDelete;
InsertFilePathBitBtn.Caption:=lisEdtExtToolInsert;
DeleteFilePathBitBtn.Caption:=lisDelete;
InsertFilePathBitBtn.Caption:=lisInsert;
DefineTreeView.Images := IDEImages.Images_24;
DefineTreeView.StateImages := IDEImages.Images_16;

2
ide/debugmanager.pas
View File

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

2
ide/editmsgscannersdlg.pas
View File

@ -94,7 +94,7 @@ begin
AvailableGroupBox.Caption:=rsAvailableScanners;
ScannersGroupBox.Caption:=rsScanners;
AddSpeedButton.Hint:=lisAdd;
RemoveSpeedButton.Hint:=lisExtToolRemove;
RemoveSpeedButton.Hint:=lisRemove;
AddSpeedButton.LoadGlyphFromLazarusResource('arrow_left');
RemoveSpeedButton.LoadGlyphFromLazarusResource('arrow_right');

4
ide/exttooldialog.pas
View File

@ -523,8 +523,8 @@ begin
ToolBar.Images := IDEImages.Images_16;
AddButton.Caption:=lisAdd;
RemoveButton.Caption:=lisExtToolRemove;
EditButton.Caption:=lisCodeToolsDefsEdit;
RemoveButton.Caption:=lisRemove;
EditButton.Caption:=lisEdit;
MoveUpButton.Caption:=lisUp;
MoveDownButton.Caption:=lisDown;

2
ide/exttooleditdlg.pas
View File

@ -269,7 +269,7 @@ begin
with MacrosInsertButton do
Caption:=lisAdd;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;

2
ide/findrenameidentifier.pas
View File

@ -525,7 +525,7 @@ begin
ButtonPanel1.OKButton.Caption:=lisFRIFindReferences;
ButtonPanel1.CancelButton.Caption:=lisCancel;
NewGroupBox.Caption:=lisFRIRenameTo;
RenameCheckBox.Caption:=lisFRIRename;
RenameCheckBox.Caption:=lisRename;
ScopeCommentsCheckBox.Caption:=lisFRISearchInCommentsToo;
ScopeGroupBox.Caption:=lisFRISearchWhere;
ScopeRadioGroup.Caption:=dlgScope;

6
ide/findreplacedialog.pp
View File

@ -183,7 +183,7 @@ begin
HelpButton.Caption:=lisMenuHelp;
ReplaceAllButton.Caption:=dlgReplaceAll;
OKButton.Caption:=lisOk;
OKButton.Caption:=lisMenuOk;
CancelButton.Caption:=lisCancel;
fReplaceAllClickedLast:=false;
@ -317,7 +317,7 @@ begin
PromptOnReplaceCheckBox.Enabled:=ReplaceAllButton.Visible;
if ReplaceAllButton.Visible then
begin
Caption := lisMenuReplace;
Caption := lisReplace;
OkButton.Caption := lisBtnReplace;
end else
begin
@ -460,7 +460,7 @@ begin
if ssoReplace in NewOptions then
begin
Caption := lisMenuReplace;
Caption := lisReplace;
OkButton.Caption := lisBtnReplace;
end else
begin

2
ide/findunitdlg.pas
View File

@ -219,7 +219,7 @@ begin
Caption:=lisFindMissingUnit;
CancelButton.Caption:=lisCancel;
OkButton.Caption:=lisOk;
OkButton.Caption:=lisMenuOk;
OkButton.Enabled:=false;
InfoGroupBox.Caption:=lisInformation;
QuickFixRadioGroup.Caption:=lisQuickFixes;

2
ide/fpdoceditwindow.pas
View File

@ -493,7 +493,7 @@ begin
if QuestionDlg(lisCodeHelpConfirmreplace,
GetContextTitle(Element)+' already contains the help:'+#13
+ShortDescr,
mtConfirmation,[mrYes,lisCodeHelpReplaceButton,mrCancel],0)<>mrYes then exit;
mtConfirmation,[mrYes,lisReplace,mrCancel],0)<>mrYes then exit;
end;
end;
end else begin

2
ide/frmcustomapplicationoptions.pas
View File

@ -113,7 +113,7 @@ begin
CGOptions.Items.Add(lisDestructorCode);
CGOptions.Items.Add(lisCheckOptions);
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.CancelButton.Caption:=lisCancel;
// set all defaults to true

2
ide/genericchecklist.pas
View File

@ -36,7 +36,7 @@ procedure TGenericCheckListForm.FormCreate(Sender: TObject);
var
BitButtonYes: TBitBtn;
begin
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.OKButton.Caption:=lisMenuOk;
ButtonPanel1.CancelButton.Caption:=lisCancel;
// save and compile

2
ide/genericlisteditor.pas
View File

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

2
ide/gotofrm.pas
View File

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

2
ide/idehelpmanager.pas
View File

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

2
ide/ideoptionsdlg.pas
View File

@ -118,7 +118,7 @@ begin
IDEDialogLayoutList.ApplyLayout(Self, Width, Height);
Caption := dlgIDEOptions;
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.OKButton.Caption := lisMenuOk;
ButtonPanel.OKButton.OnClick := @OKButtonClick;
ButtonPanel.OKButton.ModalResult := mrNone;
ButtonPanel.CancelButton.Caption := lisCancel;

2
ide/inputfiledialog.pas
View File

@ -565,7 +565,7 @@ begin
with OkButton do begin
Name:='OkButton';
Parent:=Self;
Caption:=lisOk;
Caption:=lisMenuOk;
OnClick:=@OkButtonClick;
Visible:=true;
end;

30
ide/lazarusidestrconsts.pas
View File

@ -41,16 +41,23 @@ uses
resourcestring
// Common strings that can be used around Lazarus:
lisLazarus = 'Lazarus';
lisAdd = 'Add';
lisInsert = 'Insert';
lisChange = 'Change';
lisDelete = 'Delete';
lisOk = '&OK';
lisRemove = 'Remove';
lisRename = 'Rename';
lisReplace = 'Replace';
lisEdit = 'Edit';
lisMenuOk = '&OK';
rsOk = 'OK';
lisCancel = 'Cancel';
// lisYes = 'Yes';
lisNo = 'No';
lisContinue = 'Continue';
lisBreak = 'Break';
lisExit = 'Exit';
lisUndo = 'Undo';
lisRedo = 'Redo';
@ -266,7 +273,6 @@ resourcestring
lisMenuFindPrevious = 'Find &Previous';
lisMenuFindInFiles = 'Find &in Files ...';
lisBtnReplace = '&Replace';
lisMenuReplace = 'Replace';
lisMenuIncrementalFind = 'Incremental Find';
lisMenuReplace2 = '&Replace ...';
lisMenuGotoLine = 'Goto Line ...';
@ -1578,7 +1584,6 @@ resourcestring
dlgTimeSecondUnit = 'sec';
dlgEdAdd = 'Add ...';
dlgEdEdit = 'Edit ...';
dlgEdDelete = 'Delete';
dlgIndentCodeTo = 'Indent code to';
//dlgCodeToolsTab = 'Code Tools';
lisAutomaticFeatures = 'Completion and Hints';
@ -2270,8 +2275,7 @@ resourcestring
lisPackageNameContains = 'Package name contains ...';
lisFRIinCurrentUnit = 'in current unit';
lisFRIinMainProject = 'in main project';
lisFRIinProjectPackageOwningCurrentUnit = 'in project/package owning '
+'current unit';
lisFRIinProjectPackageOwningCurrentUnit = 'in project/package owning current unit';
lisFRIinAllOpenPackagesAndProjects = 'in all open packages and projects';
lisFRIRenameAllReferences = 'Rename all References';
dlgGlobal = '&Global';
@ -2922,13 +2926,11 @@ resourcestring
lisPERemoveFiles = 'Remove files';
lisLazBuildNewProf = 'Add New Profile';
lisLazBuildNewProfInfo = 'Current build options will be associated with:';
lisLazBuildRemove = 'Remove';
lisKeep2 = 'Keep';
lisRemoveIncludePath = 'Remove include path?';
lisTheDirectoryContainsNoProjectIncludeFilesAnyMoreRe = 'The directory "%s" '
+'contains no project include files any more. Remove this directory from '
+'the project''s include search path?';
lisLazBuildRename = 'Rename';
lisLazBuildRenameProf = 'Rename Profile';
lisLazBuildRenameProfInfo = 'New name for profile:';
lisCTDTemplates = 'Templates';
@ -2998,7 +3000,6 @@ resourcestring
lisFRIFindReferences = 'Find References';
lisFRIInvalidIdentifier = 'Invalid Identifier';
lisFRIRenameTo = 'Rename to';
lisFRIRename = 'Rename';
lisFRISearchInCommentsToo = 'Search in comments too';
lisFRISearchWhere = 'Search where';
lisCodeToolsOptsColon = 'Colon';
@ -3102,10 +3103,8 @@ resourcestring
lisCodeToolsDefsKylixMainDirectoryForProject = 'The %s main directory,%'
+'swhere Borland has installed all %s sources,%swhich are used by this %s '
+'project.%sFor example: /home/user/kylix%s';
lisCodeToolsDefsExit = 'Exit';
lisCodeToolsDefsSaveAndExit = 'Save and Exit';
lisCodeToolsDefsExitWithoutSave = 'Exit without Save';
lisCodeToolsDefsEdit = 'Edit';
lisCodeToolsDefsMoveNodeUp = 'Move node up';
lisCodeToolsDefsMoveNodeDown = 'Move node down';
lisCodeToolsDefsMoveNodeOneLevelUp = 'Move node one level up';
@ -3577,7 +3576,6 @@ resourcestring
lisProgramNotFound = 'Program %s not found';
lisWorkingDirectoryNotFound = 'Working directory %s not found';
lisExtToolExternalTools = 'External Tools';
lisExtToolRemove = 'Remove';
lisTheseSettingsAreStoredWithTheProject = 'These settings are stored with '
+'the project.';
lisKeepThemAndContinue = 'Keep them and continue';
@ -3604,7 +3602,6 @@ resourcestring
lisWorkingDirectoryForBuilding = 'Working directory for building';
lisWorkingDirectoryForRun = 'Working directory for run';
lisConfigureBuild = 'Configure Build %s';
lisEdtExtToolInsert = 'Insert';
lisEdtExtToolTitleAndFilenameRequired = 'Title and Filename required';
lisEdtExtToolAValidToolNeedsAtLeastATitleAndAFilename = 'A valid tool needs '
+'at least a title and a filename.';
@ -3624,7 +3621,6 @@ resourcestring
// package manager
lisPkgMangPackage = 'Package: %s';
lisPkgMangProject = 'Project: %s';
lisPkgMangLazarus = 'Lazarus';
lisPkgMangDependencyWithoutOwner = 'Dependency without Owner: %s';
lisPkgMangSavePackageLpk = 'Save Package %s (*.lpk)';
lisPkgMangInvalidPackageFileExtension = 'Invalid package file extension';
@ -4226,7 +4222,7 @@ resourcestring
// Standard Edit menu
lisMenuTemplateDescriptionStandardEditMenu = 'Standard Edit Menu';
lisMenuTemplateEdit = 'Edit';
//lisMenuTemplateEdit = 'Edit';
//lisMenuTemplateUndo = 'Undo';
//lisMenuTemplateRedo = 'Redo';
//lisMenuTemplateCut = 'Cut';
@ -4468,7 +4464,6 @@ resourcestring
lisDefaultPlaceholder = '(default)';
lisEONOTEOnlyAbsolutePathsAreSupportedNow = 'NOTE: only absolute paths are supported now';
lisCodeHelpConfirmreplace = 'Confirm replace';
lisCodeHelpReplaceButton = 'Replace';
lisCodeHelpGroupBox = 'FPDoc settings';
lisCodeHelpHintBoldFormat = 'Insert bold formatting tag';
lisCodeHelpHintItalicFormat = 'Insert italic formatting tag';
@ -4573,6 +4568,11 @@ resourcestring
+'will be set to the values of the chosen scheme.';
lisKMKeymappingScheme = 'Keymapping Scheme';
lisPVUEditVirtualUnit = 'Edit virtual unit';
lisPathEditorReplaceHint = 'Replace the selected path with a new path';
lisPathEditorAddHint = 'Add new path to the list';
lisPathEditorDeleteHint = 'Delete the selected path';
lisPathEditorDeleteInvalidHint = 'Remove non-existent (gray) paths from the list';
lisPathEditorTemplAddHint = 'Add template to the list';
// version info tab
VersionInfoTitle = 'Version Info';

2
ide/macropromptdlg.pas
View File

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

12
ide/main.pp
View File

@ -7889,10 +7889,8 @@ begin
if (ResolvedDir<>'')
and (SearchDirectoryInSearchPath(ObsoleteUnitPaths,ResolvedDir)>0) then begin
if IDEQuestionDialog(lisRemoveUnitPath,
Format(lisTheDirectoryContainsNoProjectUnitsAnyMoreRemoveThi, [
CurDir]),
mtConfirmation, [mrYes, lisLazBuildRemove, mrNo, lisKeep2], '')=
mrYes
Format(lisTheDirectoryContainsNoProjectUnitsAnyMoreRemoveThi, [CurDir]),
mtConfirmation, [mrYes, lisRemove, mrNo, lisKeep2], '')=mrYes
then begin
// remove
ProjUnitPaths:=RemoveSearchPaths(ProjUnitPaths,CurDir);
@ -7916,10 +7914,8 @@ begin
if (ResolvedDir<>'')
and (SearchDirectoryInSearchPath(ObsoleteIncPaths,ResolvedDir)>0) then begin
if IDEQuestionDialog(lisRemoveIncludePath,
Format(lisTheDirectoryContainsNoProjectIncludeFilesAnyMoreRe, [
CurDir]),
mtConfirmation, [mrYes, lisLazBuildRemove, mrNo, lisKeep2], '')=
mrYes
Format(lisTheDirectoryContainsNoProjectIncludeFilesAnyMoreRe, [CurDir]),
mtConfirmation, [mrYes, lisRemove, mrNo, lisKeep2], '')=mrYes
then begin
// remove
ProjIncPaths:=RemoveSearchPaths(ProjIncPaths,CurDir);

2
ide/makeresstrdlg.pas
View File

@ -292,7 +292,7 @@ begin
StringConstGroupBox.Caption:=lisMakeResStrStringConstantInSource;
// OK, Cancel, Help buttons
OkButton.Caption:=lisOk;
OkButton.Caption:=lisMenuOk;
CancelButton.Caption:=lisCancel;
HelpButton.Caption:=lisMenuHelp;
end;

4
ide/msgvieweditor.pas
View File

@ -91,8 +91,8 @@ begin
Caption:= lisMessagesEditor;
AddNewSetButton.Caption:=lisAddNewSet;
ActiveFilterSetGroupBox.Caption:=lisActiveFilter;
RenameSetButton.Caption:=lisFRIRename;
DeleteSetButton.Caption:=dlgEdDelete;
RenameSetButton.Caption:=lisRename;
DeleteSetButton.Caption:=lisDelete;
FilterSetGroupBox.Caption:=lisFilterSets;
AddNewSetButton.LoadGlyphFromLazarusResource('laz_add');

2
ide/newdialog.pas
View File

@ -336,7 +336,7 @@ begin
DescriptionGroupBox.Caption := lisCodeHelpDescrTag;
DescriptionLabel.Caption := '';
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.OKButton.Caption := lisMenuOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := lisCancel;
end;

2
ide/newprojectdlg.pp
View File

@ -115,7 +115,7 @@ begin
DescriptionGroupBox.Caption := lisCodeHelpDescrTag;
ButtonPanel.OKButton.Caption := lisOk;
ButtonPanel.OKButton.Caption := lisMenuOk;
ButtonPanel.HelpButton.Caption := lisMenuHelp;
ButtonPanel.CancelButton.Caption := lisCancel;
end;

10
ide/patheditordlg.lfm
View File

@ -82,6 +82,8 @@ object PathEditorDialog: TPathEditorDialog
Enabled = False
NumGlyphs = 0
OnClick = DeleteButtonClick
ParentShowHint = False
ShowHint = True
TabOrder = 6
end
object PathListBox: TListBox
@ -134,6 +136,8 @@ object PathEditorDialog: TPathEditorDialog
Enabled = False
NumGlyphs = 0
OnClick = ReplaceButtonClick
ParentShowHint = False
ShowHint = True
TabOrder = 4
end
object AddButton: TBitBtn
@ -152,6 +156,8 @@ object PathEditorDialog: TPathEditorDialog
Enabled = False
NumGlyphs = 0
OnClick = AddButtonClick
ParentShowHint = False
ShowHint = True
TabOrder = 5
end
object DeleteInvalidPathsButton: TBitBtn
@ -170,6 +176,8 @@ object PathEditorDialog: TPathEditorDialog
Enabled = False
NumGlyphs = 0
OnClick = DeleteInvalidPathsButtonClick
ParentShowHint = False
ShowHint = True
TabOrder = 7
end
end
@ -218,6 +226,8 @@ object PathEditorDialog: TPathEditorDialog
Caption = 'AddTemplateButton'
NumGlyphs = 0
OnClick = AddTemplateButtonClick
ParentShowHint = False
ShowHint = True
TabOrder = 1
end
end

9
ide/patheditordlg.pas
View File

@ -244,13 +244,18 @@ begin
MoveUpButton.Hint:=lisPathEditMovePathUp;
MoveDownButton.Hint:=lisPathEditMovePathDown;
ReplaceButton.Caption:=lisMenuReplace;
ReplaceButton.Caption:=lisReplace;
ReplaceButton.Hint:=lisPathEditorReplaceHint;
AddButton.Caption:=lisAdd;
DeleteButton.Caption:=dlgEdDelete;
AddButton.Hint:=lisPathEditorAddHint;
DeleteButton.Caption:=lisDelete;
DeleteButton.Hint:=lisPathEditorDeleteHint;
DeleteInvalidPathsButton.Caption:=lisPathEditDeleteInvalidPaths;
DeleteInvalidPathsButton.Hint:=lisPathEditorDeleteInvalidHint;
TemplateGroupBox.Caption:=lisPathEditPathTemplates;
AddTemplateButton.Caption:=lisCodeTemplAdd;
AddTemplateButton.Hint:=lisPathEditorTemplAddHint;
MoveUpButton.LoadGlyphFromLazarusResource('arrow_up');
MoveDownButton.LoadGlyphFromLazarusResource('arrow_down');

2
ide/projectinspector.pas
View File

@ -604,7 +604,7 @@ begin
FilterEdit.OnGetImageIndex:=@ChooseImageIndex;
AddBitBtn := CreateToolButton('AddBitBtn', lisAdd, lisPckEditAddAnItem, 'laz_add', @AddBitBtnClick);
RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisExtToolRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick);
RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick);
CreateDivider;
OptionsBitBtn := CreateToolButton('OptionsBitBtn', dlgFROpts, lisPckEditEditGeneralOptions, 'menu_environment_options', @OptionsBitBtnClick);
HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick);

2
ide/publishprojectdlg.pas
View File

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

5
ide/runparamsopts.pas
View File

@ -366,9 +366,8 @@ end;
constructor TRunParamsOptsDlg.Create(AnOwner: TComponent);
begin
inherited Create(AnOwner);
Caption := dlgRunParameters;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
SetupNotebook;
@ -429,7 +428,7 @@ begin
UserOverridesAddButton.Caption := dlgEdAdd;
UserOverridesEditButton.Caption := dlgEdEdit;
UserOverridesDeleteButton.Caption := dlgEdDelete;
UserOverridesDeleteButton.Caption := lisDelete;
IncludeSystemVariablesCheckBox.Caption := dlgIncludeSystemVariables;
end;

2
ide/useunitdlg.pas
View File

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

2
ide/viewunit_dlg.pp
View File

@ -152,7 +152,7 @@ begin
IDEDialogLayoutList.ApplyLayout(Self,450,300);
//ActiveControl:=FilterEdit;
mniMultiSelect.Caption := dlgMultiSelect;
ButtonPanel.OKButton.Caption:=lisOk;
ButtonPanel.OKButton.Caption:=lisMenuOk;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;

2
lcl/lclstrconsts.pas
View File

@ -348,7 +348,7 @@ resourceString
ifsVK_EXECUTE = 'Execute';
ifsVK_SNAPSHOT = 'Snapshot';
ifsVK_INSERT = 'Insert';
ifsVK_DELETE = 'Delete'; //= dlgeddelete
ifsVK_DELETE = 'Delete'; //= lisdelete
ifsVK_HELP = 'Help';
ifsCtrl = 'Ctrl';
ifsAlt = 'Alt';

2
packager/addfiletoapackagedlg.pas
View File

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

2
packager/addtopackagedlg.pas
View File

@ -1207,7 +1207,7 @@ begin
end;
with FilesDeleteButton do begin
Caption:=dlgEdDelete;
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
LoadGlyphFromLazarusResource('laz_delete');

2
packager/basepkgmanager.pas
View File

@ -209,7 +209,7 @@ begin
Description:=Format(lisPkgMangProject, [ExtractFileNameOnly(TProject(
DepOwner).ProjectInfoFile)]);
end else if (DepOwner=PkgBoss) or (DepOwner=PackageGraph) then begin
Description:=lisPkgMangLazarus;
Description:=lisLazarus;
end else begin
Description:=dbgsName(DepOwner)
end;

2
packager/missingpkgfilesdlg.pas
View File

@ -123,7 +123,7 @@ begin
if i>0 then begin
ButtonPanel1.OKButton.Caption:=lisPERemoveFiles;
end else begin
ButtonPanel1.OKButton.Caption:=lisOk;
ButtonPanel1.OKButton.Caption:=lisMenuOk;
end;
end;

2
packager/packageeditor.pas
View File

@ -1295,7 +1295,7 @@ begin
UseBitBtn := CreateToolButton('UseBitBtn', lisPckEditInstall, lisPckEditInstallPackageInTheIDE, 'pkg_install', nil);
CreateDivider;
AddBitBtn := CreateToolButton('AddBitBtn', lisAdd, lisPckEditAddAnItem, 'laz_add', @AddBitBtnClick);
RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisExtToolRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick);
RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick);
CreateDivider;
OptionsBitBtn := CreateToolButton('OptionsBitBtn', dlgFROpts, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick);
HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick);