Merge remote-tracking branch 'origin/support/3.0' into support/3.1

# Conflicts:
#	dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
#	dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
This commit is contained in:
Pierre Goiffon
2024-02-15 10:55:54 +01:00
8 changed files with 24 additions and 9 deletions

View File

@@ -21,7 +21,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Logo entreprise',
'UI:Layout:NavigationMenu:Silo:Label' => 'Selectionnez l\'organisation sur laquelle filtrer',
'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Déplier / Replier',
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Déplier / Replier (Filtré sur %1$s)~~',
'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Déplier / Replier (Filtré sur %1$s)',
'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filtrer...',
'UI:Layout:NavigationMenu:MenuFilter:Input:Tooltip' => 'Saisir des mots-clés pour filtrer les menus',
'UI:Layout:NavigationMenu:MenuFilter:Input:Hint' => 'Les correspondances dans chaque groupe de menu seront affichées',