Merge pull request #6013 from aljawaid/develop

NEW: Make Top Menu Entries Independent Translation Strings

htdocs/core/menus/standard/eldy.lib.php

@@ -111,13 +111,13 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 
 		$chaine="";
 		if (! empty($conf->product->enabled)) {
-			$chaine.=$langs->trans("Products");
+			$chaine.=$langs->trans("TMenuProducts");
 		}
 		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) {
-			$chaine.="/";
+			$chaine.=" | ";
 		}
 		if (! empty($conf->service->enabled)) {
-			$chaine.=$langs->trans("Services");
+			$chaine.=$langs->trans("TMenuServices");
 		}
 
 		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
@@ -261,7 +261,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		$idsel='tools';
 
 		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("Tools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&leftmenu=', $id, $idsel, $classname, $atarget);
+		if (empty($noout)) print_text_menu_entry($langs->trans("TMenuTools"), $showmode, DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&leftmenu=', $id, $idsel, $classname, $atarget);
 		if (empty($noout)) print_end_menu_entry($showmode);
 		$menu->add('/core/tools.php?mainmenu=tools&leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '');
 	}

htdocs/core/modules/modAgenda.class.php

@@ -189,7 +189,7 @@ class modAgenda extends DolibarrModules
 		// $r++;
 		$this->menu[$r]=array('fk_menu'=>0,
 													'type'=>'top',
-													'titre'=>'Agenda',
+													'titre'=>'TMenuAgenda',
 													'mainmenu'=>'agenda',
 													'url'=>'/comm/action/index.php',
 													'langs'=>'agenda',

htdocs/langs/en_US/admin.lang

@@ -998,7 +998,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here

htdocs/langs/en_US/agenda.lang

@@ -2,6 +2,7 @@
 IdAgenda=ID event
 Actions=Events
 Agenda=Agenda
+TMenuAgenda=Agenda
 Agendas=Agendas
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by 

htdocs/langs/en_US/main.lang

@@ -788,7 +788,7 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
+Select2MoreCharacter=or more characters<br /><br /><strong>SEARCH PARAMETERS:</strong><br /><i>[without spaces]</i><br /><br /><kbd><strong> |</strong></kbd>      <kbd> OR</kbd><br /><kbd><strong>*</strong></kbd>   <kbd>SEARCH ALL</kbd><br />
 Select2MoreCharacters=or more characters
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...

htdocs/langs/en_US/other.lang

@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date

htdocs/langs/en_US/products.lang

@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product