paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 05:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Unite duplicate (single word) resourcestrings and name them consistently.

Browse Source 
git-svn-id: trunk@35486 -
This commit is contained in:
juha 2012-02-19 15:50:48 +00:00
parent 55e336c787
commit a0fb17b27e
27 changed files with 97 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
converter/chgencodingdlg.pas
View File

@ -107,9 +107,9 @@ begin
FileFilterLabel.Caption:=lisFilter;
RegExprCheckBox.Caption:=lisRegularExpression;
CloseButton.Caption:=lisMenuClose;
CloseButton.Caption:=lisClose;
ApplyButton.Caption:=lisConvert;
HelpButton.Caption:=dlgGroupHelp;
HelpButton.Caption:=lisHelp;
CloseButton.LoadGlyphFromLazarusResource('btn_close');
ApplyButton.LoadGlyphFromLazarusResource('btn_ok');
HelpButton.LoadGlyphFromLazarusResource('btn_help');

4
converter/convertsettings.pas
View File

@ -720,8 +720,8 @@ begin
FuncReplaceButton.Caption:=lisEdit;
FuncReplaceDivider.Hint:=lisConvFuncReplHint;
FuncReplaceButton.Hint:=lisConvFuncReplHint;
FuncReplaceComboBox.Items.Add(lisDisabled); // 'Disabled'
FuncReplaceComboBox.Items.Add(lisEnabled); // 'Enabled'
FuncReplaceComboBox.Items.Add(lisDisabled);
FuncReplaceComboBox.Items.Add(lisEnabled);
// Coordinate Offsets
CoordOffsDivider.Caption:=lisConvCoordOffs;
CoordOffsButton.Caption:=lisEdit;

10
debugger/breakpointsdlg.pp
View File

@ -337,19 +337,19 @@ begin
actDisableSelected.Hint := lisDbgItemDisableHint;
actDisableSelected.ImageIndex := IDEImages.LoadImage(16, 'debugger_disable');
actDeleteSelected.Caption := liswlDelete; //lisDbgItemDelete;
actDeleteSelected.Caption := lisBtnDelete;
actDeleteSelected.Hint := lisDbgItemDeleteHint;
actDeleteSelected.ImageIndex := IDEImages.LoadImage(16, 'laz_delete');
actEnableAll.Caption := lisEnableAll; //lisDbgAllItemEnable;
actEnableAll.Caption := lisEnableAll;
actEnableAll.Hint := lisDbgAllItemEnableHint;
actEnableAll.ImageIndex := IDEImages.LoadImage(16, 'debugger_enable_all');
actDisableAll.Caption := liswlDIsableAll; //lisDbgAllItemDisable;
actDisableAll.Caption := liswlDIsableAll;
actDisableAll.Hint := lisDbgAllItemDisableHint;
actDisableAll.ImageIndex := IDEImages.LoadImage(16, 'debugger_disable_all');
actDeleteAll.Caption := lisDeleteAll; //lisDbgAllItemDelete;
actDeleteAll.Caption := lisDeleteAll;
actDeleteAll.Hint := lisDbgAllItemDeleteHint;
actDeleteAll.ImageIndex := IDEImages.LoadImage(16, 'menu_clean');
@ -357,7 +357,7 @@ begin
actProperties.Hint := lisDbgBreakpointPropertiesHint;
actProperties.ImageIndex := IDEImages.LoadImage(16, 'menu_environment_options');
actToggleCurrentEnable.Caption:= liswlEnabled;
actToggleCurrentEnable.Caption:= lisBtnEnabled;
actEnableAllInSrc.Caption:= lisEnableAllInSameSource;
actDisableAllInSrc.Caption:= lisDisableAllInSameSource;

6
debugger/watchesdlg.pp
View File

@ -192,10 +192,10 @@ begin
actPower.Caption := lisDbgWinPower;
actPower.Hint := lisDbgWinPowerHint;
actAddWatch.Caption:=liswlAdd;
actAddWatch.Caption:=lisBtnAdd;
actAddWatch.ImageIndex := IDEImages.LoadImage(16, 'laz_add');
actToggleCurrentEnable.Caption := liswlEnabled;
actToggleCurrentEnable.Caption := lisBtnEnabled;
actEnableSelected.Caption := lisDbgItemEnable;
actEnableSelected.Hint := lisDbgItemEnableHint;
@ -205,7 +205,7 @@ begin
actDisableSelected.Hint := lisDbgItemDisableHint;
actDisableSelected.ImageIndex := IDEImages.LoadImage(16, 'debugger_disable');
actDeleteSelected.Caption := liswlDelete; //lisDbgItemDelete;
actDeleteSelected.Caption := lisBtnDelete;
actDeleteSelected.Hint := lisDbgItemDeleteHint;
actDeleteSelected.ImageIndex := IDEImages.LoadImage(16, 'laz_delete');

