diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 37be1d12b25..7c535e07d5d 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -661,6 +661,7 @@ Access=Access HelpCopyToClipboard=Use Ctrl+C to copy to clipboard SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") OriginFileName=Original filename +SetDemandReason=Set source # Week day Monday=Monday diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 85372bb18d2..5725292f70d 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -661,6 +661,7 @@ Access=Accès HelpCopyToClipboard=Utilisez Ctrl+C pour copier dans le presse-papier SaveUploadedFileWithMask=Sauver le fichier sur le serveur sous le nom "%s" (sinon "%s") OriginFileName=nom du fichier source +SetDemandReason=Définir l'origine # Week day Monday=Lundi diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 644d8e3464d..64a28b60ccf 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1467,8 +1467,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // Link to print main content area if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) { - $qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring; - $text =''; + $qs=$_SERVER["QUERY_STRING"]; + $qs.=(($qs && $morequerystring)?'&':'').$morequerystring; + $text =''; $text.= img_picto('', 'printer.png', 'class="printer"'); $text.=''; $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);