Menu designer: Improve texts in resourcestrings. Issue #29411, patch from Péter Gábor.

git-svn-id: trunk@51311 -

designer/menueditorform.pas

@@ -168,7 +168,7 @@ procedure TMenuDesigner.FormCreate(Sender: TObject);
 begin
   Name:='MenuDesignerWindow';
   Caption:=lisMenuEditorMenuEditor;
-  ButtonsGroupBox.Caption:=lisMenuEditorMoveSeparateDeleteInsertItems;
+  ButtonsGroupBox.Caption:=lisMenuEditorMenuItemActions;
   FEditedMenu:=nil;
   FGUIEnabled:=False;
   LoadFixedButtonGlyphs;
@@ -574,6 +574,7 @@ end;
 procedure TMenuDesigner.UpdateTemplatesCount;
 begin
   FTemplatesSaved:=SavedTemplatesExist;
+  DebugLn('SavedTemplatesExist is %s',[booltostr(FTemplatesSaved)]);
   if not FTemplatesSaved then begin
     FSavedTemplatesCount:=GetSavedTemplatesCount;
     Exit;
@@ -614,8 +615,8 @@ begin
   else begin
     selBox.LastRIValue:=selMI.RadioItem;
     if boxIsRoot then
-      SubmenuGroupBox.Caption:=Format('%s',[lisMenuEditorRootMenu])
+      SubmenuGroupBox.Caption:=lisMenuEditorRootMenu
-    else SubmenuGroupBox.Caption:=Format('%s %s',[selBox.ParentMenuItem.Name, lisMenuEditorSubmenu]);
+    else SubmenuGroupBox.Caption:=Format(lisMenuEditorSSubmenu,[selBox.ParentMenuItem.Name]);
 
     if selMI.RadioItem then begin
       GroupIndexLabel.Caption:=Format(lisMenuEditorSGroupIndexD,

designer/menushadows.pp

@@ -1114,7 +1114,7 @@ begin
   XMLConfig:=TXMLConfig.Create(templateCfgName);
   try
     s:=XMLConfig.GetValue('menu_1/Name/Value', 'missing_Menu_1_Name');
-    Result:=(CompareText(s, 'missing_Menu_1_Name') = 0);
+    Result:=(CompareText(s, 'missing_Menu_1_Name') <> 0);
   finally
     XMLConfig.Free;
   end;
@@ -1654,7 +1654,7 @@ begin
           inf:=MenuDesigner.ShortcutList.FindUniqueInfoForShortcut(newSC);
           IDEMessageDialogAb(lisMenuEditorFurtherShortcutConflict,
                      Format(lisMenuEditorSIsAlreadyInUse,
-                     [ShortCutToText(newSC), inf.Component.Name, LineEnding]),
+                     [ShortCutToText(newSC), inf.Component.Name]),
                      mtWarning, [mbOK], False);
           FEdit.Text:=AmpersandStripped(FOldCaption);
           FEdit.SetFocus;
@@ -1690,7 +1690,7 @@ begin
     begin
       IDEMessageDialogAb(lisMenuEditorShortcutNotYetChanged,
            Format(lisMenuEditorYouHaveToChangeTheShortcutFromSStoAvoidAConflict,
-                  [ShortCutToText(FInfo.Shortcut), LineEnding]),
+                  [ShortCutToText(FInfo.Shortcut)]),
                   mtWarning, [mbOK], False);
       FGrabBox.KeyComboBox.SetFocus;
       Exit;
@@ -1700,7 +1700,7 @@ begin
       inf:=MenuDesigner.ShortcutList.FindUniqueInfoForShortcut(newSC);
       IDEMessageDialogAb(lisMenuEditorFurtherShortcutConflict,
            Format(lisMenuEditorSIsAlreadyInUse,
-                  [ShortCutToText(newSC), inf.Component.Name, LineEnding]),
+                  [ShortCutToText(newSC), inf.Component.Name]),
                   mtWarning, [mbOK], False);
       FGrabBox.KeyComboBox.SetFocus;
     end