32
designer/designermenu.pp
View File

@ -998,14 +998,14 @@ begin
case TemplateMenuForm.GetSelectedMenuTemplate of
1: Begin
// Change a caption of selected designermenuitem fo "File"
ChangeCaption (temp_designermenuitem, lisMenuTemplateFile);
ChangeCaption (temp_designermenuitem, lisFile);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add an submenu with first item and set it's caption to "New"
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddSubMenuClick(self);
temp_designermenuitem:=temp_designermenuitem.SubMenu;
ChangeCaption (temp_designermenuitem, lisMenuTemplateNew);
ChangeCaption (temp_designermenuitem, lisNew);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add new separator
@ -1019,7 +1019,7 @@ begin
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddNewItemAfterClick(self);
temp_designermenuitem:=temp_designermenuitem.NextItem;
ChangeCaption (temp_designermenuitem, lisMenuTemplateOpen);
ChangeCaption (temp_designermenuitem, lisOpen);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add new item and set it's caption to "Open Recent"
@ -1033,21 +1033,21 @@ begin
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddNewItemAfterClick(self);
temp_designermenuitem:=temp_designermenuitem.NextItem;
ChangeCaption (temp_designermenuitem, lisMenuTemplateSave);
ChangeCaption (temp_designermenuitem, lisSave);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add new item and set it's caption to "Save As"
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddNewItemAfterClick(self);
temp_designermenuitem:=temp_designermenuitem.NextItem;
ChangeCaption (temp_designermenuitem, lisMenuTemplateSaveAs);
ChangeCaption (temp_designermenuitem, lisSaveAs);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add new item and set it's caption to "Close"
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddNewItemAfterClick(self);
temp_designermenuitem:=temp_designermenuitem.NextItem;
ChangeCaption (temp_designermenuitem, lisMenuTemplateClose);
ChangeCaption (temp_designermenuitem, lisClose);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add new separator
@ -1061,7 +1061,7 @@ begin
SelectedDesignerMenuItem:=temp_designermenuitem.ID;
AddNewItemAfterClick(self);
temp_designermenuitem:=temp_designermenuitem.NextItem;
ChangeCaption (temp_designermenuitem, lisMenuTemplateExit);
ChangeCaption (temp_designermenuitem, lisExit);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
end;
2: begin
@ -1134,7 +1134,7 @@ begin
end;
3: begin
// Change a caption of selected designermenuitem fo "Help"
ChangeCaption (temp_designermenuitem, lisMenuTemplateHelp);
ChangeCaption (temp_designermenuitem, lisHelp);
UpdateMenu(fMenu.Items, temp_designermenuitem, 1, 6);
// Add an submenu with first item and set it's caption to "Contents"
@ -2117,16 +2117,16 @@ begin
begin
case default_template of
1: begin
ListBoxView.Items.Add(lisMenuTemplateFile);
ListBoxView.Items.Add(' ' + lisMenuTemplateNew);
ListBoxView.Items.Add(lisFile);
ListBoxView.Items.Add(' ' + lisNew);
ListBoxView.Items.Add(' -');
ListBoxView.Items.Add(' ' + lisMenuTemplateOpen);
ListBoxView.Items.Add(' ' + lisOpen);
ListBoxView.Items.Add(' ' + lisMenuTemplateOpenRecent);
ListBoxView.Items.Add(' ' + lisMenuTemplateSave);
ListBoxView.Items.Add(' ' + lisMenuTemplateSaveAs);
ListBoxView.Items.Add(' ' + lisMenuTemplateClose);
ListBoxView.Items.Add(' ' + lisSave);
ListBoxView.Items.Add(' ' + lisSaveAs);
ListBoxView.Items.Add(' ' + lisClose);
ListBoxView.Items.Add(' -');
ListBoxView.Items.Add(' ' + lisMenuTemplateExit);
ListBoxView.Items.Add(' ' + lisExit);
end;
2: begin
ListBoxView.Items.Add(lisEdit);
@ -2141,7 +2141,7 @@ begin
ListBoxView.Items.Add(' ' + lisMenuTemplateFindNext);
end;
3: begin
ListBoxView.Items.Add(lisMenuTemplateHelp);
ListBoxView.Items.Add(lisHelp);
ListBoxView.Items.Add(' ' + lisMenuTemplateContents);
ListBoxView.Items.Add(' ' + lisMenuTemplateTutorial);
ListBoxView.Items.Add(' -');

2
ide/aboutfrm.pas
View File

