Merge

documentation/changelog.html

@@ -50,11 +50,14 @@
   <li>User groups added  DT#5611 </li>  
   <li>Social network tab added</li>
   <li>Easy construction of presentations with the images of document tool</li>
+  <li>Upgrade from FCKEditor 2.6.4.1 to <strong>FCKEditor 2.6.5, Build 23959</strong> has been implemented. (#2867)</li>
+  <li>Settings WYSIWYG editor from Platform Admin Area</li>
+  <li>Upgrade html2pdf libray to 3.26</li>
+  <li>Upgrade mimetex to 1.71</li>
 
 </ul>
 <h3>Debugging</h3>
 <ul>
-  <li>Online editor: A upgrade from FCKEditor 2.6.4.1 to <strong>FCKEditor 2.6.5, Build 23959</strong> has been implemented. (#2867)</li>
   <li>Fixed a bug in course homepage always showing a box even when no tools were shown (r8747:3ad59f6aed1f)</li>
   <li>Score result in reporting is expressed as a percentage</li>
   <li>CSV export of reporting no longer contains html code in the last column</li>

main/document/showinframes.php

@@ -104,89 +104,68 @@ $path_info= pathinfo($file_url_sys);
 <script language="javascript" src="<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.frameready.js"></script>
 
 
-	<script type="text/javascript">
-	// Fixes the content height of the frame	
-	var leftZoneHeightOccupied = 0;
-	var rightZoneHeightOccupied = 0;
-	var initialLeftZoneHeight = 0;
-	var initialRightZoneHeight = 0;
+<script type="text/javascript">
+	<!--
 	
 	var updateContentHeight = function() {
-		winHeight = (window.innerHeight != undefined ? window.innerHeight : document.documentElement.clientHeight);
-		
-		newLeftZoneHeight = winHeight - leftZoneHeightOccupied;		
-		
-		newRightZoneHeight = winHeight - rightZoneHeightOccupied;
-		if (newLeftZoneHeight <= initialLeftZoneHeight) {
-			newLeftZoneHeight = initialLeftZoneHeight;
-			newRightZoneHeight = newLeftZoneHeight + leftZoneHeightOccupied - rightZoneHeightOccupied;
-		}
-		if (newRightZoneHeight <= initialRightZoneHeight) {
-			newRightZoneHeight = initialRightZoneHeight;
-			newLeftZoneHeight = newRightZoneHeight + rightZoneHeightOccupied - leftZoneHeightOccupied;
-		}
-
-		document.getElementById('mainFrame').style.height = newRightZoneHeight + 'px';
-		if (document.body.clientHeight > winHeight) {
-			document.body.style.overflow = 'auto';
-		} else {
-			document.body.style.overflow = 'hidden';
-		}		
+		initialHeight = document.getElementById('headerFrame').offsetHeight; 
+		docHeight = document.body.clientHeight;
+		document.getElementById('mainFrame').style.height = (docHeight-initialHeight)+"px";						
 	};
-</script>	
-<?php
-  	 if (api_get_setting('show_glossary_in_documents') == 'ismanual') {	 	
-  	 	?>
-  		<script type="text/javascript">
-    	$(document).ready(function() {
-    	updateContentHeight();
-      	$.frameReady(function(){   
-	       //  	$("<div>I am a div courses</div>").prependTo("body");
-     
-	      }, "top.mainFrame",   
-	      { load: [   
-	      		{type:"script", id:"_fr1", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.js"},
-	            {type:"script", id:"_fr2", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
-	            {type:"script", id:"_fr3", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_manual.js"}
-	      	 ] 
-	      }
-	   
-	      );
-	      	window.onresize = updateContentHeight;
-	   }
-	   );
-</script>  	 	
-<?php
-  	 } elseif(api_get_setting('show_glossary_in_documents') == 'isautomatic') {
-?>
-	<script type="text/javascript">
-	    $(document).ready(function() {
-	    	updateContentHeight(); 
-	    		window.onresize = updateContentHeight;  
-	      $.frameReady(function(){   
-	       //  $("<div>I am a div courses</div>").prependTo("body");
-	     
-	      }, "top.mainFrame",   
-	      { load: [   
-	      		{type:"script", id:"_fr1", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.js"},
-	            {type:"script", id:"_fr2", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
-	            {type:"script", id:"_fr3", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_automatic.js"}
-	      	 ] 
-	      }	   
-	      );
-	   }
-	   );
-	</script>
-<?php
-  	 }
-?>  
+	
+	// Fixes the content height of the frame			
+	window.onload = function() {
+
+		updateContentHeight();
+				
+		//loads the glossary library		
+		<?php 	
+			if (api_get_setting('show_glossary_in_documents') == 'ismanual') {  	  	 	
+		  	 	?>		  	 	
+		    $(document).ready(function() {   
+		      $.frameReady(function(){   
+		       //  $("<div>I am a div courses</div>").prependTo("body");		     
+		      }, "top.mainFrame",   
+		      { load: [   
+		      		{type:"script", id:"_fr1", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.js"},
+		            {type:"script", id:"_fr2", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
+		            {type:"script", id:"_fr3", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_manual.js"}
+		      	 ] 
+		      }		   
+		      );
+		   });		   		  	 	
+		<?php
+		  	 } elseif(api_get_setting('show_glossary_in_documents') == 'isautomatic') {
+		?>		
+		    $(document).ready(function() {   
+		      $.frameReady(function(){   
+		       //  $("<div>I am a div courses</div>").prependTo("body");
+		     
+		      }, "top.mainFrame",   
+		      { load: [   
+		      		{type:"script", id:"_fr1", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.js"},
+		            {type:"script", id:"_fr2", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"},
+		            {type:"script", id:"_fr3", src:"<?= api_get_path(WEB_LIBRARY_PATH); ?>fckeditor/editor/plugins/glossary/fck_glossary_automatic.js"}
+		      	 ] 
+		      }
+		   
+		      );
+		   });
+		<?php
+		  	 }		  
+		?>
+	}
+	-->	
+</script>
 </head>
-<body>
-	<iframe border="0" frameborder="0" scrolling="no" style="width:100%;"   src="headerpage.php?file=<?php echo $file.'&amp;'.api_get_cidreq(); ?>"> </iframe>
+<body style="margin:0px;padding:0px" OnResize="updateContentHeight()">
+	<iframe border="0" frameborder="0" scrolling="no" style="width:100%;" id="headerFrame" src="headerpage.php?file=<?php echo $file.'&amp;'.api_get_cidreq(); ?>"> </iframe>
 	<?php
-		if (file_exists($file_url_sys)) {			
-		echo '<iframe border="0" frameborder="0" scrolling="no" height="100%" style="width:100%;"  id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&rand='.mt_rand(1,10000).'"></iframe>';			
-	} else {			
+	if (file_exists($file_url_sys)) {
+		//echo '<div style="overflow:scroll">aca';			
+		echo '<iframe border="0" frameborder="0" scrolling="yes"  style="width:100%;"  id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&rand='.mt_rand(1,10000).'"></iframe>';
+		//echo '</div>';			
+	} else {				
 		echo '<frame name="mainFrame" id="mainFrame" src=showinframes.php?nopages=1 />';
 	}
 	?>

main/exercice/answer.class.php

@@ -80,7 +80,15 @@ class Answer
 		$this->cancel();
 
 		// fills arrays
-		$this->read();
+		Exercise::read($_REQUEST['exerciseId']);		
+		if($this->random_answers=='1')
+		{
+			$this->readOrderedBy('rand()', '');// randomize answers
+		}
+		else
+		{
+			$this->read(); // natural order
+		}
 	}
 
 	/**
@@ -114,7 +122,7 @@ class Answer
 		$questionId=$this->questionId;
 		//$answerType=$this->selectType();
 
-		$sql="SELECT id,answer,correct,comment,ponderation, position, hotspot_coordinates, hotspot_type, destination FROM
+		$sql="SELECT id,answer,correct,comment,ponderation, position, hotspot_coordinates, hotspot_type, destination, id_auto FROM
 		      $TBL_ANSWER WHERE question_id ='".Database::escape_string($questionId)."' ORDER BY position";
 
 		$result=Database::query($sql,__FILE__,__LINE__);
@@ -133,6 +141,7 @@ class Answer
 			$this->hotspot_coordinates[$i]=$object->hotspot_coordinates;
 			$this->hotspot_type[$i]=$object->hotspot_type;
 			$this->destination[$i]=$object->destination;
+			$this->autoId[$i]=$object->id_auto;
 			$i++;
 		}
 
@@ -161,7 +170,7 @@ class Answer
 		$questionId=$this->questionId;
 		//$answerType=$this->selectType();
 
-		$sql="SELECT answer,correct,comment,ponderation,position, hotspot_coordinates, hotspot_type,destination " .
+		$sql="SELECT answer,correct,comment,ponderation,position, hotspot_coordinates, hotspot_type, destination, id_auto " .
 				"FROM $TBL_ANSWER WHERE question_id='".Database::escape_string($questionId)."' " .
 				"ORDER BY $field $order";
 
@@ -178,13 +187,26 @@ class Answer
 			$this->weighting[$i]=$object->ponderation;
 			$this->position[$i]=$object->position;
 			$this->destination[$i]=$object->destination;
-
+			$this->autoId[$i]=$object->id_auto;
 			$i++;
 		}
 
 		$this->nbrAnswers=$i-1;
 	}
 
+
+	/**
+	 * returns the autoincrement id identificator
+	 *
+	 * @author - Juan Carlos Raña
+	 * @return - integer - answer num
+	 */
+	function selectAutoId($id)
+	{
+		return $this->autoId[$id];
+	}
+
+
 	/**
 	 * returns the number of answers in this question
 	 *

main/exercice/exercise.class.php

@@ -19,15 +19,16 @@ class Exercise
 	var $sound;
 	var $type;
 	var $random;
+	var $random_answers;
 	var $active;
 	var $timeLimit;
 	var $attempts;
 	var $feedbacktype;
 	var $end_time;
-  var $start_time;
+  	var $start_time;
 	var $questionList;  // array with the list of this exercise's questions
 	var $results_disabled;
-  var $expired_time;
+  	var $expired_time;
 	/**
 	 * constructor of the class
 	 *
@@ -41,13 +42,14 @@ class Exercise
 		$this->sound='';
 		$this->type=1;
 		$this->random=0;
+		$this->random_answers=0;
 		$this->active=1;
 		$this->questionList=array();
 		$this->timeLimit = 0;
 		$this->end_time = '0000-00-00 00:00:00';
-    $this->start_time = '0000-00-00 00:00:00';
-    $this->results_disabled =1;
-    $this->expired_time = '0000-00-00 00:00:00';
+		$this->start_time = '0000-00-00 00:00:00';
+		$this->results_disabled =1;
+		$this->expired_time = '0000-00-00 00:00:00';
 	}
 
 	/**
@@ -68,7 +70,7 @@ class Exercise
 	    $TBL_QUESTIONS          = Database::get_course_table(TABLE_QUIZ_QUESTION);
     	#$TBL_REPONSES           = Database::get_course_table(TABLE_QUIZ_ANSWER);
 
-		$sql="SELECT title,description,sound,type,random,active, results_disabled, max_attempt,start_time,end_time,feedback_type,expired_time FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'";
+		$sql="SELECT title,description,sound,type,random, random_answers, active, results_disabled, max_attempt,start_time,end_time,feedback_type,expired_time FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'";
 		$result=Database::query($sql,__FILE__,__LINE__);
 
 		// if the exercise has been found
@@ -80,6 +82,7 @@ class Exercise
 			$this->sound=$object->sound;
 			$this->type=$object->type;
 			$this->random=$object->random;
+			$this->random_answers=$object->random_answers;
 			$this->active=$object->active;
 			$this->results_disabled =$object->results_disabled;
 			$this->attempts = $object->max_attempt;
@@ -231,6 +234,21 @@ class Exercise
 			return false;
 		}
 	}
+	
+	/**
+	 * returns random answers status.
+	 *
+	 * @author - Juan Carlos Raña
+	 */
+	function selectRandomAnswers()
+	{
+		
+		$this->random_answers;
+		
+		return $this->random_answers;
+	}	
+	
+	
 	/**
 	 * Same as isRandom() but has a name applied to values different than 0 or 1
 	 */
@@ -366,7 +384,6 @@ class Exercise
 		$this->feedbacktype=$feedback_type;
 	}
 
-
 	/**
 	 * changes the exercise description
 	 *
@@ -377,16 +394,18 @@ class Exercise
 	{
 		$this->description=$description;
 	}
-  /**
-   * changes the exercise description
-   *
-   * @author - Isaac flores
-   * @param - int The expired time of the quiz
-   */
-  function updateExpiredTime($expired_time)
-  {
-    $this->expired_time = $expired_time;
-  }
+	
+	/**
+	* changes the exercise expired_time
+	*
+	* @author - Isaac flores
+	* @param - int The expired time of the quiz
+	*/
+	function updateExpiredTime($expired_time)
+	{
+	$this->expired_time = $expired_time;
+	}
+	
 	/**
 	 * changes the exercise sound file
 	 *
@@ -460,6 +479,18 @@ class Exercise
 		$this->random=$random;
 	}
 
+
+	/**
+	 * sets to 0 if answers are not selected randomly
+	 * if answers are selected randomly
+	 * @author - Juan Carlos Raña
+	 * @param - integer $random_answers - random answers
+	 */
+	function updateRandomAnswers($random_answers)
+	{
+		$this->$random_answers = $random_answers;
+	}
+
 	/**
 	 * enables the exercise
 	 *
@@ -520,6 +551,7 @@ class Exercise
 		$attempts = $this->attempts;
 		$feedbacktype = $this->feedbacktype;
 		$random = $this->random;
+		$random_answers = $this->random_answers;
 		$active = $this->active;
 		$session_id = api_get_session_id();
     	$expired_time = $this->expired_time;
@@ -545,6 +577,7 @@ class Exercise
 						$sql .= ", sound='".Database::escape_string($sound)."',
 						type='".Database::escape_string($type)."',
 						random='".Database::escape_string($random)."',
+						random_answers='".Database::escape_string($random_answers)."',
 						active='".Database::escape_string($active)."',
 						feedback_type='".Database::escape_string($feedbacktype)."',
 						start_time='$start_time',end_time='$end_time',
@@ -576,7 +609,7 @@ class Exercise
 			$cond1=Database::escape_string(Security::remove_XSS($exercise));
 			$cond2=Database::escape_string(Security::remove_XSS(api_html_entity_decode($description),COURSEMANAGERLOWSECURITY));
 		}*/
-			$sql="INSERT INTO $TBL_EXERCICES (start_time, end_time, title, description, sound, type, random,active, results_disabled, max_attempt, feedback_type, expired_time, session_id)
+			$sql="INSERT INTO $TBL_EXERCICES (start_time, end_time, title, description, sound, type, random, random_answers,active, results_disabled, max_attempt, feedback_type, expired_time, session_id)
 					VALUES(
 						'$start_time','$end_time',
 						'".Database::escape_string($exercise)."',
@@ -584,6 +617,7 @@ class Exercise
 						'".Database::escape_string($sound)."',
 						'".Database::escape_string($type)."',
 						'".Database::escape_string($random)."',
+						'".Database::escape_string($random_answers)."',
 						'".Database::escape_string($active)."',
 						'".Database::escape_string($results_disabled)."',
 						'".Database::escape_string($attempts)."',
@@ -949,59 +983,65 @@ class Exercise
 			$random[] = FormValidator :: createElement ('static', 'help','help','<span style="font-style: italic;">'.get_lang('RandomQuestionsHelp').'</span>');
 			//$random[] = FormValidator :: createElement ('text', 'randomQuestions', null,null,'0');
 			$form -> addGroup($random,null,get_lang('RandomQuestions'),'<br />');
-
+			
+			//random answers
+			$radios_random_answers = array();
+			$radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('Yes'),'1');
+			$radios_random_answers[] = FormValidator :: createElement ('radio', 'randomAnswers', null, get_lang('No'),'0');
+			$form -> addGroup($radios_random_answers, null, get_lang('RandomAnswers'));
+			
+			//Attempts
 			$attempt_option=range(0,10);
-	    $attempt_option[0]=get_lang('Infinite');
-
-	    $form -> addElement('select', 'exerciseAttempts',get_lang('ExerciseAttempts'),$attempt_option);
-
-	    $form -> addElement('checkbox', 'enabletimelimit',get_lang('EnableTimeLimits'),null,'onclick = "  return timelimit() "');
-      $var= Exercise::selectTimeLimit();
+			$attempt_option[0]=get_lang('Infinite');
+	
+			$form -> addElement('select', 'exerciseAttempts',get_lang('ExerciseAttempts'),$attempt_option);
+	
+			$form -> addElement('checkbox', 'enabletimelimit',get_lang('EnableTimeLimits'),null,'onclick = "  return timelimit() "');
+		  	$var= Exercise::selectTimeLimit();
 
 			if(($this -> start_time!='0000-00-00 00:00:00')||($this -> end_time!='0000-00-00 00:00:00'))
 				$form -> addElement('html','<div id="options2" style="display:block;">');
 			else
 				$form -> addElement('html','<div id="options2" style="display:none;">');
 
-	    //$form -> addElement('date', 'start_time', get_lang('ExeStartTime'), array('language'=>'es','format' => 'dMYHi'));
-	    //$form -> addElement('date', 'end_time', get_lang('ExeEndTime'), array('language'=>'es','format' => 'dMYHi'));
-	    $form->addElement('datepicker', 'start_time', get_lang('ExeStartTime'), array('form_name'=>'exercise_admin'));
+	    	//$form -> addElement('date', 'start_time', get_lang('ExeStartTime'), array('language'=>'es','format' => 'dMYHi'));
+	    	//$form -> addElement('date', 'end_time', get_lang('ExeEndTime'), array('language'=>'es','format' => 'dMYHi'));
+	    	$form->addElement('datepicker', 'start_time', get_lang('ExeStartTime'), array('form_name'=>'exercise_admin'));
 			$form->addElement('datepicker', 'end_time', get_lang('ExeEndTime'), array('form_name'=>'exercise_admin'));
-       
-       
-      //$form -> addElement('select', 'enabletimercontroltotalminutes',get_lang('ExerciseTimerControlMinutes'),$time_minutes_option);
-      $form -> addElement('html','</div>');
+              
+     		//$form -> addElement('select', 'enabletimercontroltotalminutes',get_lang('ExerciseTimerControlMinutes'),$time_minutes_option);
+      		$form -> addElement('html','</div>');
       
 
-      	$check_option=$this -> selectType();
-//      var_dump($check_option);
+      		$check_option=$this -> selectType();
+			//      var_dump($check_option);
 
-	    if ($check_option==1 && isset($_GET['exerciseId'])) {
-	    	$diplay = 'none';
-	    } else {
-	    	$diplay = 'block';
-	    } 
+			if ($check_option==1 && isset($_GET['exerciseId'])) {
+				$diplay = 'none';
+			} else {
+				$diplay = 'block';
+			} 
       
-    $form -> addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
+    		$form -> addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
            
-      //Timer control
-      $time_hours_option = range(0,12);
-      $time_minutes_option = range(0,59);
-      $form -> addElement('checkbox', 'enabletimercontrol',get_lang('EnableTimerControl'),null,array('onclick' =>'option_time_expired()','id'=>'enabletimercontrol','onload'=>'check_load_time()'));      
-      $expired_date = (int)$this->selectExpiredTime();
-
-      if(($expired_date!='0')) {
-        $form -> addElement('html','<div id="timercontrol" style="display:block;">');
-      } else {
-        $form -> addElement('html','<div id="timercontrol" style="display:none;">');
-      }
+			//Timer control
+			$time_hours_option = range(0,12);
+			$time_minutes_option = range(0,59);
+			$form -> addElement('checkbox', 'enabletimercontrol',get_lang('EnableTimerControl'),null,array('onclick' =>'option_time_expired()','id'=>'enabletimercontrol','onload'=>'check_load_time()'));      
+			$expired_date = (int)$this->selectExpiredTime();
+
+			if(($expired_date!='0')) {
+			$form -> addElement('html','<div id="timercontrol" style="display:block;">');
+			} else {
+			$form -> addElement('html','<div id="timercontrol" style="display:none;">');
+			}
       	
-      	$form -> addElement('text', 'enabletimercontroltotalminutes',get_lang('ExerciseTotalDurationInMinutes'),array('style' => 'width : 35px','id' => 'enabletimercontroltotalminutes'));
-      $form -> addElement('html','</div>');
+			$form -> addElement('text', 'enabletimercontroltotalminutes',get_lang('ExerciseTotalDurationInMinutes'),array('style' => 'width : 35px','id' => 'enabletimercontroltotalminutes'));
+			$form -> addElement('html','</div>');
 			//$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2'));        
-      
-      $form -> addElement('html','</div>');  //End advanced setting
-      $form -> addElement('html','</div>');  
+			
+			$form -> addElement('html','</div>');  //End advanced setting
+			$form -> addElement('html','</div>');  
                
 	        $defaults = array();
 
@@ -1053,6 +1093,7 @@ class Exercise
 				} else {
 					$defaults['randomQuestions'] = $this -> random;
 				}
+				$defaults['randomAnswers'] = $this ->selectRandomAnswers();
 				$defaults['exerciseType'] = $this -> selectType();
 				$defaults['exerciseTitle'] = $this -> selectTitle();
 				$defaults['exerciseDescription'] = $this -> selectDescription();
@@ -1064,20 +1105,21 @@ class Exercise
 	            	$defaults['enabletimelimit'] = 1;
 
 			    $defaults['start_time'] = ($this->start_time!='0000-00-00 00:00:00')? $this -> start_time : date('Y-m-d 12:00:00');
-	        $defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00')?$this -> end_time : date('Y-m-d 12:00:00',time()+84600);
+	        	$defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00')?$this -> end_time : date('Y-m-d 12:00:00',time()+84600);
           
-          //Get expired time
-          if($this -> expired_time != '0') {
-            $defaults['enabletimercontrol'] = 1;
-          	$defaults['enabletimercontroltotalminutes'] = $this -> expired_time;
-          } else {
-          	$defaults['enabletimercontroltotalminutes'] = 0;
-          }
+				//Get expired time
+				if($this -> expired_time != '0') {
+				$defaults['enabletimercontrol'] = 1;
+				$defaults['enabletimercontroltotalminutes'] = $this -> expired_time;
+				} else {
+				$defaults['enabletimercontroltotalminutes'] = 0;
+				}
                 
 			} else {
 				$defaults['exerciseType'] = 2;
 				$defaults['exerciseAttempts'] = 0;
 				$defaults['randomQuestions'] = 0;
+				$defaults['randomAnswers'] = 0;
 				$defaults['exerciseDescription'] = '';
 				$defaults['exerciseFeedbackType'] = 0;
 				$defaults['results_disabled'] = 0;
@@ -1110,44 +1152,52 @@ class Exercise
 		$this -> updateFeedbackType($form -> getSubmitValue('exerciseFeedbackType'));
 		$this -> updateType($form -> getSubmitValue('exerciseType'));
 		$this -> setRandom($form -> getSubmitValue('randomQuestions'));
+		$this -> updateRandomAnswers($form -> getSubmitValue('randomAnswers'));
 		$this -> updateResultsDisabled($form -> getSubmitValue('results_disabled'));
     	$this -> updateExpiredTime($form -> getSubmitValue('enabletimercontroltotalminutes'));
+		
 		if($form -> getSubmitValue('enabletimelimit')==1) {
            $start_time = $form -> getSubmitValue('start_time');
            $this->start_time = $start_time['Y'].'-'.$start_time['F'].'-'.$start_time['d'].' '.$start_time['H'].':'.$start_time['i'].':00';
            $end_time = $form -> getSubmitValue('end_time');
            $this->end_time = $end_time['Y'].'-'.$end_time['F'].'-'.$end_time['d'].' '.$end_time['H'].':'.$end_time['i'].':00';
-    } else {
+    	} else {
            $this->start_time = '0000-00-00 00:00:00';
            $this->end_time = '0000-00-00 00:00:00';
         }
 
-    if($form -> getSubmitValue('enabletimercontrol') == 1) {
-           $expired_total_time = $form -> getSubmitValue('enabletimercontroltotalminutes');
-           if ($this->expired_time == 0) {
-               $this->expired_time = $expired_total_time;                    	
-           }
-
-    } else {
-           $this->expired_time = 0;
+		if($form -> getSubmitValue('enabletimercontrol') == 1) {
+			   $expired_total_time = $form -> getSubmitValue('enabletimercontroltotalminutes');
+			   if ($this->expired_time == 0) {
+				   $this->expired_time = $expired_total_time;                    	
+			   }
+	
+		} else {
+			$this->expired_time = 0;
+		}
+		
+		if($form -> getSubmitValue('randomAnswers') == 1) {
+           $this->random_answers=1;
+    	} else {
+           $this->random_answers=0;
         }
-                
-        $this -> save($type);
+		
+		$this -> save($type);
 	}
 
-    function search_engine_save() {
-        if ($_POST['index_document'] != 1) {
-            return;
-        }
+	function search_engine_save() {
+		if ($_POST['index_document'] != 1) {
+			return;
+		}
 
-	    $course_id = api_get_course_id();
+		$course_id = api_get_course_id();
 
-	    require_once(api_get_path(LIBRARY_PATH) . 'search/DokeosIndexer.class.php');
-	    require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
-	    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+		require_once(api_get_path(LIBRARY_PATH) . 'search/DokeosIndexer.class.php');
+		require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
+		require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
 
-	    $specific_fields = get_specific_field_list();
-	    $ic_slide = new IndexableChunk();
+		$specific_fields = get_specific_field_list();
+		$ic_slide = new IndexableChunk();
 
 	    $all_specific_terms = '';
 	    foreach ($specific_fields as $specific_field) {

main/exercice/exercise.lib.php

@@ -134,7 +134,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
 			$answer=$objAnswerTmp->selectAnswer($answerId);
 			$answerCorrect=$objAnswerTmp->isCorrect($answerId);
-
+			$numAnswer=$objAnswerTmp->selectAutoId($answerId);
 			if($answerType == FILL_IN_BLANKS) {
 				// splits text and weightings that are joined with the character '::'
 				list($answer)=explode('::',$answer);
@@ -209,10 +209,10 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 				 <td>
 				 	<div class='u-m-answer'>
 					<p style='float:left; padding-right:4px;'>
-					<span><input class='checkbox' type='radio' name='choice[".$questionId."]' value='".$answerId."'></p></span>";
-				$answer=api_parse_tex($answer);
-				$s.=strip_tags($answer);
-				$s.="</div></td></tr>";
+					<span><input class='checkbox' type='radio' name='choice[".$questionId."]' value='".$numAnswer."'></p></span>";
+                    $answer=api_parse_tex($answer);
+                    $s.=strip_tags($answer);
+                    $s.="</div></td></tr>";
 
 			} elseif($answerType == MULTIPLE_ANSWER) {
 			// multiple answers
@@ -221,7 +221,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 				  <td>
 					 <div class='u-m-answer'>
 					 <p style='float:left; padding-right:4px;'>
-					 <span><input class='checkbox' type='checkbox' name='choice[".$questionId."][".$answerId."]' value='1'></p></span>";
+					 <span><input class='checkbox' type='checkbox' name='choice[".$questionId."][".$numAnswer."]' value='1'></p></span>";
 				$answer = api_parse_tex($answer);
 				$s.=strip_tags($answer);
 				$s.="</div></td></tr>";
@@ -234,7 +234,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 			}
 			// free answer
 
-			// matching
+			// matching // TODO: replace $answerId by $numAnswer
 			else {
 				if(!$answerCorrect) {
 					// options (A, B, C, ...) that will be put into the list-box

main/exercice/exercise_result.php

@@ -609,6 +609,8 @@ foreach ($questionList as $questionId) {
 		$answerComment=$objAnswerTmp->selectComment($answerId);
 		$answerCorrect=$objAnswerTmp->isCorrect($answerId);
 		$answerWeighting=$objAnswerTmp->selectWeighting($answerId);
+		$numAnswer=$objAnswerTmp->selectAutoId($answerId);
+		
 		switch ($answerType) {
 			// for unique answer
 			case UNIQUE_ANSWER :
@@ -616,7 +618,7 @@ foreach ($questionList as $questionId) {
 					// then give him the corresponding score
 					// (maybe a negative score, positive score or 0)
 					// Positive score should only be given when we are going over the right answer
-					$studentChoice=($choice == $answerId)?1:0;
+					$studentChoice=($choice == $numAnswer)?1:0;
 					if($studentChoice) {
 					  	$questionScore+=$answerWeighting;
 						$totalScore+=$answerWeighting;
@@ -624,7 +626,7 @@ foreach ($questionList as $questionId) {
 					break;
 			// for multiple answers
 			case MULTIPLE_ANSWER :
-					$studentChoice=$choice[$answerId];
+					$studentChoice=$choice[$numAnswer];
 					if($studentChoice) {
 						$questionScore+=$answerWeighting;
 						$totalScore+=$answerWeighting;
@@ -794,7 +796,7 @@ foreach ($questionList as $questionId) {
 
 
 					break;
-			// for matching
+			// for matching TODO: replace $answerId id by $numAnswer
 			case MATCHING :
 					if($answerCorrect)
 					{

main/forum/forumfunction.inc.php

@@ -1941,11 +1941,11 @@ function show_add_post_form($action='', $id='', $form_values='') {
 		// thread qualify
 
 		$form->addElement('static','Group', '<br /><strong>'.get_lang('AlterQualifyThread').'</strong>');
-		$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'Style="width:40px"');
 		$form->applyFilter('numeric_calification', 'html_filter');
 		$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
 
 		$form -> addElement('html','<div id="options_field" style="display:none">');
+		$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'Style="width:40px"');
 		$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'));
 		$form->applyFilter('calification_notebook_title', 'html_filter');
 		$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="this.select();"');
@@ -2372,7 +2372,6 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
 
 	if (!isset($_GET['edit'])) {
 		$form->addElement('static','Group','<strong>'.get_lang('AlterQualifyThread').'</strong>');
-		$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'value="'.$current_thread['thread_qualify_max'].'" Style="width:40px"');
 		$form->applyFilter('numeric_calification', 'html_filter');
 		$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
 		$defaults['thread_qualify_gradebook']=is_resource_in_course_gradebook(api_get_course_id(),5,$_GET['thread'],api_get_session_id());
@@ -2382,6 +2381,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
 		} else {
 			$form -> addElement('html','<div id="options_field" style="display:none">');
 		}
+		$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'value="'.$current_thread['thread_qualify_max'].'" Style="width:40px"');
 		$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'),'value="'.$current_thread['thread_title_qualify'].'"');
 		$form->applyFilter('calification_notebook_title', 'html_filter');
 		$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="'.$current_thread['thread_weight'].'" Style="width:40px"');

main/inc/lib/add_course.lib.inc.php

@@ -636,6 +636,7 @@ function update_Db_course($courseDbName)
 		sound varchar(50) default NULL,
 		type tinyint unsigned NOT NULL default 1,
 		random smallint(6) NOT NULL default 0,
+		random_answers tinyint unsigned NOT NULL default 0,
 		active tinyint NOT NULL default 0,
 		results_disabled TINYINT UNSIGNED NOT NULL DEFAULT 0,
 		access_condition TEXT DEFAULT NULL,
@@ -681,10 +682,14 @@ function update_Db_course($courseDbName)
 	    hotspot_coordinates text,
 	    hotspot_type enum('square','circle','poly','delineation') default NULL,
 	    destination text NOT NULL,
-		PRIMARY KEY (id, question_id)
+		id_auto int NOT NULL AUTO_INCREMENT,		
+		PRIMARY KEY (id, question_id),
+		UNIQUE KEY id_auto (id_auto)
 		)";
 	Database::query($sql, __FILE__, __LINE__);
 
+
+
 	// Exercise tool - Test/question relations
 	$sql = "
 		CREATE TABLE `".$TABLEQUIZQUESTION . "` (
@@ -2251,12 +2256,12 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
 			Exercise tool
 		-----------------------------------------------------------
 		*/
-		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '1', '1', '".lang2db(get_lang('Ridiculise')) . "', '0', '".lang2db(get_lang('NoPsychology')) . "', '-5', '1','','','')",__FILE__,__LINE__);
-		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '2', '1', '".lang2db(get_lang('AdmitError')) . "', '0', '".lang2db(get_lang('NoSeduction')) . "', '-5', '2','','','')", __FILE__, __LINE__);
-		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '3', '1', '".lang2db(get_lang('Force')) . "', '1', '".lang2db(get_lang('Indeed')) . "', '5', '3','','','')", __FILE__, __LINE__);
-		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '4', '1', '".lang2db(get_lang('Contradiction')) . "', '1', '".lang2db(get_lang('NotFalse')) . "', '5', '4','','','')", __FILE__, __LINE__);
+		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '1', '1', '".lang2db(get_lang('Ridiculise')) . "', '0', '".lang2db(get_lang('NoPsychology')) . "', '-5', '1','','','','')",__FILE__,__LINE__);
+		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '2', '1', '".lang2db(get_lang('AdmitError')) . "', '0', '".lang2db(get_lang('NoSeduction')) . "', '-5', '2','','','','')", __FILE__, __LINE__);
+		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '3', '1', '".lang2db(get_lang('Force')) . "', '1', '".lang2db(get_lang('Indeed')) . "', '5', '3','','','','')", __FILE__, __LINE__);
+		Database::query("INSERT INTO `".$TABLEQUIZANSWERSLIST . "` VALUES ( '4', '1', '".lang2db(get_lang('Contradiction')) . "', '1', '".lang2db(get_lang('NotFalse')) . "', '5', '4','','','','')", __FILE__, __LINE__);
 		$html=addslashes('<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td width="110" valign="top" align="left"><img src="'.api_get_path(WEB_CODE_PATH).'default_course_document/images/mr_dokeos/thinking.jpg"></td><td valign="top" align="left">'.lang2db(get_lang('Antique')).'</td></tr></table>');
-		Database::query('INSERT INTO `'.$TABLEQUIZ . '` (title, description, type, random, active, results_disabled ) VALUES ("'.lang2db(get_lang('ExerciceEx')) . '", "'.$html.'", "1", "0", "1", "0")', __FILE__, __LINE__);
+		Database::query('INSERT INTO `'.$TABLEQUIZ . '` (title, description, type, random, random_answers, active, results_disabled ) VALUES ("'.lang2db(get_lang('ExerciceEx')) . '", "'.$html.'", "1", "0", "0", "1", "0")', __FILE__, __LINE__);
 		Database::query("INSERT INTO `".$TABLEQUIZQUESTIONLIST . "` (id, question, description, ponderation, position, type, picture, level) VALUES ( '1', '".lang2db(get_lang('SocraticIrony')) . "', '".lang2db(get_lang('ManyAnswers')) . "', '10', '1', '2','',1)", __FILE__, __LINE__);
 		Database::query("INSERT INTO `".$TABLEQUIZQUESTION . "` (question_id, exercice_id, question_order) VALUES (1,1,1)", __FILE__, __LINE__);
 

main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql

@@ -93,3 +93,5 @@ ALTER TABLE group_category ADD COLUMN chat_state TINYINT DEFAULT 1, ADD INDEX (c
 ALTER TABLE student_publication ADD COLUMN weight float(6,2) UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE course_description ADD COLUMN description_type TINYINT NOT NULL DEFAULT 0;
 ALTER TABLE dropbox_category ADD COLUMN session_id smallint NOT NULL DEFAULT 0, ADD INDEX (session_id);
+ALTER TABLE quiz ADD COLUMN random_answers TINYINT UNSIGNED NOT NULL DEFAULT 0 AFTER random;
+ALTER TABLE quiz_answer ADD COLUMN id_auto INT NOT NULL AUTO_INCREMENT, ADD UNIQUE INDEX (id_auto);

main/lang/arabic/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "  لا تضيف ف&
 $langTracking = "تتبّع";
 $langEnter2passToChange = "ادخل كلمة المرور مرتين لكي يمكن تغيرها عدا ذلك اترك الفئة فارغة";
 $langAuthInfo = "التأكد من صلاحية الدخول";
-$langDelImage = "احذف الصورة";
 $langUpdateImage = "غير الصورة";
 $langImageWrong = "حجم الملف يجب ان يكون اصغر من";
 $langAddImage = "صورة";

main/lang/arabic/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "الدخول";
 $AutostartMp3 = "اضغط موافق اذا كنت تريد تشغيل الملف الصوتي اوتوماتيكيا";
 $Assignments = "الواجبات";
 $Forum = "منتدى";
+$langDelImage = "احذف الصورة";
 $langCode = "رمز المقرر";
 $langUp = "فوق";
 $Down = "أسفل";

main/lang/arabic_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "الملف يجب أن يكون بتنسيق CSV . ل
 $langTracking = "المتابعة";
 $langEnter2passToChange = "ادخل كلمة المرور مرتين لتغييرها. أو اترك الحقول فارغة ";
 $langAuthInfo = "التحقق ";
-$langDelImage = "إزالة صورة";
 $langUpdateImage = "تغيير صورة";
 $langImageWrong = "يجب أن يكون حجم الملف أقل من ";
 $langAddImage = "صورة";

main/lang/arabic_unicode/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = " التسجيل";
 $AutostartMp3 = "اضغط على موافق إذا كنت ترغب في تشغيل الملف الصوتي تلقائياً";
 $Assignments = "نشرات الطلاب ";
 $Forum = "منتدى ";
+$langDelImage = "إزالة صورة";
 $langCode = "رمز المقرر";
 $langUp = "أعلى";
 $Down = "أسفل";

main/lang/asturian/admin.inc.php

@@ -1101,4 +1101,20 @@ $UserTag = "Etiqueta d\'usuariu";
 $SelectSession = "Seleicionar sesión";
 $GroupPermissions = "Permisos del grupu";
 $SpecialCourse = "Cursu especial";
+$MathMimetexTitle = "Editor matemáticu mimeTEX";
+$MathMimetexComment = "Activar l\'editor matemáticu mimeTEX";
+$MathASCIImathMLTitle = "Editor matemáticu SCIImathML";
+$MathASCIImathMLComment = "Activar l\'editor matemáticu SCIImathML";
+$YoutubeForStudentsTitle = "Permitir a los escolinos inxertar videos de Youtube";
+$YoutubeForStudentsComment = "Activar la posibilidá de que los escolinos puedan inxertar videos de Youtube";
+$BlockCopyPasteForStudentsTitle = "Bloquiar a los escolinos copiar y pegar";
+$BlockCopyPasteForStudentsComment = "Bloquiar a los escolinos la posibilidá de copiar y pegar nel editor WYSIWYG";
+$MoreButtonsForMaximizedModeTitle = "Barres de botones estendíes";
+$MoreButtonsForMaximizedModeComment = "Activar les barres de botones estendíes cuando l\'editor WYSISYG ta masimizáu";
+$Editor = "Editor WYSIWYG";
+$GoToCourseAfterLoginTitle = "Dir direutamente al cursu dempués d\'identificase";
+$GoToCourseAfterLoginComment = "Cuando un usuariu te apuntáu sólamente nun cursu, dir direutamente al cursu dempués d\'identificase";
+$GroupList = "Llista de grupos";
+$AllowStudentsDownloadFoldersTitle = "Permitir a los escolinos baxar direutorios";
+$AllowStudentsDownloadFoldersComment = "Permitir a los escolinos empaquetar y baxar un direutoriu completu na ferramienta documentos";
 ?>

main/lang/asturian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "L\'archivu tien de tar en formatu CSV. Nun ponga espac
 $langTracking = "Siguimientu";
 $langEnter2passToChange = "Pa cambiar la seña, escriba la nueva nestos dos campos. Si quier caltener l\'actual, nun escriba nada.";
 $langAuthInfo = "Identificación";
-$langDelImage = "Esborrar foto";
 $langUpdateImage = "Cambiar foto";
 $langImageWrong = "L\'archivu tien de tener un tamañu menor de ";
 $langAddImage = "Incluyir foto";

main/lang/asturian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Usuariu/a";
 $AutostartMp3 = "Calque Aceutar si quier que l\'archivu d\'audiu eche andar automáticamente";
 $Assignments = "Trabayos";
 $Forum = "Foru";
+$langDelImage = "Esborrar foto";
 $langCode = "Códigu del cursu";
 $langUp = "Subir";
 $Down = "Baxar";

main/lang/brazilian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "O arquivo precisa estar no formato CSV. N
 $langTracking = "Acompanhamento";
 $langEnter2passToChange = "Informe a sua senha duas vezes para modificá-la. Caso não o queira, deixe os campos em branco.";
 $langAuthInfo = "Autenticação";
-$langDelImage = "Remover foto";
 $langUpdateImage = "Trocar foto";
 $langImageWrong = "O arquivo deve ser menor que";
 $langAddImage = "Foto";

main/lang/brazilian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Clique em OK se deseja que o arquivo de áudio toque automaticamente";
 $Assignments = "Trabalhos dos Estudantes";
 $Forum = "Fórum";
+$langDelImage = "Remover foto";
 $langCode = "Código do curso";
 $langUp = "Acima";
 $Down = "desce";

main/lang/bulgarian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Файлът т&#10
 $langTracking = "Преглед на посещенията";
 $langEnter2passToChange = "&#1042;&#1098;&#1074;&#1077;&#1076;&#1077;&#1090;&#1077; &#1074;&#1072;&#1096;&#1072;&#1090;&#1072; &#1087;&#1072;&#1088;&#1086;&#1083;&#1072; &#1076;&#1074;&#1072; &#1087;&#1098;&#1090;&#1080;, &#1079;&#1072; &#1076;&#1072; &#1103; &#1089;&#1084;&#1077;&#1085;&#1080;&#1090;&#1077;.<br/>&#1054;&#1089;&#1090;&#1072;&#1074;&#1077;&#1090;&#1077; &#1076;&#1074;&#1077;&#1090;&#1077; &#1087;&#1086;&#1083;&#1077;&#1090;&#1072; &#1087;&#1088;&#1072;&#1079;&#1085;&#1080;, &#1072;&#1082;&#1086; &#1085;&#1077; &#1080;&#1089;&#1082;&#1072;&#1090;&#1077; &#1076;&#1072; &#1089;&#1084;&#1077;&#1085;&#1080;&#1090;&#1077; &#1087;&#1072;&#1088;&#1086;&#1083;&#1072;&#1090;&#1072;.";
 $langAuthInfo = "&#1040;&#1074;&#1090;&#1077;&#1085;&#1090;&#1080;&#1082;&#1072;&#1094;&#1080;&#1103;";
-$langDelImage = "&#1055;&#1088;&#1077;&#1084;&#1072;&#1093;&#1074;&#1072;&#1085;&#1077; &#1085;&#1072; &#1089;&#1085;&#1080;&#1084;&#1082;&#1072;&#1090;&#1072;";
 $langUpdateImage = "&#1057;&#1084;&#1103;&#1085;&#1072; &#1085;&#1072; &#1089;&#1085;&#1080;&#1084;&#1082;&#1072;&#1090;&#1072;";
 $langImageWrong = "&#1056;&#1072;&#1079;&#1084;&#1077;&#1088;&#1098;&#1090; &#1085;&#1072; &#1092;&#1072;&#1081;&#1083;&#1072; &#1090;&#1088;&#1103;&#1073;&#1074;&#1072; &#1076;&#1072; &#1077; &#1087;&#1086;-&#1084;&#1072;&#1083;&#1098;&#1082; &#1086;&#1090;";
 $langAddImage = "&#1057;&#1085;&#1080;&#1084;&#1082;&#1072;";

main/lang/bulgarian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Потребите&#1
 $AutostartMp3 = "Искате ли аудио-файлът да стартира автоматично?";
 $Assignments = "Задачи";
 $Forum = "Форум";
+$langDelImage = "Премахване на снимката";
 $langCode = "Код на курса";
 $langUp = "Нагоре";
 $Down = "Надолу";

main/lang/catalan/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "L\'arxiu ha d\'estar format CSV. No afegeixi espais. L
 $langTracking = "Seguiment";
 $langEnter2passToChange = "Per a canviar la contrasenya, introdueixi la nova contrasenya en aquests dos camps. Si desitja mantenir l\'actual, deixi buits els dos camps. ";
 $langAuthInfo = "Autentificació";
-$langDelImage = "Eliminar foto";
 $langUpdateImage = "Canviar foto";
 $langImageWrong = "L\'arxiu ha de tenir una grandària menor de ";
 $langAddImage = "Incloure foto";

main/lang/catalan/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Nom d\'usuari";
 $AutostartMp3 = "Pressioni Acceptar si desitja que l\'arxiu d\'àudio es reprodueixi automàticament";
 $Assignments = "Assignments";
 $Forum = "Forum";
+$langDelImage = "Eliminar foto";
 $langCode = "Codi del curs";
 $langUp = "Amunt";
 $Down = "Avall";

main/lang/croatian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Datoteka treba biti formata CSV. Ne dodavajte razmake.
 $langTracking = "Praćenje";
 $langEnter2passToChange = "Unesite zaporku dvaput kako biste je promijenili. U suprotnome ostavite polja praznima.";
 $langAuthInfo = "Autentifikacija";
-$langDelImage = "Ukloni sliku";
 $langUpdateImage = "Izmijeni sliku";
 $langImageWrong = "Veličina datoteke treba biti manja od";
 $langAddImage = "Slika";

main/lang/croatian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Korisničko ime";
 $AutostartMp3 = "Odaberite OK ukoliko želite pokrenuti audio datoteku automatski";
 $Assignments = "Studentski radovi";
 $Forum = "Forum";
+$langDelImage = "Ukloni sliku";
 $langCode = "Šifra kolegija";
 $langUp = "Gore";
 $Down = "dolje";

main/lang/danish/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Filen ska v
 $langTracking = "Statistik";
 $langEnter2passToChange = "Indtast dit adgangskode to gange for at ændre det. Hvis ikke, skal du lade felterne stå tomme.";
 $langAuthInfo = "Godkendelse";
-$langDelImage = "Fjern billede";
 $langUpdateImage = "Ændre billede";
 $langImageWrong = "Filstørrelsen skal være mindre end";
 $langAddImage = "Billede";

main/lang/danish/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Klik på ok, hvis audio-filen skal afspilles automatisk ";
 $Assignments = "Afleveringer";
 $Forum = "Forum";
+$langDelImage = "Fjern billede";
 $langCode = "Kursuskode";
 $langUp = "op";
 $Down = "ned";

main/lang/dutch/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Het bestand moet in CSV-formaat zijn. Voeg geen spatie
 $langTracking = "Statistieken";
 $langEnter2passToChange = "Nieuw wachtwoord tweemaal invullen, of blanco laten om het huidige te behouden.";
 $langAuthInfo = "Authenticatie";
-$langDelImage = "Verwijder foto";
 $langUpdateImage = "Wijzig foto";
 $langImageWrong = "De bestandsgrootte voor de foto moet kleiner zijn dan";
 $langAddImage = "Foto";

main/lang/dutch/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Gebruikersnaam";
 $AutostartMp3 = "Druk OK als u het audiobestand automatisch wilt laten afspelen";
 $Assignments = "Opdrachten";
 $Forum = "Forum";
+$langDelImage = "Verwijder foto";
 $langCode = "Cursuscode";
 $langUp = "Hoger niveau";
 $Down = "omlaag";

main/lang/dutch_corporate/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Het bestand moet in CSV-formaat zijn. Voeg geen spatie
 $langTracking = "Statistieken";
 $langEnter2passToChange = "Nieuw wachtwoord tweemaal invullen, of blanco laten om het huidige te behouden.";
 $langAuthInfo = "Authenticatie";
-$langDelImage = "Verwijder foto";
 $langUpdateImage = "Wijzig foto";
 $langImageWrong = "De bestandsgrootte voor de foto moet kleiner zijn dan";
 $langAddImage = "Foto";

main/lang/dutch_corporate/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Gebruikersnaam";
 $AutostartMp3 = "Druk OK als u het audiobestand automatisch wilt laten afspelen";
 $Assignments = "Gebruikerspublicaties";
 $Forum = "Forum";
+$langDelImage = "Verwijder foto";
 $langCode = "Modulecode";
 $langUp = "Hoger niveau";
 $Down = "omlaag";

main/lang/english/admin.inc.php

@@ -1100,9 +1100,6 @@ $SendEmailToAdminComment = "Send an email to administardor of the platform, each
 $UserTag = "User tag";
 $SelectSession = "Select session";
 $GroupPermissions = "Group Permissions";
-$MessagesSent = "Messages sent";
-$MessagesReceived = "Messages received";
-$CountFriends = "Number of friends";
 $SpecialCourse = "Special course";
 $MathMimetexTitle = "mimeTEX mathematical editor";
 $MathMimetexComment = "Enable mimeTeX mathematical editor";
@@ -1119,5 +1116,5 @@ $GoToCourseAfterLoginTitle = "Go directly to the course after login";
 $GoToCourseAfterLoginComment = "When a user is registered in one course, go directly to the course after login";
 $GroupList = "Group List";
 $AllowStudentsDownloadFoldersTitle = "Allow students to download directories";
-$AllowStudentsDownloadFoldersComment = "Allow to students pack and download a complete directory in the document tool";
+$AllowStudentsDownloadFoldersComment = "Permitir a los estudiantes empaquetar y descargar un directorio completo en la herramienta documentos";
 ?>

main/lang/english/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "File should be CSV format. Do not add spaces. Structur
 $langTracking = "Reporting";
 $langEnter2passToChange = "To change your password, enter your current password in the field above and your new password in both fields below. To maintain the current password, leave the three fields empty.";
 $langAuthInfo = "Authentication";
-$langDelImage = "Remove picture";
 $langUpdateImage = "Change picture";
 $langImageWrong = "The file size should be smaller than";
 $langAddImage = "Picture";

main/lang/english/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Do you want audio file to START automatically?";
 $Assignments = "Assignments";
 $Forum = "Forum";
+$langDelImage = "Remove picture";
 $langCode = "Training code";
 $langUp = "Up";
 $Down = "down";

main/lang/esperanto/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "La dosiero estu CSV-formata. Ne enmetu spacetojn. La s
 $langTracking = "Statistikoj ";
 $langEnter2passToChange = "Dufoje enigi novan pasvorton, aŭ enigi nenion por konservi vian aktualan";
 $langAuthInfo = "Aŭtentikigo ";
-$langDelImage = "Forigi foton ";
 $langUpdateImage = "Ŝanĝi foton ";
 $langImageWrong = "La grando de la foto estu maksimume ";
 $langAddImage = "Foto ";

main/lang/esperanto/trad4all.inc.php

@@ -24,6 +24,7 @@ $Language = "Lingvo";
 $LoginName = "Uzula nomo";
 $Assignments = "Studentaj publikaĵoj ";
 $Forum = "Forumo ";
+$langDelImage = "Forigi foton ";
 $langCode = "Kurskodo ";
 $langUp = "Pli alta nivelo";
 $Down = "malsupren";

main/lang/finnish/registration.inc.php

@@ -3,7 +3,6 @@ for more information: see languages.txt in the lang folder.
 */
 $langTracking = "Seuranta";
 $langEnter2passToChange = "Vaihtaaksesi salasanasi syötä se kaksi kertaa. Muussa tapauksessa jätä kentät tyhjiksi.";
-$langDelImage = "Poista kuva";
 $langUpdateImage = "Vaihda kuva";
 $langImageWrong = "Tiedoston koon pitäisi olla pienempi kuin";
 $langAddImage = "Kuva";

main/lang/finnish/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Kirjaudu";
 $AutostartMp3 = "Haluatko että ääni soitetaan automaattisesti?";
 $Assignments = "Oppilaan tehtävät";
 $Forum = "Keskustelualue";
+$langDelImage = "Poista kuva";
 $langCode = "Kurssikoodi";
 $langUp = "Ylös";
 $Down = "alas";

main/lang/french/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Le fichier devrait
 $langTracking = "Suivi";
 $langEnter2passToChange = "La saisie du nouveau mot de passe ainsi que sa confirmation sont nécessaires en cas de modification de votre mot de passe. <br />Dans tous les autres cas, laissez ces deux champs vides.";
 $langAuthInfo = "Paramètres de connexion";
-$langDelImage = "Supprimer la photo";
 $langUpdateImage = "Changer de photo";
 $langImageWrong = "La taille de l\'image doit être inférieure à";
 $langAddImage = "Photo";

main/lang/french/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Cliquez sur Ok pour que le son demarre automatiquement. Cliquez sur Annuler pour que le son demarre quand on cliquera sur Play.";
 $Assignments = "Travaux";
 $Forum = "Forums";
+$langDelImage = "Supprimer la photo";
 $langCode = "Code";
 $langUp = "Monter";
 $Down = "descendre";

main/lang/french_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Le fichier devrait être au format CSV. N\'ajoutez pas
 $langTracking = "Suivi";
 $langEnter2passToChange = "La saisie du nouveau mot de passe ainsi que sa confirmation sont nécessaires en cas de modification de votre mot de passe. <br />Dans tous les autres cas, laissez ces deux champs vides.";
 $langAuthInfo = "Paramètres de connexion";
-$langDelImage = "Supprimer la photo";
 $langUpdateImage = "Changer de photo";
 $langImageWrong = "La taille du fichier doit être inférieure à";
 $langAddImage = "Ajoutez une photo";

main/lang/french_unicode/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Identifiant";
 $AutostartMp3 = "Cliquez ok si vous souhaitez le démarrage automatique du fichier audio";
 $Assignments = "Travaux";
 $Forum = "Forums";
+$langDelImage = "Supprimer la photo";
 $langCode = "Code cours";
 $langUp = "Monter";
 $Down = "descendre";

main/lang/galician/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "O arquivo debe estar en formato CSV. Non engada espazo
 $langTracking = "Seguimento";
 $langEnter2passToChange = "Introuduce o teu contrasinal dúas veces para cambialo. Se non queres cambialo, deixa o espazo en branco.";
 $langAuthInfo = "Autentificación";
-$langDelImage = "Borrar imaxe";
 $langUpdateImage = "Cambiar imaxe";
 $langImageWrong = "O ficheiro coa imaxe debe ser menor de";
 $langAddImage = "Engadir foto";

main/lang/galician/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Nome de usuario";
 $AutostartMp3 = "Pulse OK se desexa que o arquivo de audio se reproduza automaticamente.";
 $Assignments = "Tarefas dos estudantes";
 $Forum = "Foro";
+$langDelImage = "Borrar imaxe";
 $langCode = "Código do curso";
 $langUp = "Subir";
 $Down = "Descargar";

main/lang/german/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Die Datei sollte CSV-formatiert sein. F
 $langTracking = "Tracking";
 $langEnter2passToChange = "Wenn Sie Ihr Passwort ändern möchten, geben Sie das neue Passwort bitte zweimal ein. Andernfalls lassen Sie diese Felder einfach frei.";
 $langAuthInfo = "Authentifizierung";
-$langDelImage = "Bild entfernen";
 $langUpdateImage = "Bild ändern";
 $langImageWrong = "Die Dateigröße sollte geringer sein als";
 $langAddImage = "Bild";

main/lang/german/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Klick OK, wenn die Audio Datei automatisch abgespielt werden soll";
 $Assignments = "Unterlagen der Teilnehmer/innen";
 $Forum = "Foren";
+$langDelImage = "Bild entfernen";
 $langCode = "Kurscode";
 $langUp = "nach oben";
 $Down = "nach unten";

main/lang/hungarian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "A f
 $langTracking = "Naplózás";
 $langEnter2passToChange = "Írja be kétszer jelszavát a megváltoztatásához. Hagyja üresen a mezőket, ha nem kívánja megváltoztatni jelszavát.";
 $langAuthInfo = "Ellenőrzés";
-$langDelImage = "Kép eltávolítása";
 $langUpdateImage = "Kép cseréje";
 $langImageWrong = "A fájl mérte nem lehet nagyobb, mint";
 $langAddImage = "Kép";

main/lang/hungarian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Azonos
 $AutostartMp3 = "Kattintson az OK-ra, ha azt szeretné, hogy a hangfájl lejátszása automatikusan elinduljon";
 $Assignments = "Hallgatói publikációk";
 $Forum = "Fórum";
+$langDelImage = "Kép eltávolítása";
 $langCode = "Kurzus kód";
 $langUp = "Fel";
 $Down = "le";

main/lang/indonesian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "File haru dalam format CSV. Jangan tambah spasi. Struk
 $langTracking = "Tracking";
 $langEnter2passToChange = "Masukkan password dua kali untuk merubahnya.  Jika tidak ingin merubah, biarkan kosong.";
 $langAuthInfo = "Autentikasi";
-$langDelImage = "Hapus foto";
 $langUpdateImage = "Ubah foto";
 $langImageWrong = "Ukuran file harus lebih kecil dari";
 $langAddImage = "Foto";

main/lang/indonesian/trad4all.inc.php

@@ -24,6 +24,7 @@ $Language = "Bahasa";
 $LoginName = "Login";
 $Assignments = "Tugas-tugas";
 $Forum = "Forum";
+$langDelImage = "Hapus foto";
 $langCode = "Kode Mata Kuliah";
 $langUp = "Ke Atas";
 $Down = "turun";

main/lang/italian/admin.inc.php

@@ -1101,4 +1101,20 @@ $UserTag = "Etichetta utente";
 $SelectSession = "Seleziona la sessione";
 $GroupPermissions = "Permessi del gruppo";
 $SpecialCourse = "Corso speciale";
+$MathMimetexTitle = "Editor matematico mimeTeX";
+$MathMimetexComment = "Abilita l\'editor matematico mimeTeX";
+$MathASCIImathMLTitle = "Editor matematico ASCIIMathML";
+$MathASCIImathMLComment = "Abilita\'editor matematico ASCIIMathML";
+$YoutubeForStudentsTitle = "Permetti ai corsisti di inserire video da YouTube";
+$YoutubeForStudentsComment = "Abilita la possibilità per i corsisti di inserire video da YouTube";
+$BlockCopyPasteForStudentsTitle = "Disabilita il copia/incolla per i corsisti";
+$BlockCopyPasteForStudentsComment = "Disabilita la possibilità di usare le funzioni Copia/Incolla da parte dei corsisti nell\'editor WYSIWYG";
+$MoreButtonsForMaximizedModeTitle = "Barra degli strumenti estesa";
+$MoreButtonsForMaximizedModeComment = "La barra degli strumenti dell\'editor WYSIWYG conterrà più opzioni";
+$Editor = "Editor WYSIWYG";
+$GoToCourseAfterLoginTitle = "Entra direttamente nel corso dopo l\'accesso alla piattaforma";
+$GoToCourseAfterLoginComment = "Se l\'utente è iscritto ad un solo corso, potà entrare immediatamente nel corso dopo l\'accesso";
+$GroupList = "Elenco dei gruppi";
+$AllowStudentsDownloadFoldersTitle = "Permetti il download delle directory da parte dei corsisti";
+$AllowStudentsDownloadFoldersComment = "I corsisti potranno scaricare una versione compressa di intere directory nella sezione Documenti";
 ?>

main/lang/italian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Il file deve essere in formato CSV. Non aggiungere spa
 $langTracking = "Statistiche";
 $langEnter2passToChange = "Inserisci due volte la password per cambiarla. Altrimenti, lascia i campi vuoti.";
 $langAuthInfo = "Autenticazione";
-$langDelImage = "Elimina immagine";
 $langUpdateImage = "Cambia immagine";
 $langImageWrong = "La dimensione del file deve essere minore di";
 $langAddImage = "Immagine";

main/lang/italian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Nome utente";
 $AutostartMp3 = "Premi OK se desideri far partire il brano al caricamento";
 $Assignments = "Elaborati";
 $Forum = "Forum";
+$langDelImage = "Elimina immagine";
 $langCode = "Codice del Corso";
 $langUp = "Risali";
 $Down = "giù";

main/lang/latvian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Failam jābūt CSV formātā. Nepievie
 $langTracking = "Sekot līdz";
 $langEnter2passToChange = "Ievadiet paroli divreiz, lai veiktu tās maiņu. Ja nevēlaties to darīt, atstājiet lauciņus tukšus.";
 $langAuthInfo = "Autorizēšanās";
-$langDelImage = "Dzēst attēlu";
 $langUpdateImage = "Mainīt ģīmetni";
 $langImageWrong = "Dokumenta izmēram jābūt mazākam par";
 $langAddImage = "Attēls";

main/lang/latvian/trad4all.inc.php

@@ -24,6 +24,7 @@ $Language = "Valoda";
 $LoginName = "lietotājvārds";
 $Assignments = "Studentu publikācijas";
 $Forum = "Diskusija";
+$langDelImage = "Dzēst attēlu";
 $langCode = "Kursa kods";
 $langUp = "Augšup";
 $Down = "Lejup";

main/lang/lithuanian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Failas turi buti CSV formato. Napalikite tarpų. Struk
 $langTracking = "Įvertinimų sekimas";
 $langEnter2passToChange = "Keisdami įveskite savo slaptažodį dukart. Kitaip palikite šiuos laukus tuščius.";
 $langAuthInfo = "Autentifikacija";
-$langDelImage = "Pašalinti nuotrauką";
 $langUpdateImage = "Pakeisti nuotrauką";
 $langImageWrong = "Failo dydis turi buti mažesnis negu";
 $langAddImage = "Nuotrauka";

main/lang/lithuanian/trad4all.inc.php

@@ -25,6 +25,7 @@ $Language = "Kalba";
 $LoginName = "Prisijungimo vardas";
 $Assignments = "Studentų publikacijos";
 $Forum = "Forumas";
+$langDelImage = "Pašalinti nuotrauką";
 $langCode = "Course code";
 $langUp = "Aukštyn";
 $Down = "žemyn";

main/lang/macedonian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Датотек&#107
 $langTracking = "Следење";
 $langEnter2passToChange = "Внесете ја вашата лозинка двапати за да ја промените. Во спротивно, оставете ги полињата празни.";
 $langAuthInfo = "Проверка на автентичноста";
-$langDelImage = "Отстрани ја сликата";
 $langUpdateImage = "Промени ја сликата";
 $langImageWrong = "Гоемината на датотеката треба да е помала од";
 $langAddImage = "Слика";

main/lang/macedonian/trad4all.inc.php

@@ -25,6 +25,7 @@ $Language = "Јазик";
 $LoginName = "Корисничко име";
 $Assignments = "Публикации на курсистите";
 $Forum = "Форум";
+$langDelImage = "Отстрани ја сликата";
 $langCode = "Шифра на курсот";
 $langUp = "Горе";
 $Down = "долу";

main/lang/norwegian/registration.inc.php

@@ -3,7 +3,6 @@ for more information: see languages.txt in the lang folder.
 */
 $langTracking = "Statestikk";
 $langAuthInfo = "Autentifikasjon";
-$langDelImage = "Fjern bilde";
 $langUpdateImage = "Endre bilde";
 $langImageWrong = "Filstørrelsen skal være mindre enn ";
 $langAddImage = "Bilde";

main/lang/norwegian/trad4all.inc.php

@@ -17,6 +17,7 @@ $langEdit = "Rediger";
 $Language = "Språk";
 $LoginName = "Pålogging";
 $Forum = "Forum";
+$langDelImage = "Fjern bilde";
 $langCode = "Kurskode";
 $langUp = "Opp";
 $Down = "ned";

main/lang/persian/registration.inc.php

@@ -7,8 +7,6 @@ $langTracking = "سیستم
 تحصیلی";
 $langEnter2passToChange = "در صورتی که می خواهید رمز ورود خود را تغییر دهید، می بایست رمز جدید خود را دو بار وارد کنید. اگر نمی خواهید رمز ورود خود را تغییر دهید خانه های مربوط به تغییر رمز ورود را خالی بگذارید ";
 $langAuthInfo = "شناسایی خود به سیستم";
-$langDelImage = "حذف
-عکس";
 $langUpdateImage = "تعویض
 عکس";
 $langImageWrong = "وزنفایل مورد نظر باید کاهشیابد";

main/lang/persian/trad4all.inc.php

@@ -26,6 +26,8 @@ $LoginName = "نام
 کاربری";
 $Assignments = "فعالیتهایدرسی";
 $Forum = "پیامگاه ها";
+$langDelImage = "حذف
+عکس";
 $langCode = "کددرس";
 $langUp = "بالا";
 $Down = "پایین";

main/lang/polish/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Plik powinien być w formacie CSV. Nie dodawaj spa
 $langTracking = "Śledzenie";
 $langEnter2passToChange = "Podaj nowe hasło dwukrotnie";
 $langAuthInfo = "Autoryzacja";
-$langDelImage = "Usuń obrazek";
 $langUpdateImage = "Zmień obrazek";
 $langImageWrong = "Rozmiar pliku powinien być mniejszy niż";
 $langAddImage = "Obrazek";

main/lang/polish/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login";
 $AutostartMp3 = "Odtwarzaj automatycznie pliki dźwiękowe?";
 $Assignments = "Przypisania";
 $Forum = "Forum";
+$langDelImage = "Usuń obrazek";
 $langCode = "Kod kursu";
 $langUp = "Do góry";
 $Down = "Na dół";

main/lang/portuguese/admin.inc.php

@@ -1115,4 +1115,6 @@ $Editor = "Editor WYSIWYG";
 $GoToCourseAfterLoginTitle = "Ir directamente para o curso após efectuar o login/acesso";
 $GoToCourseAfterLoginComment = "Quando um utilizador se encontra registado num curso, ir directamente para o curso após o login/acesso";
 $GroupList = "Lista do Grupo";
+$AllowStudentsDownloadFoldersTitle = "Permitir aos alunos descarregar pastas/directórios";
+$AllowStudentsDownloadFoldersComment = "Permitir aos alunos criar um pacote e descarregar uma pasta/directório completo na ferramenta documentos";
 ?>

main/lang/portuguese/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "O ficheiro deve de estar no formato CSV. N
 $langTracking = "Relatórios";
 $langEnter2passToChange = "Para modificar a sua senha/password, introduza a sua senha/password actual no campo acima e a nova senha/password em ambos os campos abaixo desse. Para manter a senha/password actual, deixe os três campos vazios.";
 $langAuthInfo = "Autenticação";
-$langDelImage = "Remover imagem";
 $langUpdateImage = "Modificar imagem";
 $langImageWrong = "O tamanho do ficheiro deve ser menor que";
 $langAddImage = "Imagem";

main/lang/portuguese/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login/acesso";
 $AutostartMp3 = "Deseja o ficheiro de audio a INICIAR automaticamente?";
 $Assignments = "Tarefas/Trabalhos";
 $Forum = "Fórum";
+$langDelImage = "Remover imagem";
 $langCode = "Código do curso";
 $langUp = "Acima";
 $Down = "abaixo";

main/lang/quechua_cusco/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Khipuqa CSV nisqapi kashan. Ama imatapas yapankichu. I
 $langTracking = "Qatikuy";
 $langEnter2passToChange = "Qelqa pakata t\'ijrachinapqa haykuchiy hoq musuq qelqa pakata kay kanchakunapi. Sichus qepakuyta munaq ñaupaqwan chayqa, ajnallata saqey  iskhay kanchakunata.";
 $langAuthInfo = "Cheqaqchana";
-$langDelImage = "Wankita horqoy";
 $langUpdateImage = "Hoq wankita churay";
 $langImageWrong = "Khipuqa kanqapuni kay yupamanta huch\'uykama";
 $langAddImage = "Wankitawan churay";

main/lang/quechua_cusco/trad4all.inc.php

@@ -25,6 +25,7 @@ $LoginName = "Haykuqmasi";
 $AutostartMp3 = "Chaskiy nisqata q\'apiy, pachanmanta uyariyta munaspaqa";
 $Assignments = "Llank\'aykuna";
 $Forum = "Rimarinakuy";
+$langDelImage = "Wankita horqoy";
 $langCode = "Yachachinaq chinpun";
 $langUp = "Wichachiy";
 $Down = "Urayachiy";

main/lang/romanian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Fisierul este in format CSV. Nu adaugati spatii. Struc
 $langTracking = "Urmarire";
 $langEnter2passToChange = "Introdu parola de doua ori pentru a o schimba. Altfel lasa campurile libere";
 $langAuthInfo = "Autentificare";
-$langDelImage = "Sterge imaginea";
 $langUpdateImage = "Schimba imaginea";
 $langImageWrong = "Fisierul trebuie sa fie mai mic de";
 $langAddImage = "Imagine";

main/lang/romanian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Login(logare)";
 $AutostartMp3 = "Apasati ok daca doriti ca fisierul audio sa fie redat in mod automat";
 $Assignments = "Publicatiile studentilor";
 $Forum = "Forum";
+$langDelImage = "Sterge imaginea";
 $langCode = "Codul cursului";
 $langUp = "Sus";
 $Down = "jos";

main/lang/russian_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Файл должен иметь формат CSV. Н
 $langTracking = "Отчет";
 $langEnter2passToChange = "Введите свой пароль дважды для того, чтобы изменить его. Или же оставьте поля пустыми.";
 $langAuthInfo = "Идентификация";
-$langDelImage = "Удалить рисунок";
 $langUpdateImage = "Изменить рисунок";
 $langImageWrong = "Размер файла должен быть меньше, чем";
 $langAddImage = "Рисунок";

main/lang/russian_unicode/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Имя пользователя";
 $AutostartMp3 = "Нажмите ОК, если хотите, чтобы аудио файлы проигрывались автоматически";
 $Assignments = "Задания";
 $Forum = "Форум";
+$langDelImage = "Удалить рисунок";
 $langCode = "Код курса";
 $langUp = "Вверх";
 $Down = "вниз";

main/lang/serbian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Fajl treba da bude u CSV formatu. Nemojte dodavati raz
 $langTracking = "Praćenje";
 $langEnter2passToChange = "Unesite vašu lozinku dva puta da biste je promenili. U suprotnom ostavite polja prazna.";
 $langAuthInfo = "Autorizacija";
-$langDelImage = "Ukloni sliku";
 $langUpdateImage = "Promeni sliku";
 $langImageWrong = "Veličina fajla bi trebala da bude manja od";
 $langAddImage = "Slika";

main/lang/serbian/trad4all.inc.php

@@ -25,6 +25,7 @@ $LoginName = "Korisničko ime";
 $AutostartMp3 = "Da li želite da se audio datoteka startuje automatski?";
 $Assignments = "publikacije polaznika ";
 $Forum = "Forum ";
+$langDelImage = "Ukloni sliku";
 $langCode = "Šifra kursa";
 $langUp = "Gore";
 $Down = "dole";

main/lang/simpl_chinese/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "
 $langTracking = "跟踪";
 $langEnter2passToChange = "修改密码请重复输入两次, 否则保持为空.";
 $langAuthInfo = "有效";
-$langDelImage = "ÒƳýͼƬ";
 $langUpdateImage = "更换图片";
 $langImageWrong = "文件尺寸要小于";
 $langAddImage = "图片";

main/lang/simpl_chinese/trad4all.inc.php

@@ -25,6 +25,7 @@ $Language = "
 $LoginName = "登录";
 $Assignments = "学生作业";
 $Forum = "论坛";
+$langDelImage = "ÒƳýͼƬ";
 $langCode = "课程代码";
 $langUp = "向上";
 $Down = "向下";

main/lang/simpl_chinese_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "文件应该是CSV格式，请不要加空格，结构
 $langTracking = "学习进度";
 $langEnter2passToChange = "修改密码请重复输入两次，否则保持为空。";
 $langAuthInfo = "有效";
-$langDelImage = "移除图片";
 $langUpdateImage = "更换图片";
 $langImageWrong = "文件尺寸要小于";
 $langAddImage = "图片";

main/lang/simpl_chinese_unicode/trad4all.inc.php

@@ -12,6 +12,7 @@ $langGroup = "小组";
 $langEdit = "编辑";
 $langGroupForum = "小组论坛";
 $LoginName = "登录名";
+$langDelImage = "移除图片";
 $langCode = "代码";
 $langUp = "向上";
 $langUniqueSelect = "单选题";

main/lang/slovak/registration.inc.php

@@ -4,7 +4,6 @@ for more information: see languages.txt in the lang folder.
 $langShouldBeCSVFormat = "Súbor by mal byť v CSV formáte. Nepridávajte medzery. Štruktúra by mala byť správne:";
 $langEnter2passToChange = "Pre zmenenie zadajte svoje nové heslo dva krát. Inak nechajte políčka prázdne.";
 $langAuthInfo = "Overenie";
-$langDelImage = "Odstrániť obrázok";
 $langUpdateImage = "Zmeniť obrázok";
 $langImageWrong = "Veľkosť súboru by mala byť menšia ako";
 $langAddImage = "Obrázok";

main/lang/slovak/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Prihasovacie meno";
 $AutostartMp3 = "Kliknite na OK, ak si želáte, aby bol zvukový súbor spustený automaticky. ";
 $Assignments = "Zadania";
 $Forum = "Fórum";
+$langDelImage = "Odstrániť obrázok";
 $langCode = "Kód kurzu";
 $langUp = "Hore";
 $Down = "dole";

main/lang/slovenian/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Datoteka mora biti v CSV obliki. Ne dodajajte presledk
 $langTracking = "Sledenje";
 $langEnter2passToChange = "Za spremembo vnesite geslo dvakrat. Sicer pustite polji prazni.";
 $langAuthInfo = "Avtentifikacija";
-$langDelImage = "Odstrani sliko";
 $langUpdateImage = "Zamenjaj sliko";
 $langImageWrong = "Velikost datoteke mora biti manjša od";
 $langAddImage = "Slika";

main/lang/slovenian/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Uporabni
 $AutostartMp3 = "Kliknite OK, èe želite, da bo avdio datoteka predvajana avtomatièno";
 $Assignments = "Zadolžitve";
 $Forum = "Forum";
+$langDelImage = "Odstrani sliko";
 $langCode = "Koda teèaja";
 $langUp = "Gor";
 $Down = "dol";

main/lang/slovenian_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Datoteka mora biti v CSV obliki. Ne dodajajte presledk
 $langTracking = "Poročila";
 $langEnter2passToChange = "Za spremembo vnesite geslo dvakrat. Sicer pustite polji prazni.";
 $langAuthInfo = "Avtentifikacija";
-$langDelImage = "Odstrani sliko";
 $langUpdateImage = "Zamenjaj sliko";
 $langImageWrong = "Velikost datoteke mora biti manjša od";
 $langAddImage = "Slika";

main/lang/slovenian_unicode/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Uporabniško ime";
 $AutostartMp3 = "Kliknite OK, če želite, da bo avdio datoteka predvajana avtomatično";
 $Assignments = "Zadolžitve";
 $Forum = "Forum";
+$langDelImage = "Odstrani sliko";
 $langCode = "Koda tečaja";
 $langUp = "Gor";
 $Down = "dol";

main/lang/spanish/admin.inc.php

@@ -1100,9 +1100,6 @@ $SendEmailToAdminComment = "Enviar un correo electr
 $UserTag = "Etiqueta de usuario";
 $SelectSession = "Seleccionar sesión";
 $GroupPermissions = "Permisos del grupo";
-$MessagesSent = "Mensajes enviados";
-$MessagesReceived = "Mensajes recibidos";
-$CountFriends = "Número de amigos";
 $SpecialCourse = "Curso especial";
 $MathMimetexTitle = "Editor matemático mimeTEX";
 $MathMimetexComment = "Habilitar el editor matemático mimeTEX";

main/lang/spanish/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "El archivo debe estar formato CSV. No a
 $langTracking = "Seguimiento";
 $langEnter2passToChange = "Para cambiar la contraseña, introduzca la nueva contraseña en estos dos campos. Si desea mantener la actual, deje vacíos los dos campos. ";
 $langAuthInfo = "Autentificación";
-$langDelImage = "Eliminar foto";
 $langUpdateImage = "Cambiar foto";
 $langImageWrong = "El archivo debe tener un tamaño menor de";
 $langAddImage = "Incluir foto";

main/lang/spanish/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Usuario";
 $AutostartMp3 = "Presione Aceptar si desea que el archivo de audio se reproduzca automáticamente";
 $Assignments = "Tareas";
 $Forum = "Foro";
+$langDelImage = "Eliminar foto";
 $langCode = "Código del curso";
 $langUp = "Subir";
 $Down = "Bajar";

main/lang/spanish_latin/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "El archivo debe estar formato CSV. No a
 $langTracking = "Seguimiento";
 $langEnter2passToChange = "Para cambiar la contraseña, introduzca la nueva contraseña en estos dos campos. Si desea mantener la actual, deje vacíos ambos.";
 $langAuthInfo = "Autentificación";
-$langDelImage = "Eliminar fotografía";
 $langUpdateImage = "Cambiar fotografía";
 $langImageWrong = "El archivo debe tener un tamaño menor de";
 $langAddImage = "Agregar fotografía";

main/lang/spanish_latin/trad4all.inc.php

@@ -24,6 +24,7 @@ $Language = "Idioma";
 $LoginName = "Usuario";
 $Assignments = "Assignments";
 $Forum = "Forum";
+$langDelImage = "Eliminar fotografía";
 $langCode = "Código del curso";
 $langUp = "Subir";
 $Down = "abajo";

main/lang/swedish/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Filen skall vara i CSV format. L
 $langTracking = "Spårning";
 $langEnter2passToChange = "Skriv ditt lösenord 2 ggr för att ändra det, eller också lämnar du fälten tomma.";
 $langAuthInfo = "Legitimering";
-$langDelImage = "Ta bort bild";
 $langUpdateImage = "Ändra bild";
 $langImageWrong = "Filstorleken skall vara mindre än";
 $langAddImage = "Bild";

main/lang/swedish/trad4all.inc.php

@@ -26,6 +26,7 @@ $LoginName = "Logga in";
 $AutostartMp3 = "Tryck OK om du vill spela ljudfilen automatiskt";
 $Assignments = "Assignments";
 $Forum = "Forum";
+$langDelImage = "Ta bort bild";
 $langCode = "Kurskod";
 $langUp = "Upp";
 $Down = "ner";

main/lang/thai/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "
 $langTracking = "¡ÒõԴµÒÁ¼Å";
 $langEnter2passToChange = "¡ÒÃà»ÅÕè¹ÃËÑʼèÒ¹ãËÁè ãËé¡ÃÍ¡ÃËÑʼèÒ¹·ÕèµÑé§ãËÁè·Ñé§ÊͧªÍ§ ËÒ¡äÁèà»ÅÕ蹡ç»ÅèÍÂÇèÒ§äÇé";
 $langAuthInfo = "¡ÒÃÃѺÃͧÊÔ·¸Ôì";
-$langDelImage = "àÍÒÀÒ¾ÍÍ¡";
 $langUpdateImage = "à»ÅÕè¹ÀÒ¾";
 $langImageWrong = "¢¹Ò´ä¿ÅìµéͧäÁèà¡Ô¹";
 $langAddImage = "ÀÒ¾";

main/lang/thai/trad4all.inc.php

@@ -24,6 +24,7 @@ $Language = "
 $LoginName = "เข้าสู่ระบบ";
 $Assignments = "§Ò¹·ÕèÍÒ¨ÒÃÂìÁͺËÁÒÂ/¡ÒúéÒ¹";
 $Forum = "¡ÒÃÍÀÔ»ÃÒ : Forum";
+$langDelImage = "àÍÒÀÒ¾ÍÍ¡";
 $langCode = "ÃËÑÊÇÔªÒ";
 $langUp = "¢Öé¹";
 $Down = "ŧ";

main/lang/trad_chinese_unicode/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "檔案應該是CSV格式，請不要加空格，架構
 $langTracking = "學習進度";
 $langEnter2passToChange = "修改密碼請重複輸入兩次，否則保持為空。";
 $langAuthInfo = "有效";
-$langDelImage = "移除圖片";
 $langUpdateImage = "更換圖片";
 $langImageWrong = "檔案尺寸要小於";
 $langAddImage = "圖片";

main/lang/trad_chinese_unicode/trad4all.inc.php

@@ -25,6 +25,7 @@ $LoginName = "登入名稱";
 $AutostartMp3 = "若你想音訊檔自動插放，請按「確定」。";
 $Assignments = "課業";
 $Forum = "討論區";
+$langDelImage = "移除圖片";
 $langCode = "代碼";
 $langUp = "向上";
 $Down = "向下";

main/lang/turkce/registration.inc.php

@@ -5,7 +5,6 @@ $langShouldBeCSVFormat = "Dosya CSV formatında olmalıdır.Boş
 $langTracking = "İzleme";
 $langEnter2passToChange = "Şifre değişikliği için yeni şifrenizi iki kere girmelisiniz, aksi taktirde bu alanı boş bırakınız.";
 $langAuthInfo = "Giriş";
-$langDelImage = "Fotoyu kaldır";
 $langUpdateImage = "Resmi değiştir";
 $langImageWrong = "Dosya boyutunun olabileceği büyüklük:";
 $langAddImage = "Resim";

main/lang/turkce/trad4all.inc.php

@@ -25,6 +25,7 @@ $LoginName = "Kullanıcı adı";
 $AutostartMp3 = "Ses dosyasını otomatik başlatmak istiyor musunuz ?";
 $Assignments = "Öğrenci Çalışmaları";
 $Forum = "Forum";
+$langDelImage = "Fotoyu kaldır";
 $langCode = "Ders kodu";
 $langUp = "Yukarı";
 $Down = "aşağı";