';
+
print '';
print dol_get_fiche_end();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a5751d72b3..1bb48831113 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5118,8 +5118,12 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
$out .= '>';
}
if ($tooltip) {
- // You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
- $tmptooltip = explode(':', $tooltip);
+ // You can also use 'TranslationString:keyfortooltiponclick' for a tooltip on click.
+ if (preg_match('/:\w+$/', $tooltip)) {
+ $tmptooltip = explode(':', $tooltip);
+ } else {
+ $tmptooltip = array($tooltip);
+ }
$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));
} else {
$out .= $langs->trans($name);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cbec6cfc5ea..d82631cc8fa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1767,7 +1767,7 @@ DetailMenuHandler=Menu handler where to show new menu
DetailMenuModule=Module name if menu entry come from a module
DetailType=Type of menu (top or left)
DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailUrl=URL where menu send you (Relative URL link or external link with https://)
DetailEnabled=Condition to show or not entry
DetailRight=Condition to display unauthorized grey menus
DetailLangs=Lang file name for label code translation
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index cab8fa37f16..53e60fa0fbd 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -50,6 +50,7 @@ PathToModulePackage=Path to zip of module/application package
PathToModuleDocumentation=Path to file of module/application documentation (%s)
SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
FileNotYetGenerated=File not yet generated
+GenerateCode=Generate code
RegenerateClassAndSql=Force update of .class and .sql files
RegenerateMissingFiles=Generate missing files
SpecificationFile=File of documentation
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 81da2909779..7e086887a37 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2090,10 +2090,12 @@ if ($module == 'initmodule') {
//print ''.$langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).' ';
print ' ';
- print ''.$langs->trans("ModuleName").' ';
- print ' '.$form->textwithpicto('', $langs->trans("EnterNameOfModuleDesc")).' ';
+ print '