diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 7b1ba3225ff..61a91db6d66 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -480,7 +480,7 @@ print '
';
print img_picto('', 'folder', 'class="pictofixedwidth"');
print ''.$langs->trans("HTTPCacheStaticResources").' - '.$langs->trans("CacheByClient").'
';
print '
';
-print '
'.img_picto('', 'question.png', 'class="pictofixedwidth"').' '.$langs->trans("TestNotPossibleWithCurrentBrowsers").'
';
+print '
'.img_picto('', 'question.png', 'class="pictofixedwidth"').' '.$langs->trans("TestNotPossibleWithCurrentBrowsers").'
';
print '
';
@@ -704,7 +704,8 @@ if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) {
print img_picto('', 'minus', 'class="pictofixedwidth"');
}
print $form->textwithpicto($langs->trans("EnableFileCache").' ('.$langs->trans("Widgets").')', $langs->trans("Option").' MAIN_ACTIVATE_FILECACHE');
-print ': '.yn(getDolGlobalInt('MAIN_ACTIVATE_FILECACHE'));
+print ': ';
+print yn(getDolGlobalInt('MAIN_ACTIVATE_FILECACHE'));
print '
';
if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
@@ -712,7 +713,8 @@ if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
} else {
print img_picto('', 'minus', 'class="pictofixedwidth"');
}
-print 'MAIN_ENABLE_AJAX_TOOLTIP : ';
+print $form->textwithpicto($langs->trans('MAIN_ENABLE_AJAX_TOOLTIP'), $langs->trans("Option").' MAIN_ENABLE_AJAX_TOOLTIP');
+print ': ';
print yn(getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP'));
print '
';
@@ -722,7 +724,8 @@ if (getDolGlobalInt('MAIN_CACHE_COUNT')) {
} else {
print img_picto('', 'minus', 'class="pictofixedwidth"');
}
-print 'MAIN_CACHE_COUNT : ';
+print $form->textwithpicto($langs->trans('MAIN_CACHE_COUNT'), $langs->trans("Option").' MAIN_CACHE_COUNT');
+print ': ';
print yn(getDolGlobalInt('MAIN_CACHE_COUNT'));
//.' '.img_picto('', 'warning.png');
print '
';
@@ -741,7 +744,8 @@ if (getDolGlobalInt('MAIN_DO_FETCH_IN_ONE_SQL_REQUEST')) {
} else {
print img_picto('', 'minus', 'class="pictofixedwidth"');
}
-print 'MAIN_DO_FETCH_IN_ONE_SQL_REQUEST = '.getDolGlobalString('MAIN_DO_FETCH_IN_ONE_SQL_REQUEST', ''.$langs->trans("Undefined").'');
+print $form->textwithpicto($langs->trans('MAIN_DO_FETCH_IN_ONE_SQL_REQUEST'), $langs->trans("Option").' MAIN_DO_FETCH_IN_ONE_SQL_REQUEST');
+print ' = '.getDolGlobalString('MAIN_DO_FETCH_IN_ONE_SQL_REQUEST', ''.$langs->trans("Undefined").'');
//print ' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)')."
";
print '
';
print '';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 7811d79df6a..14579956797 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -80,7 +80,7 @@ $err = 0;
$setuplang = GETPOST("selectlang", 'alpha', 3) ? GETPOST("selectlang", 'alpha', 3) : (GETPOST('lang', 'alpha', 1) ? GETPOST('lang', 'alpha', 1) : 'auto');
$langs->setDefaultLang($setuplang);
-$langs->loadLangs(array("install", "errors"));
+$langs->loadLangs(array("install", "errors", "admin"));
dolibarr_install_syslog("- fileconf: entering fileconf.php page");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b7a2c325259..681697b040a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1225,7 +1225,7 @@ Tables=Tables
TableName=Table name
NbOfRecord=No. of records
Host=Server
-DriverType=Driver type
+DriverType=PHP Database Driver
SummarySystem=System information summary
SummaryConst=List of all Dolibarr setup parameters
MenuCompanySetup=Company/Organization
@@ -2678,3 +2678,6 @@ ByDefault=By default
Sources=Sources
XYearSupport=%s-year support
CacheForTranslationIsUsed=Warning, translation files seems loaded into a cache system. If you force some translations from here, think to reset the cache to have the change effective.
+MAIN_ENABLE_AJAX_TOOLTIP=Use Ajax lazy load of tooltip content with Ajax
+MAIN_CACHE_COUNT=Keep the count of elements visible into badges in a cache (value may need several minutes to be up to date)
+MAIN_DO_FETCH_IN_ONE_SQL_REQUEST=Load content of object and lines into one request
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 2b3db368aab..2037f3d8896 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -42,7 +42,6 @@ ForceHttps=Force secure connections (https)
CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate.
DolibarrDatabase=Dolibarr Database
DatabaseType=Database type
-DriverType=Driver type
Server=Server
ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
ServerPortDescription=Database server port. Keep empty if unknown.