merge

main/admin/calendar.lib.php

@@ -796,7 +796,7 @@ function display_agenda_items()
     	Display::display_icon('agenda.gif', get_lang('Agenda'));
     	if ($myrow['to_group_id']!=='0')
     	{
-    		echo Display::return_icon('group.gif', get_lang('Group'));
+    		echo Display::return_icon('group.gif', get_lang('AllUsersOfThePlatform'));
     	}
     	echo " ".$myrow['title']."\n";
     	echo "\t\t</th>\n";
@@ -812,7 +812,7 @@ function display_agenda_items()
     	{
     		if( ! (api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $myrow['id'] ) ) )
 			{ // a coach can only delete an element belonging to his session
-	    		echo '<th>'.get_lang('Modify');
+	    		echo '<th>'.get_lang('Actions');
 	    		echo '</th></tr>';
 			}
     	}

main/admin/course_list.php

@@ -286,7 +286,7 @@ else
 	$table->set_header(6, get_lang('UnsubscriptionAllowed'));
 	$table->set_header(7, get_lang('IsVirtualCourse'));
 	$table->set_header(8, get_lang('Teacher'));
-	$table->set_header(9, get_lang('Modify'), false,'width="120px"');
+	$table->set_header(9, get_lang('Action'), false,'width="120px"');
 	$table->set_column_filter(9,'modify_filter');
 	$table->set_form_actions(array ('delete_courses' => get_lang('DeleteCourse')),'course');
 	$table->display();

main/admin/system_announcements.php

@@ -123,7 +123,7 @@ if (isset ($_POST['action']))
 if (isset ($_GET['action']) && $_GET['action'] == 'delete')
 {
 	SystemAnnouncementManager :: delete_announcement($_GET['id']);
-	Display :: display_normal_message(get_lang('AnnouncementDeleted'));
+	Display :: display_confirmation_message(get_lang('AnnouncementDeleted'));
 }
 // Delete selected announcements
 if (isset ($_POST['action']) && $_POST['action'] == 'delete_selected')
@@ -132,7 +132,7 @@ if (isset ($_POST['action']) && $_POST['action'] == 'delete_selected')
 	{
 		SystemAnnouncementManager :: delete_announcement($id);
 	}
-	Display :: display_normal_message(get_lang('AnnouncementDeleted'));
+	Display :: display_confirmation_message(get_lang('AnnouncementDeleted'));
 	$action_todo = false;
 }
 // Add an announcement
@@ -237,7 +237,7 @@ if ($action_todo)
 			case 'add':
 				if(SystemAnnouncementManager::add_announcement($values['title'],$values['content'],$values['start'],$values['end'],$values['visible_teacher'],$values['visible_student'],$values['visible_guest'], $values['lang'],$values['send_mail']))
 				{
-					Display :: display_normal_message(get_lang('AnnouncementAdded'));
+					Display :: display_confirmation_message(get_lang('AnnouncementAdded'));
 				}
 				else
 				{
@@ -248,7 +248,7 @@ if ($action_todo)
 			case 'edit':
 				if (SystemAnnouncementManager::update_announcement($values['id'],$values['title'],$values['content'],$values['start'],$values['end'],$values['visible_teacher'],$values['visible_student'],$values['visible_guest'], $values['lang'],$values['send_mail']))
 				{
-					Display :: display_normal_message(get_lang('AnnouncementUpdated'));
+					Display :: display_confirmation_message(get_lang('AnnouncementUpdated'));
 				}
 				else
 				{