diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index e6a64763a..41afb394e 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -1819,11 +1819,13 @@ class MenuBlock extends DisplayBlock $oSelectedClassFilter->SetSelectedClasses([$sSelectedAlias]); // Action identifier is using the alias on purpose so they can be used as "shortcut actions" easily for "Link" or "Remote" aliases on linksets. + // Action label dict code has a specific suffix for "Link" / "Remote" aliases to allow dedicated labels in linksets. + $sActionLabelCodeSuffix = in_array($sSelectedAlias, ['Link', 'Remote']) ? $sSelectedAlias : 'Class'; if ($bIsBulkModifyAllowed) { - $this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:ModifyAll:'.$sSelectedAlias, Dict::Format('UI:Menu:ModifyAll_Class', $sSelectedClassName)); + $this->AddBulkModifyObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:ModifyAll:'.$sSelectedAlias, Dict::Format('UI:Menu:ModifyAll_'.$sActionLabelCodeSuffix, $sSelectedClassName)); } if ($bIsBulkDeleteAllowed) { - $this->AddBulkDeleteObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:BulkDelete:'.$sSelectedAlias, Dict::Format('UI:Menu:BulkDelete_Class', $sSelectedClassName)); + $this->AddBulkDeleteObjectsMenuAction($aRegularActions, $sSelectedClass, $oSelectedClassFilter->serialize(), 'UI:Menu:BulkDelete:'.$sSelectedAlias, Dict::Format('UI:Menu:BulkDelete_'.$sActionLabelCodeSuffix, $sSelectedClassName)); } } diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 0fe549cea..39362b643 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -526,6 +526,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating 'UI:Menu:Delete' => 'Delete...', 'UI:Menu:BulkDelete' => 'Delete...', 'UI:Menu:BulkDelete_Class' => 'Delete %1$s objects...', + 'UI:Menu:BulkDelete_Link' => 'Delete %1$s...', + 'UI:Menu:BulkDelete_Remote' => 'Delete %1$s...', 'UI:UndefinedObject' => 'undefined', 'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s', 'UI:SplitDateTime-Date' => 'date', @@ -1169,6 +1171,8 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d', 'UI:Menu:ModifyAll' => 'Modify...', 'UI:Menu:ModifyAll_Class' => 'Modify %1$s objects...', + 'UI:Menu:ModifyAll_Link' => 'Modify %1$s...', + 'UI:Menu:ModifyAll_Remote' => 'Modify %1$s...', 'UI:Button:ModifyAll' => 'Modify All', 'UI:Button:PreviewModifications' => 'Preview Modifications >>', 'UI:ModifiedObject' => 'Object Modified', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index a22bad457..6cab8e32f 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -509,7 +509,9 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi 'UI:Menu:Modify' => 'Modifier...', 'UI:Menu:Delete' => 'Supprimer...', 'UI:Menu:BulkDelete' => 'Supprimer...', - 'UI:Menu:BulkDelete_Class' => 'Supprimer des %1$s...', + 'UI:Menu:BulkDelete_Class' => 'Supprimer ces %1$s...', + 'UI:Menu:BulkDelete_Link' => 'Supprimer ces %1$s...', + 'UI:Menu:BulkDelete_Remote' => 'Supprimer ces %1$s...', 'UI:UndefinedObject' => 'non défini', 'UI:Document:OpenInNewWindow:Download' => 'Ouvrir dans un nouvelle fenêtre: %1$s, Télécharger: %2$s', 'UI:SplitDateTime-Date' => 'date', @@ -1144,7 +1146,9 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:Modify_N_ObjectsOf_Class' => 'Modification de %1$d objet(s) de type %2$s', 'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modification de %1$d (sur %3$d) objets de type %2$s', 'UI:Menu:ModifyAll' => 'Modifier...', - 'UI:Menu:ModifyAll_Class' => 'Modifier des %1$s...', + 'UI:Menu:ModifyAll_Class' => 'Modifier ces %1$s...', + 'UI:Menu:ModifyAll_Link' => 'Modifier ces %1$s...', + 'UI:Menu:ModifyAll_Remote' => 'Modifier ces %1$s...', 'UI:Button:ModifyAll' => 'Modifier', 'UI:Button:PreviewModifications' => 'Aperçu des modifications >>', 'UI:ModifiedObject' => 'Objet Modifié',