Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/install/fileconf.php

@@ -407,8 +407,7 @@ if (!empty($force_install_noedit)) {
 			<input type="password"
                    id="db_pass" autocomplete="off"
 			       name="db_pass"
-			       value="
-				<?php
+			       value="<?php
 				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
 				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
 				if (!empty($dolibarr_main_prod)) {

htdocs/langs/en_US/main.lang

@@ -86,7 +86,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=This is a dedicated help page related to your current screen
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted