Merge

main/document/upload.php

@@ -294,7 +294,7 @@ $multiple_form .=  '<center><form id="file_upload" action="'.$url.'" method="POS
     <div>'.get_lang('UploadFiles').'</div>
 </center></form>';
 $multiple_form  .='<table class="files"></table>';
-$headers = array(get_lang('Multiple') , get_lang('Simple'));
+$headers = array(get_lang('Send') , get_lang('Send').' ('.get_lang('Simple').')');
 echo Display::tabs($headers, array($multiple_form, $simple_form ),'tabs');
 
 // Footer

main/inc/lib/banner.lib.php

@@ -602,7 +602,7 @@ function show_header_4($interbreadcrumb, $language_file, $nameTools) {
     echo '<div class="clear"></div>';
     if (api_get_setting('show_toolshortcuts') == 'true') {
         echo '<div id="toolshortcuts">';
-        require_once 'tool_navigation_menu.inc.php';
+        require_once api_get_path(INCLUDE_PATH).'tool_navigation_menu.inc.php';
         show_navigation_tool_shortcuts();
         echo '</div>';
     }