@@ -1941,7 +1941,7 @@ begin
     FSelectedInfo:=nil;
     FConflictsListBox.OnSelectionChange:=nil;
     FConflictsListBox.Items.Add(lisMenuEditorNoShortcutConflicts);
-    FCurrentEdit.Text:=lisMenuEditorNoShortcutConflictsToResolve;
+    FCurrentEdit.Text:=lisMenuEditorNoShortcutConflicts;
     FResolvedConflictsCountLabel.Caption:=Format(lisMenuEditorResolvedConflictsS,['0']);
     FRemainingConflictsCountLabel.Caption:=Format(lisMenuEditorRemainingConflictsS,['0']);
   end;
@@ -1967,7 +1967,7 @@ begin
     FRemainingConflictsCountLabel.Caption:=Format(lisMenuEditorRemainingConflictsS,['0']);
     FResolvedConflictsCountLabel.Caption:=Format(
       lisMenuEditorResolvedConflictsS, [FInitialConflictsCount]);
-    FConflictsListBox.Items.Add(lisMenuEditorNoShortcutConflictsRemain);
+    FConflictsListBox.Items.Add(lisMenuEditorNoShortcutConflicts);
     FCurrentEdit.Text:=lisMenuEditorConflictResolutionComplete;
     FButtonPanel.CancelButton.Caption:=lisBtnClose;
   end;
@@ -1991,8 +1991,7 @@ begin
   Position:=poScreenCenter;
   Constraints.MinWidth:=400;
   Constraints.MinHeight:=256;
-  Caption:=lisMenuEditorMenuItemShortcutConflictsIn +
+  Caption:=Format(lisMenuEditorMenuItemShortcutConflictsInS,[(GlobalDesignHook.LookupRoot as TComponent).Name]);
-           (GlobalDesignHook.LookupRoot as TComponent).Name;
 
   FConflictsGroupBox:=TGroupBox.Create(Self);
   with FConflictsGroupBox do begin
@@ -2651,7 +2650,7 @@ begin
                                                          lisMenuEditorStandardTemplates);
                 FSavedNode:=FTVTemplates.Items.Add(FStandardNode,
                                                    lisMenuEditorSavedTemplates);
-                FGChoose.Caption:=Format('%s %s',[lisMenuEditorChooseTemplateTo, lisInsert]);
+                FGChoose.Caption:=lisMenuEditorChooseTemplateToInsert;
                 FLDescription.Caption:=lisMenuEditorTemplateDescription;
                 FTVTemplates.OnSelectionChanged:=@TVSelectionChanged;
                 FEDescription.ReadOnly:=True;
@@ -2660,7 +2659,7 @@ begin
                 FStandardNode:=nil;
                 FSavedNode:=FTVTemplates.Items.AddFirst(nil,
                                                     lisMenuEditorExistingSavedTemplates);
-                FGChoose.Caption:=Format('%s %s',[lisMenuEditorChooseTemplateTo, lisDelete]);
+                FGChoose.Caption:=lisMenuEditorChooseTemplateToDelete;
                 FLDescription.Caption:=lisMenuEditorTemplateDescription;
                 FTVTemplates.OnSelectionChanged:=@TVSelectionChanged;
                 FEDescription.ReadOnly:=True;
@@ -2760,10 +2759,7 @@ begin
               end;
     dmDelete: begin
                 if noneSaved then begin
