merge

main/announcements/announcements.php

@@ -282,7 +282,7 @@ if (!empty($_SESSION['toolgroup'])){
 	$interbreadcrumb[] = array ("url"=>"../group/group_space.php?gidReq=".$_clean_toolgroup, "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')');
 } else {
 	if($surveyid) {
-		$interbreadcrumb[] = array ("url" => "../survey/survey_list.php?cidReq=$cidReq", "name" => get_lang('Survey'));
+		$interbreadcrumb[] = array ("url" => "../survey/survey_list.php?cidReq=$cidReq", "name" => get_lang('ToolSurvey'));
 		$nameTools = get_lang('PublishSurvey');
 	} else {
 		$nameTools = get_lang('ToolAnnouncement');

main/notebook/index.php

@@ -47,11 +47,11 @@ event_access_tool(TOOL_NOTEBOOK);
 // tool name
 if ( isset($_GET['action']) && $_GET['action'] == 'addnote') {
 	$tool = 'NoteAddNew';
-	$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Notebook'));
+	$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('ToolNotebook'));
 }
 if ( isset($_GET['action']) && $_GET['action'] == 'editnote') {
 	$tool = 'ModifyNote';
-	$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Notebook'));
+	$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('ToolNotebook'));
 }
 
 // displaying the header

main/survey/fillsurvey.php

@@ -60,7 +60,7 @@ if (!empty($_user))
 }
 
 // Header
-Display :: display_header(get_lang('Survey'));
+Display :: display_header(get_lang('ToolSurvey'));
 
 // getting all the course information
 $_course = CourseManager::get_course_information($_GET['course']);

main/survey/question.php

@@ -75,7 +75,7 @@ $table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
 // getting the survey information
 $survey_data = survey_manager::get_survey($_GET['survey_id']);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('InvallidSurvey'), false);
 	Display :: display_footer();
 	exit;

main/survey/reporting.php

@@ -98,7 +98,7 @@ SurveyUtil::check_parameters();
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false,true))
 {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('NotAllowed'), false);
 	Display :: display_footer();
 	exit;
@@ -116,7 +116,7 @@ $user_info 						= Database :: get_main_table(TABLE_MAIN_SURVEY_REMINDER); // TO
 
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('InvallidSurvey'), false);
 	Display :: display_footer();
 	exit;

main/survey/survey.php

@@ -26,7 +26,7 @@ require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 if (!api_is_allowed_to_edit(false,true) || (api_is_course_coach() && $extend_rights_for_coachs=='false'))
 {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('NotAllowed'), false);
 	Display :: display_footer();
 	exit;
@@ -51,7 +51,7 @@ if (isset($_GET['survey_id'])) {
 	if ($course_code!=-1) {
 		$survey_data = survey_manager::get_survey($survey_id);
 	} else {
-		Display :: display_header(get_lang('Survey'));
+		Display :: display_header(get_lang('ToolSurvey'));
 		Display :: display_error_message(get_lang('NotAllowed'), false);
 		Display :: display_footer();
 		exit;

main/survey/survey_invitation.php

@@ -41,7 +41,7 @@ require_once (api_get_path(LIBRARY_PATH)."mail.lib.inc.php");
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false,true))
 {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('NotAllowed'), false);
 	Display :: display_footer();
 	exit;

main/survey/survey_invite.php

@@ -48,7 +48,7 @@ $this_section=SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false,true))
 {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('NotAllowed'), false);
 	Display :: display_footer();
 	exit;
@@ -66,7 +66,7 @@ $user_info 			= Database::get_main_table(TABLE_MAIN_SURVEY_REMINDER); // TODO: T
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = survey_manager::get_survey($survey_id);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('Survey'));
+	Display :: display_header(get_lang('ToolSurvey'));
 	Display :: display_error_message(get_lang('InvallidSurvey'), false);
 	Display :: display_footer();
 	exit;

main/wiki/index.php

@@ -94,7 +94,7 @@ $tbl_wiki_conf = Database::get_course_table(TABLE_WIKI_CONF);
 Constants and variables
 -----------------------------------------------------------
 */
-$tool_name = get_lang('Wiki');
+$tool_name = get_lang('ToolWiki');
 
 $MonthsLong = array (get_lang("JanuaryLong"), get_lang("FebruaryLong"), get_lang("MarchLong"), get_lang("AprilLong"), get_lang("MayLong"), get_lang("JuneLong"), get_lang("JulyLong"), get_lang("AugustLong"), get_lang("SeptemberLong"), get_lang("OctoberLong"), get_lang("NovemberLong"), get_lang("DecemberLong"));