@ -189,7 +189,7 @@ begin
LoadContributors;
LoadAcknowledgements;
CloseButton.Caption:=lisClose;
CloseButton.Caption:=lisBtnClose;
end;
procedure TAboutForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);

2
ide/buildmodediffdlg.pas
View File

@ -85,7 +85,7 @@ begin
ModeLabel.Caption:=lisBuildModeDiffMode;
DiffsGroupBox.Caption:=lisBuildModeDiffDifferencesToOtherBuildModes;
ButtonPanel.CloseButton.Caption:=lisClose;
ButtonPanel.CloseButton.Caption:=lisBtnClose;
end;
procedure TBuildModeDiffDialog.ModeComboBoxChange(Sender: TObject);

2
ide/charactermapdlg.pas
View File

@ -101,7 +101,7 @@ procedure TCharacterMapDialog.FormCreate(Sender: TObject);
begin
Caption := lisCharacterMap;
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CloseButton.Caption:=lisClose;
ButtonPanel.CloseButton.Caption:=lisBtnClose;
//EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name);
CharInfoLabel.Caption := '-';

2
ide/codebrowser.pas
View File

@ -467,7 +467,7 @@ begin
ExpandAllClassesMenuItem.Caption:=lisExpandAllClasses;
CollapseAllClassesMenuItem.Caption:=lisCollapseAllClasses;
ExportMenuItem.Caption:=lisExport;
OpenMenuItem.Caption:=lisHintOpen;
OpenMenuItem.Caption:=lisOpen;
// UsePkgInProjectMenuItem.Caption: see PopupMenu1Popup
// UsePkgInCurUnitMenuItem.Caption: see PopupMenu1Popup
// UseUnitInCurUnitMenuItem.Caption: see PopupMenu1Popup

4
ide/condef.pas
View File

@ -170,9 +170,9 @@ var
begin
NewTestGroupBox.Caption := rsCreateNewDefine;
Caption := rsConditionalDefines;
AddBtn.Caption := liswlAdd;
AddBtn.Caption := lisBtnAdd;
AddInverse.Caption := rsAddInverse;
RemoveBtn.Caption := rsRemove;
RemoveBtn.Caption := lisBtnRemove;
ButtonPanel.HelpButton.OnClick := @HelpButtonClick;
try
XMLConfig:=CreateXMLConfig;

4
ide/diffdialog.pas
View File

@ -271,9 +271,9 @@ begin
// buttons
CancelScanningButton.LoadGlyphFromLazarusResource('btn_cancel');
CloseButton.Caption:=lisMenuClose;
CloseButton.Caption:=lisClose;
OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor;
SaveDiffButton.Caption:=lisSave;
SaveDiffButton.Caption:=lisDlgSave;
HelpButton.Caption:=lisMenuHelp;
OpenInEditorButton.LoadGlyphFromStock(idButtonOpen);

2
ide/editorfilemanager.pas
View File

@ -91,7 +91,7 @@ begin
// Captions
Caption:=lisEditorWindowManager;
ActivateMenuItem.Caption:=lisActivate;
CloseMenuItem.Caption:=lisMenuClose;
CloseMenuItem.Caption:=lisClose;
SelectAllCheckBox.Caption:=lisCheckAll;
SaveCheckedButton.Caption:=lisSaveAllChecked;
CloseCheckedButton.Caption:=lisCloseAllChecked;

4
ide/editoroptions.pp
View File