-                  IDEMessageDialogAb(lisMenuEditorNoUserSavedTemplates,
+                  IDEMessageDialogAb(lisMenuEditorNoUserSavedTemplates, lisMenuEditorThereAreNoUserSavedMenuTemplates,
-                         Format('%s%s%s%s',[lisMenuEditorThereAreNoUserSavedMenuTemplates,
-                               LineEnding, LineEnding,
-                               lisMenuEditorOnlyStandardDefaultTemplatesAreAvailable]),
                                mtInformation, [mbOK], False);
                   ModalResult:=mrCancel;
                 end
@@ -2781,12 +2777,13 @@ constructor TMenuTemplateDialog.CreateWithMode(AOwner: TComponent;
 begin
   inherited CreateNew(AOwner);
   FDialogMode:=aDialogMode;
-  BorderStyle:=bsDialog;
+  BorderStyle:=bsSizeable;
   SetInitialBounds(0, 0, 530, 380);
   Position:=poScreenCenter;
   case aDialogMode of
     dmSave: Caption:=lisMenuEditorSaveMenuAsTemplate;
-    dmInsert: Caption:=lisMenuEditorInsertMenuTemplateInto;
+    dmInsert: Caption:=Format(lisMenuEditorInsertMenuTemplateIntoRootOfS,
+                              [MenuDesigner.EditedMenu.Name]);
     dmDelete: Caption:=lisMenuEditorDeleteSavedMenuTemplate;
   end;
   FTemplates:=TMenuTemplates.CreateForMode(FDialogMode);
@@ -3695,7 +3692,7 @@ begin
     end
   else
     begin
-      FGBDisplay.Caption:=Format('Shortcuts used in %s (%d)',
+      FGBDisplay.Caption := Format(lisMenuEditorShortcutsUsedInSD,
           [FMenu.Name, FscList.Count]);
       case anIndex of
         -1: ; // unsorted
@@ -3789,8 +3786,7 @@ begin
     end;
   end;
   UpdateContents(FSingleMenuOnly);
-  FLabel.Caption:=lisMenuEditorClickANonGreyedItemToEditItsShortcut+ LineEnding
+  FLabel.Caption:=lisMenuEditorClickANonGreyedItemToEditItsShortcut;
-                  + lisMenuEditorOrClickHeaderToSortByThatColumn;
   AutoSize:=True;
 end;
 
@@ -4840,9 +4836,10 @@ end;
 
 procedure TShadowMenu.DeleteTemplate(Sender: TObject);
 begin
-  if SavedTemplatesExist then
+  if SavedTemplatesExist and DeleteMenuTemplateDlg then begin
-    if DeleteMenuTemplateDlg then
+    MenuDesigner.UpdateTemplatesCount;
-      MenuDesigner.UpdateTemplatesCount;
+    UpdateActionsEnabledness;
+  end;
 end;
 
 procedure TShadowMenu.ListShortcuts(Sender: TObject);
@@ -4867,6 +4864,7 @@ begin
     begin
       SaveMenuTemplateDlg(FSelectedMenuItem);
       MenuDesigner.UpdateTemplatesCount;
+      UpdateActionsEnabledness;
     end;
 end;
 
@@ -5249,13 +5247,13 @@ begin
   SetupPopupMenu;
   FAddItemFake:=TAddSiblingFake.CreateWithPurpose(Self);
   FAddItemFake.OnClick:=@AddItemAfter;
-  FAddItemFake.Caption:=Format('%s %s',[lisAdd, lisMenuEditorMenuItem]);
+  FAddItemFake.Caption:=lisMenuEditorAddMenuItem;
   FAddSubmenuFake:=TAddSubmenuFake.CreateWithPurpose(Self);
   FAddSubmenuFake.OnClick:=@AddSubMenu;
-  FAddSubmenuFake.Caption:=Format('%s %s',[lisAdd, lisMenuEditorSubmenu]);
+  FAddSubmenuFake.Caption:=lisMenuEditorAddSubmenu;
   FAddFirstItemFake:=TAddFirstFake.CreateWithPurpose(Self);
   FAddFirstItemFake.OnClick:=@AddFirstMenu;
-  FAddFirstItemFake.Caption:=Format('%s %s',[lisAdd, lisMenuEditorMenuItem]);
+  FAddFirstItemFake.Caption:=lisMenuEditorAddMenuItem;
   FAddFirstItemFake.Left := Popup_Origin.x;
   FAddFirstItemFake.Top := Popup_Origin.y;
   ConnectSpeedButtonOnClickMethods;

ide/lazarusidestrconsts.pas

@@ -53,7 +53,7 @@ resourcestring
   lisDelete  = 'Delete';
   lisBtnDelete = '&Delete';
   lisMenuEditorGroupIndexValueSS = 'GroupIndex value(s): %s';
-  lisMenuEditorNoRadioitemsInThisMenu = 'no radioitems in this menu';
+  lisMenuEditorNoRadioitemsInThisMenu = 'No radioitems in this menu';
   lisMenuEditorSGroupIndexD = '%s.GroupIndex: %d';
   lisMenuEditorSIsNotARadioitem = '%s is not a radioitem';
   lisRemove = 'Remove';
@@ -4665,7 +4665,7 @@ resourcestring
 
   // menu editor
   lisMenuEditorMenuEditor = 'Menu Editor';
-  lisMenuEditorAcceleratorKeySNeedsChanging = 'Accelerator(&&) key "%s" needs changing ';
+  lisMenuEditorAcceleratorKeySNeedsChanging = 'Accelerator(&&) key "%s" needs changing';
   lisMenuEditorAddANewItemAboveSelectedItem = 'Add a new item above selected item';
   lisMenuEditorAddANewItemAfterSelectedItem = 'Add a new item after selected item';
   lisMenuEditorAddANewItemBeforeSelectedItem = 'Add a new item before selected item';
@@ -4705,11 +4705,12 @@ resourcestring
   lisMenuEditorChangeShortcutConflictS = 'Change shortcut conflict "%s"';
   lisMenuEditorChangeTheShortCutForS = 'Change the shortCut for %s';
   lisMenuEditorChangeTheShortCutKey2ForS = 'Change the shortCutKey2 for %s';
-  lisMenuEditorChooseTemplateTo = 'Choose template to';
+  lisMenuEditorChooseTemplateToInsert = 'Choose template to insert';
+  lisMenuEditorChooseTemplateToDelete = 'Choose template to delete';
   lisMenuEditorClickANonGreyedItemToEditItsShortcut = 'Click a non-greyed item '
-    +'to edit its shortcut';
+    +'to edit its shortcut or click header to sort by that column';
   lisMenuEditorComponentIsUnexpectedKind = 'Component is unexpected kind';
-  lisMenuEditorComponentIsUnnamed = 'component is unnamed';
+  lisMenuEditorComponentIsUnnamed = 'Component is unnamed';
   lisMenuEditorConflictResolutionComplete = '<conflict resolution complete>';
   lisMenuEditorDDItems = '%d (%d items)';
   lisMenuEditorDeleteItem = '&Delete item';
@@ -4733,13 +4734,13 @@ resourcestring
   lisMenuEditorGrabKey = '&Grab key';
   lisMenuEditorGroupIndexMenuItems = 'GroupIndex,MenuItems';
   lisMenuEditorInadequateDescription = 'Inadequate Description';
-  lisMenuEditorInsertMenuTemplateInto = 'Insert menu template into ';
+  lisMenuEditorInsertMenuTemplateIntoRootOfS = 'Insert menu template into root of %s';
   lisMenuEditorInsertSelectedMenuTemplate = 'Insert selected menu template';
   lisMenuEditorIsNotAssigned = 'is not assigned';
   lisMenuEditorItemsWithIconS = 'Items with icon: %s';
   lisMenuEditorListShortcutsAndAccelerators = 'List shortcuts and &accelerators for %s ...';
   lisMenuEditorListShortcutsForS = 'List shortcuts for %s ...';
-  lisMenuEditorMenuitemShortcutConflictsIn = 'Menuitem shortcut conflicts in ';
+  lisMenuEditorMenuitemShortcutConflictsInS = 'Menuitem shortcut conflicts in %s';
   lisMenuEditorMoveDown = 'Move Down (or right)';
   lisMenuEditorMoVeItemDown = 'Mo&ve item down';
   lisMenuEditorMoveItemLeft = '&Move item left';
@@ -4749,19 +4750,14 @@ resourcestring
   lisMenuEditorMoveSelectedItemToTheLeft = 'Move selected item to the left';
   lisMenuEditorMoveSelectedItemToTheRight = 'Move selected item to the right';
   lisMenuEditorMoveSelectedItemUp = 'Move selected item up';
-  lisMenuEditorMoveSeparateDeleteInsertItems = 'Move Divide Delete  Add  items';
+  lisMenuEditorMenuItemActions = 'Menu Item actions';
   lisMenuEditorMoveUp = 'Move Up (or left)';
   lisMenuEditorNA = 'n/a';
   lisMenuEditorNoMenuSelected = '(no menu selected)';
   lisMenuEditorNone = '<none>';
   lisMenuEditorNoneNone = '<none>,<none>';
   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';
   lisMenuEditorRemainingConflictsS = 'Remaining conflicts: %s';
@@ -4770,7 +4766,7 @@ resourcestring
   lisMenuEditorShortcutItemsS = 'Shortcut items: %s';
   lisMenuEditorResolveSelectedConflict = 'Resolve selected conflict';
   lisMenuEditorResolveShortcutConflicts = '&Resolve shortcut conflicts ...';
-  lisMenuEditorRootMenu = 'root menu';
+  lisMenuEditorRootMenu = 'Root menu';
   lisMenuEditorSavedTemplates = 'Saved templates';
   lisMenuEditorSaveMenuAsATemplate = '&Save menu as a template ...';
   lisMenuEditorSaveMenuAsTemplate = 'Save menu as template';
@@ -4790,10 +4786,11 @@ resourcestring
     +'with Menus and Actions (%d)';
   lisMenuEditorShortcutsDAndAcceleratorKeysD = 'Shortcuts (%d) and Accelerator keys (%d)';
   lisMenuEditorShortcutsUsedInS = 'Shortcuts used in %s';
+  lisMenuEditorShortcutsUsedInSD = 'Shortcuts used in %s (%d)';
   lisMenuEditorShowMenuEditorTMenuParameterIsNil = 'ShowMenuEditor: TMenu parameter is nil';
   lisMenuEditorSInS = '"%s" in %s';
   lisMenuEditorSIsAlreadyInUse = '"%s" is '
-    +'already in use in %s as a shortcut.%sTry a different shortcut.';
+    +'already in use in %s as a shortcut.' + sLineBreak + 'Try a different shortcut.';
   lisMenuEditorSIsNotASufficientDescriptionPleaseExpand = 'Please expand: "%s" is not a '
     +'sufficient Description';
   lisMenuEditorSomeWidgetsetsDoNotAllowSeparatorsInTheMainMenubar = 'Some '
@@ -4803,16 +4800,18 @@ resourcestring
   lisMenuEditorSShortcutSummary = '%s: Shortcut summary';
   lisMenuEditorSSSOnClickS = '%s.%s.%s - OnClick: %s';
   lisMenuEditorStandardTemplates = 'Standard templates';
-  lisMenuEditorMenuItem = 'menu item';
+  lisMenuEditorAddMenuItem = 'Add menu item';
-  lisMenuEditorSubmenu = 'submenu';
+  lisMenuEditorAddSubmenu = 'Add submenu';
+  lisMenuEditorSSubmenu = '%s submenu';
   lisMenuEditorTemplateDescription = 'Template description:';
   lisMenuEditorTemplates = '&Templates';
   lisMenuEditorTemplateSaved = 'Template saved';
-  lisMenuEditorThereAreNoUserSavedMenuTemplates = 'There are no user-saved menu templates.';
+  lisMenuEditorThereAreNoUserSavedMenuTemplates = 'There are no user-saved menu templates.' + sLineBreak + sLineBreak
+    +  'Only standard default templates are available.';
   lisMenuEditorTSCListGetScanListCompNameInvalidIndexDForFScanLis = 'TSCList.'
     +'GetScanListCompName: invalid index %d for FScanList';
   lisMenuEditorYouHaveToChangeTheShortcutFromSStoAvoidAConflict = 'You have to'
-    +' change the shortcut from %s%sto avoid a conflict';
+    +' change the shortcut from %s' + sLineBreak + 'to avoid a conflict';
   lisMenuEditorYouMustEnterTextForTheCaption = 'You must enter text for the Caption';
 
   // Standard File menu