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

IDE: menu designer: improve resourcestrings. By Howard Page-Clark

Browse Source 
git-svn-id: trunk@51263 -
This commit is contained in:
ondrej 2016-01-12 23:09:39 +00:00
parent 094f14ccb8
commit 488a24c48b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
designer/menushadows.pp
View File

@ -2140,8 +2140,8 @@ begin
FButtonPanel.OKButton.Enabled:=False;
FSelectedInfo:=nil;
FConflictsListBox.OnSelectionChange:=nil;
FConflictsListBox.Items.Add(Format(lisMenuEditorNoShortcutConflictsS,['>']));
FCurrentEdit.Text:=Format(lisMenuEditorNoShortcutConflictsS,[lisMenuEditorToResolve]);
FConflictsListBox.Items.Add(lisMenuEditorNoShortcutConflicts);
FCurrentEdit.Text:=lisMenuEditorNoShortcutConflictsToResolve;
FResolvedConflictsCountLabel.Caption:=Format(lisMenuEditorResolvedConflictsS,['0']);
FRemainingConflictsCountLabel.Caption:=Format(lisMenuEditorRemainingConflictsS,['0']);
end;
@ -2167,7 +2167,7 @@ begin
FRemainingConflictsCountLabel.Caption:=Format(lisMenuEditorRemainingConflictsS,['0']);
FResolvedConflictsCountLabel.Caption:=Format(
lisMenuEditorResolvedConflictsS, [FInitialConflictsCount]);
FConflictsListBox.Items.Add(Format(lisMenuEditorNoShortcutConflictsS,[lisMenuEditorRemain]));
FConflictsListBox.Items.Add(lisMenuEditorNoShortcutConflictsRemain);
FCurrentEdit.Text:=lisMenuEditorConflictResolutionComplete;
FButtonPanel.CancelButton.Caption:=lisBtnClose;
end;
@ -3970,8 +3970,6 @@ begin
with FDualDisplay do begin
Align:=alClient;
BorderSpacing.Around:=Margin;
//Constraints.MinHeight:=200;
//Constraints.MaxHeight:=200;
Parent:=FGBDisplay;
if FSingleMenuOnly then begin
OnDisplayClick:=@DisplaySingleMenuClick;

8
ide/lazarusidestrconsts.pas
View File

@ -4734,8 +4734,6 @@ resourcestring
lisMenuEditorFurtherShortcutConflict = 'Further shortcut conflict';
lisMenuEditorGetHelpToUseThisEditor = 'Get help to use this editor';
lisMenuEditorGrabKey = '&Grab key';
lisMenuEditorGroupIndexDropdownShowsAnyExistingGroups = '&GroupIndex ('
+'dropdown shows any existing groups)';
lisMenuEditorGroupIndexMenuItems = 'GroupIndex,MenuItems';
lisMenuEditorInadequateDescription = 'Inadequate Description';
lisMenuEditorInsertMenuTemplateInto = 'Insert menu template into ';
@ -4760,14 +4758,15 @@ resourcestring
lisMenuEditorNoMenuSelected = '(no menu selected)';
lisMenuEditorNone = '<none>';
lisMenuEditorNoneNone = '<none>,<none>';
lisMenuEditorNoShortcutConflictsS = '<no shortcut conflicts%s';
lisMenuEditorNoShortcutConflicts = '<no shortcut conflicts>';
lisMenuEditorNoShortcutConflictsToResolve = '<no shortcut conflicts to resolve>';
lisMenuEditorNoShortcutConflictsRemain = '<no shortcut conflicts remain>';
lisMenuEditorNoUserSavedTemplates = 'No user-saved templates';
lisMenuEditorOnlyStandardDefaultTemplatesAreAvailable = 'Only standard '
+'default templates are available.';
lisMenuEditorOrClickHeaderToSortByThatColumn = ' or click header to sort by that column';
lisMenuEditorPickAnIconFromS = 'Pick an icon from %s';
lisMenuEditorPopupAssignmentsS = 'Popup assignments: %s';
lisMenuEditorRemain = ' remain>';
lisMenuEditorRemainingConflictsS = 'Remaining conflicts: %s';
lisMenuEditorRemoveAllSeparators = '&Remove all separators';
lisMenuEditorResolvedConflictsS = 'Resolved conflicts: %s';
@ -4813,7 +4812,6 @@ resourcestring
lisMenuEditorTemplates = '&Templates';
lisMenuEditorTemplateSaved = 'Template saved';
lisMenuEditorThereAreNoUserSavedMenuTemplates = 'There are no user-saved menu templates.';
lisMenuEditorToResolve = ' to resolve>';
lisMenuEditorTSCListGetScanListCompNameInvalidIndexDForFScanLis = 'TSCList.'
+'GetScanListCompName: invalid index %d for FScanList';
lisMenuEditorYouHaveToChangeTheShortcutFromSStoAvoidAConflict = 'You have to'