@ -535,7 +535,7 @@ const
EditorOptionsFoldInfoDiff: Array [0..2] of TEditorOptionsFoldInfo
= (
( Name: dlgFoldDiffFile;
( Name: lisFile;
Xml: 'File';
Index: ord(cfbtDiffFile);
Enabled: True
@ -1779,7 +1779,7 @@ begin
EditorOptionsFoldInfoXML[3].Name := dlgFoldXmlDocType;
EditorOptionsFoldInfoXML[4].Name := dlgFoldXmlProcess;
EditorOptionsFoldInfoDiff[0].Name := dlgFoldDiffFile;
EditorOptionsFoldInfoDiff[0].Name := lisFile;
EditorOptionsFoldInfoDiff[1].Name := dlgFoldDiffChunk;
EditorOptionsFoldInfoDiff[2].Name := dlgFoldDiffChunkSect;

2
ide/fpdoceditwindow.pas
View File

@ -274,7 +274,7 @@ begin
OpenXMLButton.Enabled:=false;
SaveButton.Caption := '';
SaveButton.Enabled:=false;
SaveButton.Hint:=lisHintSave;
SaveButton.Hint:=lisSave;
SaveButton.ShowHint:=true;
BrowseExampleButton.Caption := lisCodeHelpBrowseExampleButton;

2
ide/helpoptions.pas
View File

@ -102,7 +102,7 @@ end;
class function THelpOptions.GetGroupCaption: string;
begin
Result := dlgGroupHelp;
Result := lisHelp;
end;
class function THelpOptions.GetInstance: TAbstractIDEOptions;

2
ide/infobuild.pp
View File

@ -246,7 +246,7 @@ procedure TCompileInfoDlg.SetCanClose;
begin
ToAbort := False;
BClose.Kind := bkOk;
BClose.Caption := lisMenuClose;
BClose.Caption := lisClose;
if cbAutoCloseOnSuccess.Checked and (NErrors = 0) then
tmrCloseForm.Enabled := True;
end;

6
ide/initialsetupdlgs.pas
View File

@ -241,7 +241,7 @@ begin
Result:=sddqWrongVersion;
exit;
end;
Note:=rsOk;
Note:=lisOk;
Result:=sddqCompatible;
except
on E: Exception do begin
@ -411,7 +411,7 @@ begin
end;
end;
Note:=rsOk;
Note:=lisOk;
Result:=sddqCompatible;
end;
@ -674,7 +674,7 @@ begin
end;
end;
end;
Note:=rsOk;
Note:=lisOk;
Result:=sddqCompatible;
end;

24
ide/keymapping.pp
View File

@ -427,14 +427,14 @@ begin
ecNewForm : Result:= lisMenuNewForm;
ecOpen : Result:= lisMenuOpen;
ecRevert : Result:= lisMenuRevert;
ecSave : Result:= srkmecSave;
ecSave : Result:= lisSave;
ecSaveAs : Result:= lisMenuSaveAs;
ecSaveAll : Result:= lisMenuSaveAll;
ecClose : Result:= lisMenuClose;
ecSaveAll : Result:= lisSaveAll;
ecClose : Result:= lisClose;
ecCloseAll : Result:= lisMenuCloseAll;
ecCleanDirectory : Result:= lisMenuCleanDirectory;
ecRestart : Result:= lisMenuRestart;
ecQuit : Result:= srkmecQuit;
ecRestart : Result:= lisRestart;
ecQuit : Result:= lisQuit;
// edit menu
ecSelectionUpperCase : Result:= lisMenuUpperCaseSelection;
@ -2727,19 +2727,19 @@ begin
// file menu
C:=Categories[AddCategory('FileMenu',srkmCatFileMenu,nil)];
AddDefault(C, 'New', lisMenuTemplateNew, ecNew);
AddDefault(C, 'New', lisNew, ecNew);
AddDefault(C, 'NewUnit', lisKMNewUnit, ecNewUnit);
AddDefault(C, 'NewForm', lisMenuNewForm, ecNewForm);
AddDefault(C, 'Open', lisHintOpen, ecOpen);
AddDefault(C, 'Open', lisOpen, ecOpen);
AddDefault(C, 'Revert', lisMenuRevert, ecRevert);
AddDefault(C, 'Save', srkmecSave, ecSave);
AddDefault(C, 'Save', lisSave, ecSave);
AddDefault(C, 'SaveAs', lisKMSaveAs, ecSaveAs);
AddDefault(C, 'SaveAll', lisKMSaveAll, ecSaveAll);
AddDefault(C, 'Close', lisMenuClose, ecClose);
AddDefault(C, 'CloseAll', lisKMCloseAll, ecCloseAll);
AddDefault(C, 'Close', lisClose, ecClose);
AddDefault(C, 'CloseAll', lisCloseAll, ecCloseAll);
AddDefault(C, 'Clean Directory', lisClDirCleanDirectory, ecCleanDirectory);
AddDefault(C, 'Restart', lisMenuRestart, ecRestart);
AddDefault(C, 'Quit', srkmecQuit, ecQuit);
AddDefault(C, 'Restart', lisRestart, ecRestart);
AddDefault(C, 'Quit', lisQuit, ecQuit);
// view menu
C:=Categories[AddCategory(CommandCategoryViewName,srkmCatViewMenu,nil)];

67
ide/lazarusidestrconsts.pas
View File

@ -43,28 +43,47 @@ resourcestring
// Common strings that can be used around Lazarus:
lisLazarus = 'Lazarus';
lisAdd = 'Add';
lisBtnAdd = '&Add';
lisInsert = 'Insert';
lisChange = 'Change';
lisDelete = 'Delete';
lisBtnDelete = '&Delete';
lisRemove = 'Remove';
lisBtnRemove = '&Remove';
lisRename = 'Rename';
lisReplace = 'Replace';
lisBtnReplace = '&Replace';
lisBtnDlgReplace = '&Replace ...';
lisEdit = 'Edit';
lisOpen = 'Open';
lisSave = 'Save';
lisDlgSave = 'Save ...';
lisSaveAs = 'Save As';
lisSaveAll = 'Save All';
lisCloseAll = 'Close All';
lisFile = 'File';
lisNew = 'New';
lisClose = 'Close';
lisBtnClose = '&Close';
lisOk = 'OK';
lisMenuOk = '&OK';
rsOk = 'OK';
lisCancel = 'Cancel';
// lisYes = 'Yes';
lisNo = 'No';
lisContinue = 'Continue';
lisBreak = 'Break';
lisExit = 'Exit';
lisQuit = 'Quit';
lisBtnQuit = '&Quit';
lisRestart = 'Restart';
lisHelp = 'Help';
lisEnabled = 'Enabled';
lisBtnEnabled = '&Enabled';
lisUndo = 'Undo';
lisRedo = 'Redo';
lisCut = 'Cut';
lisCopy = 'Copy';
lisPaste = 'Paste';
lisDown = 'Down';
lisUp = 'Up';
lisRight = 'Right';
@ -205,19 +224,14 @@ resourcestring
lisDoNotCloseTheProject = 'Do not close the project';
lisDoNotCloseTheIDE = 'Do not close the IDE';
lisMenuSaveAs = 'Save &As ...';
lisMenuSaveAll = 'Save All';
lisMenuClose = 'Close';
lisConvert = 'Convert';
lisPLDOnlyExistingFiles = 'Only existing files';
lisPLDShowGlobalLinks = 'Show global links';
lisPLDShowUserLinks = 'Show user links';
lisPLDGlobal = 'Global';
lisKMCloseAll = 'Close All';
lisCTDefDefineTemplates = 'Define templates';
lisMenuCloseAll = 'Close A&ll Editor Files';
lisMenuCleanDirectory = 'Clean Directory ...';
lisMenuQuit = '&Quit';
lisMenuRestart = 'Restart';
lisMenuIndentSelection = 'Indent Selection';
lisMenuUnindentSelection = 'Unindent Selection';
@ -274,9 +288,7 @@ resourcestring
lisMenuFind2 = '&Find ...';
lisMenuFindPrevious = 'Find &Previous';
lisMenuFindInFiles = 'Find &in Files ...';
lisBtnReplace = '&Replace';
lisMenuIncrementalFind = 'Incremental Find';
lisMenuReplace2 = '&Replace ...';
lisMenuGotoLine = 'Goto Line ...';
lisMenuJumpBack = 'Jump Back';
lisMenuJumpForward = 'Jump Forward';
@ -787,8 +799,7 @@ resourcestring
lisError = 'Error: ';
lisWarning = 'Warning: ';
lisSaveChanges = 'Save changes?';
lisSaveFileBeforeClosingForm =
'Save file %s%s%s%sbefore closing form %s%s%s?';
lisSaveFileBeforeClosingForm = 'Save file %s%s%s%sbefore closing form %s%s%s?';
lisUnableToRenameFormInSource = 'Unable to rename form in source.';
lisTheComponentIsInheritedFromToRenameAnInheritedComp = 'The component %s '
+'is inherited from %s.%sTo rename an inherited component open the '
@ -897,7 +908,6 @@ resourcestring
lisDate = 'Date';
lisFPCVersion = 'FPC Version: ';
lisSVNRevision = 'SVN Revision: ';
lisClose = '&Close';
lisAboutLazarusMsg =
'License: GPL/LGPL. See Lazarus and Free Pascal sources for license details.'
+'%s'
@ -932,8 +942,6 @@ resourcestring
lisActivateSelected = 'Activate Selected';
// hints
lisHintOpen = 'Open';
lisHintSave = 'Save';
lisHintSaveAll = 'Save all';
lisHintToggleFormUnit = 'Toggle Form/Unit';
lisHintViewUnits = 'View Units';
@ -1023,7 +1031,6 @@ resourcestring
lisUnexpectedResultTheDebuggerWillTerminate = 'Unexpected result:%sThe '
+'debugger will terminate';
lisResponseContinue = 'Response: %sContinue ?';
dlgGroupHelp = 'Help';
// Options dialog
dlgIDEOptions = 'IDE Options';
@ -1225,10 +1232,7 @@ resourcestring
dlgPropNameColor = 'Property Name';
dlgGutterEdgeColor = 'Gutter Edge Color';
liswlAdd = '&Add';
liswlProperties = '&Properties';
liswlEnabled = '&Enabled';
liswlDelete = '&Delete';
liswlDIsableAll = 'D&isable All';
liswlENableAll = 'E&nable All';
liswlDeLeteAll = 'De&lete All';
@ -1663,7 +1667,6 @@ resourcestring
dlgFoldHtmlComment = 'Comment';
dlgFoldHtmlAsp = 'ASP';
dlgFoldDiffFile = 'File';
dlgFoldDiffChunk = 'Chunk';
dlgFoldDiffChunkSect = 'Chunk section';
@ -1676,7 +1679,6 @@ resourcestring
dlgMouseFoldGroup1 = 'Setting 1';
dlgMouseFoldGroup2 = 'Setting 2';
dlgMouseFoldEnabled = 'Enabled';
dlgMouseFoldButton = 'Button';
dlgMouseFoldButtonLeft = 'Left';
dlgMouseFoldButtonMiddle = 'Middle';
@ -2542,9 +2544,6 @@ resourcestring
srkmecBlockIndent = 'Indent block';
srkmecBlockUnindent = 'Unindent block';
srkmecSave = 'Save';
srkmecQuit = 'Quit';
srkmecBlockSetBegin = 'Set block begin';
srkmecBlockSetEnd = 'Set block end';
srkmecBlockToggleHide = 'Toggle block';
@ -2906,7 +2905,6 @@ resourcestring
// Unit dependencies
dlgUnitDepCaption = 'Unit Dependencies';
dlgUnitDepBrowse = 'Open';
dlgUnitDepRefresh = 'Refresh';
// Doc Editor
@ -3252,7 +3250,6 @@ resourcestring
lisDiffDlgIgnoreIfSpaceCharsWereAdd = 'Ignore amount of space chars';
lisDiffDlgIgnoreSpaces = 'Ignore spaces (newline chars not included)';
lisDiffDlgOpenDiffInEditor = 'Open Diff in editor';
lisSave = 'Save ...';
// packages
lisPkgFileTypeUnit = 'Unit';
@ -4083,7 +4080,6 @@ resourcestring
lisClickToSeeThePossibleUses = 'Click to see the possible uses';
lisPckEditEditGeneralOptions = 'Edit General Options';
lisPckEditCompOpts = 'Compiler Options';
lisPckEditHelp = 'Help';
lisPkgEdThereAreMoreFunctionsInThePopupmenu = 'There are more functions in '
+'the popupmenu';
lisPckEditMore = 'More >>';
@ -4219,30 +4215,16 @@ resourcestring
// Standard File menu
lisMenuTemplateDescriptionStandardFileMenu = 'Standard File Menu';
lisMenuTemplateFile = 'File';
lisMenuTemplateNew = 'New';
lisKMNewUnit = 'New Unit';
lisMenuTemplateOpen = 'Open';
lisMenuTemplateOpenRecent = 'Open Recent';
lisMenuTemplateSave = 'Save';
lisMenuTemplateSaveAs = 'Save As';
lisMenuTemplateClose = 'Close';
lisMenuTemplateExit = 'Exit';
// Standard Edit menu
lisMenuTemplateDescriptionStandardEditMenu = 'Standard Edit Menu';
//lisMenuTemplateEdit = 'Edit';
//lisMenuTemplateUndo = 'Undo';
//lisMenuTemplateRedo = 'Redo';
//lisMenuTemplateCut = 'Cut';
//lisMenuTemplateCopy = 'Copy';
//lisMenuTemplatePaste = 'Paste';
lisMenuTemplateFind = 'Find';
lisMenuTemplateFindNext = 'Find Next';
// Standard Help menu
lisMenuTemplateDescriptionStandardHelpMenu = 'Standard Help Menu';
lisMenuTemplateHelp = 'Help';
lisMenuTemplateContents = 'Contents';
lisMenuTemplateTutorial = 'Tutorial';
lisMenuTemplateAbout = 'About';
@ -4486,7 +4468,6 @@ resourcestring
lisOpenXML = 'Open XML';
lisCodeHelpInsertALink = 'Insert a link ...';
lisCodeHelpInsertParagraphFormattingTag = 'Insert paragraph formatting tag';
lisCodeHelpSaveButton = 'Save';
lisCodeHelpExampleTag = 'Example';
lisCodeHelpBrowseExampleButton = 'Browse';
lisLDMoveEntriesToInherited = 'Move entries to inherited';
@ -4526,7 +4507,6 @@ resourcestring
lisLeftSiblingComboBoxHint = 'This is the sibling control to which the left side is anchored. Leave empty for parent.';
lisBorderSpace = 'Border space';
lisSibling = 'Sibling';
lisEnabled = 'Enabled';
lisRightAnchoring = 'Right anchoring';
lisTopAnchoring = 'Top anchoring';
lisLeftGroupBoxCaption = 'Left anchoring';
@ -4610,7 +4590,6 @@ resourcestring
rsCreateNewDefine = 'Create new define';
rsConditionalDefines = 'Conditional defines';
rsAddInverse = 'Add Inverse';
rsRemove = '&Remove';
lisAutomaticallyOnLineBreak = 'line break';
lisAutomaticallyOnSpace = 'space';
lisAutomaticallyOnWordEnd = 'word end';

8
ide/main.pp
View File

@ -1937,8 +1937,8 @@ begin
MainIDEBar.NewUnitSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'NewUnitSpeedBtn' , 'item_unit' , @mnuNewUnitClicked, lisMenuNewUnit);
MainIDEBar.NewFormSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'NewFormSpeedBtn' , 'item_form' , @mnuNewFormClicked, lisMenuNewForm);
MainIDEBar.tbDivider1 := CreateDivider(MainIDEBar.tbStandard);
MainIDEBar.OpenFileSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'OpenFileSpeedBtn' , 'laz_open' , @mnuOpenClicked, lisHintOpen);
MainIDEBar.SaveSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'SaveSpeedBtn' , 'laz_save' , @mnuSaveClicked, lisHintSave);
MainIDEBar.OpenFileSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'OpenFileSpeedBtn' , 'laz_open' , @mnuOpenClicked, lisOpen);
MainIDEBar.SaveSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'SaveSpeedBtn' , 'laz_save' , @mnuSaveClicked, lisSave);
MainIDEBar.SaveAllSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'SaveAllSpeedBtn' , 'menu_save_all' , @mnuSaveAllClicked, lisHintSaveAll);
MainIDEBar.tbDivider2 := CreateDivider(MainIDEBar.tbStandard);
MainIDEBar.ToggleFormSpeedBtn := CreateButton(MainIDEBar.tbStandard , 'ToggleFormSpeedBtn' , 'menu_view_toggle_form_unit', @mnuToggleFormUnitCLicked, lisHintToggleFormUnit);
@ -3011,7 +3011,7 @@ begin
r := QuestionDlg(lisSourceModified,
Format(lisSourceOfPageHasChangedSaveExtended, ['"', Ed.PageName, '"', NeedSave]),
mtConfirmation,
[mrYes, lisMenuSave, mrAll, lisMenuSaveAll,
[mrYes, lisMenuSave, mrAll, lisSaveAll,
mrNo, lisDiscardChanges, mrIgnore, lisDiscardChangesAll,
mrAbort], 0);
case r of
@ -3098,7 +3098,7 @@ begin
r := QuestionDlg(lisSourceModified,
Format(lisSourceOfPageHasChangedSaveExtended, ['"', Ed.PageName, '"', NeedSave]),
mtConfirmation,
[mrYes, lisMenuSave, mrAll, lisMenuSaveAll,
[mrYes, lisMenuSave, mrAll, lisSaveAll,
mrNo, lisDiscardChanges, mrIgnore, lisDiscardChangesAll,
mrAbort], 0);
case r of

11
ide/mainbase.pas
View File

@ -380,8 +380,8 @@ begin
CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent);
CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'laz_save');
CreateMenuItem(ParentMI,itmFileSaveAs,'itmFileSaveAs',lisMenuSaveAs,'menu_saveas');
CreateMenuItem(ParentMI,itmFileSaveAll,'itmFileSaveAll',lisMenuSaveAll,'menu_save_all');
CreateMenuItem(ParentMI,itmFileClose,'itmFileClose',lisMenuClose,'menu_close',false);
CreateMenuItem(ParentMI,itmFileSaveAll,'itmFileSaveAll',lisSaveAll,'menu_save_all');
CreateMenuItem(ParentMI,itmFileClose,'itmFileClose',lisClose,'menu_close',false);
CreateMenuItem(ParentMI,itmFileCloseAll,'itmFileCloseAll',lisMenuCloseAll,'menu_close_all',false);
CreateMenuSeparatorSection(mnuFile,itmFileDirectories,'itmFileDirectories');
@ -390,8 +390,8 @@ begin
CreateMenuSeparatorSection(mnuFile,itmFileIDEStart,'itmFileIDEStart');
ParentMI:=itmFileIDEStart;
CreateMenuItem(ParentMI,itmFileRestart,'itmFileRestart',lisMenuRestart, 'laz_refresh');
CreateMenuItem(ParentMI,itmFileQuit,'itmFileQuit',lisMenuQuit, 'menu_exit');
CreateMenuItem(ParentMI,itmFileRestart,'itmFileRestart',lisRestart, 'laz_refresh');
CreateMenuItem(ParentMI,itmFileQuit,'itmFileQuit',lisBtnQuit, 'menu_exit');
end;
end;
@ -452,8 +452,7 @@ begin
CreateMenuItem(ParentMI,itmSearchFindNext,'itmSearchFindNext',lisMenuFindNext, 'menu_search_find_next');
CreateMenuItem(ParentMI,itmSearchFindPrevious,'itmSearchFindPrevious',lisMenuFindPrevious, 'menu_search_find_previous');
CreateMenuItem(ParentMI,itmSearchFindInFiles,'itmSearchFindInFiles',lisMenuFindInFiles, 'menu_search_files');
CreateMenuItem(ParentMI, itmSearchReplace, 'itmSearchReplace',
lisMenuReplace2, 'menu_search_replace');
CreateMenuItem(ParentMI, itmSearchReplace, 'itmSearchReplace', lisBtnDlgReplace, 'menu_search_replace');
CreateMenuItem(ParentMI,itmIncrementalFind,'itmIncrementalFind',lisMenuIncrementalFind, 'menu_search_incremental');
CreateMenuSeparatorSection(mnuSearch,itmJumpings,'itmJumpings');

2
ide/msgview.pp
View File

@ -271,7 +271,7 @@ begin
MsgCopyAllMenuItem := RegisterIDEMenuCommand(Path, 'Copy all',lisCopyAllShownMessagesToClipboard);
MsgCopyAllAndHiddenMenuItem := RegisterIDEMenuCommand(Path,
'Copy all, including hidden messages',lisCopyAllShownAndHiddenMessagesToClipboard);
MsgHelpMenuItem := RegisterIDEMenuCommand(Path, 'Help for message',lisPckEditHelp);
MsgHelpMenuItem := RegisterIDEMenuCommand(Path, 'Help for message',lisHelp);
MsgEditHelpMenuItem := RegisterIDEMenuCommand(Path, 'Edit help for messages',lisEditHelp);
MsgSaveAllToFileMenuItem :=
RegisterIDEMenuCommand(Path, 'Copy selected',lisSaveAllMessagesToFile);

2
ide/showcompileropts.pas
View File

@ -88,7 +88,7 @@ begin
CmdLineGroupBox.Caption:=dlgCommandLineParameters;
Self.Caption:=dlgCompilerOptions;
RelativePathsCheckBox.Caption:=lisRelativePaths;
CloseButton.Caption:=lisClose;
CloseButton.Caption:=lisBtnClose;
end;
procedure TShowCompilerOptionsDlg.SetCompilerOpts(

4
ide/unitdependencies.pas
View File

@ -422,10 +422,10 @@ begin
RefreshHistoryList;
SelectUnitButton.Caption:=dlgUnitDepBrowse;
SelectUnitButton.Caption:=lisOpen;
RefreshButton.Caption:=dlgUnitDepRefresh;
ShowProjectButton.Caption:=dlgEnvProject;
CloseButton.Caption:=lisClose;
CloseButton.Caption:=lisBtnClose;
UnitTreeView.Images := IDEImages.Images_16;
ToolBar.Images := IDEImages.Images_16;
ShowProjectButton.ImageIndex := IDEImages.LoadImage(16, 'item_project');

2
packager/addfiletoapackagedlg.pas
View File

@ -212,7 +212,7 @@ procedure TAddFileToAPackageDialog.SetupComponents;
var
pft: TPkgFileType;
begin
FileGroupBox.Caption:=dlgFoldDiffFile;
FileGroupBox.Caption:=lisFile;
FileNameEdit.Text:='';
UnitNameLabel.Caption:=lisAF2PUnitName;
UnitNameEdit.Text:='';

4
packager/openinstalledpkgdlg.pas
View File

@ -156,9 +156,9 @@ begin
NewColumn.Width:=300;
end;
OpenButton.Caption:=lisMenuTemplateOpen;
OpenButton.Caption:=lisOpen;
CancelButton.Caption:=lisCancel;
HelpButton.Caption:=dlgGroupHelp;
HelpButton.Caption:=lisHelp;
end;
procedure TOpenInstalledPackagesDlg.HelpButtonClick(Sender: TObject);

2
packager/pkglinksdlg.pas
View File

@ -99,7 +99,7 @@ end;
procedure TPackageLinksDialog.FormCreate(Sender: TObject);
begin
Caption:=lisPLDPackageLinks;
CloseBitBtn.Caption:=lisMenuClose;
CloseBitBtn.Caption:=lisClose;
ScopeGroupBox.Caption:=dlgScope;
FileMustExistCheckBox.Caption:=lisPLDOnlyExistingFiles;
ShowGlobalLinksCheckBox.Caption:=lisPLDShowGlobalLinks