diff --git a/main/survey/create_from_existing_survey.php b/main/survey/create_from_existing_survey.php
index e35212fda5..30413119ab 100644
--- a/main/survey/create_from_existing_survey.php
+++ b/main/survey/create_from_existing_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_from_existing_survey.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: create_from_existing_survey.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -69,7 +69,7 @@ if(isset($_POST['import']))
   $selectcount=count($_POST['course']);	
   if($selectcount<=0)
    {
-	  	 $error_message=get_lang("PleaseSelectAChoice");		
+	  	 $error_message=get_lang('PleaseSelectAChoice');
    }
  else
   {
@@ -89,7 +89,7 @@ if(isset($_POST['view']))
  $selectcount=count($_POST['course']);	
   if($selectcount<=0)
    {
-	  	 $error_message=get_lang("PleaseSelectAChoice");		
+	  	 $error_message=get_lang('PleaseSelectAChoice');		
    }
  else
   {    
@@ -152,7 +152,7 @@ if( isset($error_message) )
 		<table>
 		<tr>
 		<td><input type="submit" name="back" value="<?php  echo get_lang('Back');?>"></td>
-		<td><input type="submit" name="view" value="<?php echo get_lang('ViewQues');?>"></td>
+		<td><input type="submit" name="view" value="<?php echo get_lang('ViewQuestions');?>"></td>
 		<td><input type="submit" name="import" value="<?php echo get_lang('ImportGroups');?>"></td>
 		</tr>
 		</table>
diff --git a/main/survey/create_new_group.php b/main/survey/create_new_group.php
index 7013e29533..da5045079f 100644
--- a/main/survey/create_new_group.php
+++ b/main/survey/create_new_group.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_new_group.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: create_new_group.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -181,7 +181,7 @@ $table_group =  Database :: get_course_table('survey_group');
 				$directions .= '</tr></table>';
 				$survey[] = $directions;
 				$survey[] =  '<a href="group_edit.php?groupid='.$obj->group_id.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&surveyid='.$surveyid.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'
-				.'<a href="create_new_group.php?cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&delete=1&group_delete='.$gid.'&surveyid='.$surveyid.'"  onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>'
+				.'<a href="create_new_group.php?cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&delete=1&group_delete='.$gid.'&surveyid='.$surveyid.'"  onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>'
 				;
                $surveys[] = $survey;
                $i++;
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index cc9924c32d..f37f3ebe88 100644
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_new_survey.php 10550 2006-12-24 16:17:25Z pcool $
+* 	@version $Id: create_new_survey.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -404,7 +404,7 @@ else
 					
 			if(!empty($result))
 				{
-				$error_message=get_lang('ThisCodeAlradyExist');
+				$error_message=get_lang('ThisCodeAlradyExists');
 			}
 			else
 			{
diff --git a/main/survey/create_survey.php b/main/survey/create_survey.php
index fe6ffb465c..f12f9431f0 100644
--- a/main/survey/create_survey.php
+++ b/main/survey/create_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_survey.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: create_survey.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -78,7 +78,7 @@ api_display_tool_title($tool_name);
 <tr>
 <td valign="top"></td>
 <td>
-<input class="checkbox" checked type="radio" name="survey" id="new_survey" value="<?php echo $newsurvey ?>"> <label for="visibility_open_world"><?php echo get_lang("Newsurvey") ?></label>
+<input class="checkbox" checked type="radio" name="survey" id="new_survey" value="<?php echo $newsurvey ?>"> <label for="visibility_open_world"><?php echo get_lang('NewSurvey') ?></label>
 <br/>
 <input class="checkbox" type="radio" name="survey" id="Existing_survey" value="<?php echo $existingsurvey ?>"  > <label for="visibility_open_platform"><?php echo  get_lang('CreateFromExistingSurveys'); ?></label><?php SurveyManager::select_survey_list();?>
 
diff --git a/main/survey/group_list.php b/main/survey/group_list.php
index 0ed280eb84..0f203fa892 100644
--- a/main/survey/group_list.php
+++ b/main/survey/group_list.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: group_list.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: group_list.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -57,7 +57,7 @@ if(isset($_REQUEST['pls']))
 	$pls=$_REQUEST['pls'];
 	if($pls==1)
 	{
-		$error_message=$error_message=get_lang("PleaseSelectAChoice");
+		$error_message=$error_message=get_lang('PleaseSelectAChoice');
 		Display::display_error_message($error_message);	
 	}
 }
@@ -125,7 +125,7 @@ $table_group =  Database :: get_course_table('survey_group');
 		<table>
 		<tr>
 		<td><input type="submit" name="back1" value="<?php echo get_lang('Back');?>"></td>
-		<td><input type="submit" name="view" value="<?php echo get_lang('ViewQues');?>"></td>
+		<td><input type="submit" name="view" value="<?php echo get_lang('ViewQuestions');?>"></td>
 		<td><input type="submit" name="import" value="<?php echo get_lang('Import');?>"></td>
 		</tr>
 		</table>
diff --git a/main/survey/mcma.php b/main/survey/mcma.php
index ccf255ce5b..0d7837fca1 100644
--- a/main/survey/mcma.php
+++ b/main/survey/mcma.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma.php 10550 2006-12-24 16:17:25Z pcool $
+* 	@version $Id: mcma.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -51,19 +51,19 @@ $surveyid = $_REQUEST['surveyid'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("AddNewQuestionType");
-$Multi = get_lang("MultipleChoiceMulti");
+
 $interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 
 //$n=$_REQUEST['n'];
 if ($_POST['action'] == 'addquestion')
 {
-   $groupid = $_REQUEST['groupid'];
-   $surveyid = $_REQUEST['surveyid'];
-   $questtype = $_REQUEST['questtype'];   
-   $enter_question=$_POST['enterquestion'];
-    if(isset($_POST['next']))
-	{
+   $groupid 		= $_REQUEST['groupid'];
+   $surveyid 		= $_REQUEST['surveyid'];
+   $questtype 		= $_REQUEST['questtype'];   
+   $enter_question	=$_POST['enterquestion'];
+   
+   if(isset($_POST['next']))
+   {
 		$enter_question=$_POST['enterquestion'];
 		$answers=$_POST['mutlichkboxtext'];
 		$rating=$_POST['chkboxpoint'];	
@@ -201,10 +201,10 @@ select_question_type($add_question12,$groupid,$surveyid,$cidReq,$curr_dbname);
 <table>
 <tr>
 <td>
-<?php api_display_tool_title($Add);?>
+<?php api_display_tool_title(get_lang('AddNewQuestionType'));?>
 </td>
 <td>
-<?php api_display_tool_title($Multi);?>
+<?php api_display_tool_title(get_lang('MultipleChoiceMulti'));?>
 </td>
 </tr>
 </table>
@@ -407,7 +407,7 @@ function checkLength(form){
 				else
 				 {
 				  $end=10;
-				  $error_message = get_lang('YouCantAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
@@ -561,7 +561,7 @@ function checkLength(form){
 ?>
 						<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>">
 						<input type="submit"  name="saveandexit" value="<?php echo get_lang('SaveAndExit');?>">
-						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('mcma','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('mcma','<?php echo $temp; ?>','<?php echo get_lang('MultipleChoiceMulti'); ?>')">
 						<input type="submit"  name="next" value="<?php echo get_lang('Next'); ?>"> 
 			</div>
 <!--this partcular field helps in identify the item to be add at the itemadd.php-->
diff --git a/main/survey/mcma_edit.php b/main/survey/mcma_edit.php
index b6c7fafec5..d7fad20994 100644
--- a/main/survey/mcma_edit.php
+++ b/main/survey/mcma_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma_edit.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: mcma_edit.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -50,8 +50,8 @@ $qtype=$_REQUEST['qtype'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("UpdateQuestionType");
-$Multi = get_lang("MultipleChoiceMulti");
+$Add = get_lang('UpdateQuestionType');
+$Multi = get_lang('MultipleChoiceMulti');
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
 $sql = "SELECT * FROM $curr_dbname.questions WHERE qid = '$qid'";
@@ -275,7 +275,7 @@ if( isset($error_message) )
 				else
 				{
 				  $end=10;
-				  $error_message = get_lang('YouCanntAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
diff --git a/main/survey/mcsa.php b/main/survey/mcsa.php
index bd09f004f9..7507f105f4 100644
--- a/main/survey/mcsa.php
+++ b/main/survey/mcsa.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: mcsa.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -50,8 +50,8 @@ $add_question = $_REQUEST['add_question'];
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("AddNewQuestionType");
-$Multi = get_lang("MultipleChoiceSingle");
+$Add = get_lang('AddNewQuestionType');
+$Multi = get_lang('MultipleChoiceSingle');
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 $interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
@@ -377,7 +377,7 @@ $start=1;$end=5;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 				else
 			    {
 				  $end=10;
-				  $error_message = get_lang('YouCantAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
diff --git a/main/survey/mcsa_edit.php b/main/survey/mcsa_edit.php
index 892d53fe98..22811044c2 100644
--- a/main/survey/mcsa_edit.php
+++ b/main/survey/mcsa_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa_edit.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: mcsa_edit.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -49,8 +49,8 @@ $surveyid=$_REQUEST['surveyid'];
 $qid=$_REQUEST['qid'];
 $qtype=$_REQUEST['qtype'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("UpdateQuestionType");
-$Multi = get_lang("MultipleChoiceSingle");
+$Add = get_lang('UpdateQuestionType');
+$Multi = get_lang('MultipleChoiceSingle');
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
 $sql = "SELECT * FROM $curr_dbname.questions WHERE qid = '$qid'";
@@ -269,7 +269,7 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 				else
 				{
 				  $end=10;
-				  $error_message = get_lang('YouCantAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
diff --git a/main/survey/new_survey.php b/main/survey/new_survey.php
index 761845c870..3b769cd2c9 100644
--- a/main/survey/new_survey.php
+++ b/main/survey/new_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: new_survey.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: new_survey.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -73,7 +73,7 @@ $group_table = Database :: get_main_table(TABLE_MAIN_GROUP);
 
 echo '<form method="post" action="new_survey.php">';
 		Display :: display_sortable_table($table_header, $users, array (), array (), $parameters);
-		echo '<input type="submit" value="'.get_lang('Ok').'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;"/>';
+		echo '<input type="submit" value="'.get_lang('Ok').'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;"/>';
 		echo '</form>';
 }
 
diff --git a/main/survey/numbered.php b/main/survey/numbered.php
index 2ae582ea1b..6abc0a04de 100644
--- a/main/survey/numbered.php
+++ b/main/survey/numbered.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: numbered.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -51,8 +51,8 @@ $surveyid = $_REQUEST['surveyid'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("AddNewQuestionType");
-$Multi = get_lang("Numbered");
+$Add = get_lang('AddNewQuestionType');
+$Multi = get_lang('Numbered');
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 $interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
@@ -381,7 +381,7 @@ function checkLength(form){
 				else
 				 {
 				  $end=10;
-				  $error_message = get_lang('YouCanntAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
diff --git a/main/survey/numbered_edit.php b/main/survey/numbered_edit.php
index be289facbb..ec3e660ab1 100644
--- a/main/survey/numbered_edit.php
+++ b/main/survey/numbered_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered_edit.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: numbered_edit.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -42,8 +42,8 @@ $surveyid=$_REQUEST['surveyid'];
 $qid=$_REQUEST['qid'];
 $qtype=$_REQUEST['qtype'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("UpdateQuestionType");
-$Multi = get_lang("Numbered");
+$Add = get_lang('UpdateQuestionType');
+$Multi = get_lang('Numbered');
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
 $sql = "SELECT * FROM $curr_dbname.questions WHERE qid = '$qid'";
@@ -250,7 +250,7 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 				else
 				{
 				  $end=10;
-				  $error_message = get_lang('YouCanntAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddMoreThanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
diff --git a/main/survey/open.php b/main/survey/open.php
index a0b031c347..760e984830 100644
--- a/main/survey/open.php
+++ b/main/survey/open.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: open.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: open.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -50,8 +50,8 @@ $curr_dbname = $_REQUEST['curr_dbname'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("AddNewQuestionType");
-$Multi = get_lang("Open");
+$Add = get_lang('AddNewQuestionType');
+$Multi = get_lang('Open');
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 if ($_POST['action'] == 'addquestion')
@@ -223,7 +223,7 @@ border=0>
 <BR>
 <DIV align=center> 
 	<input type="submit"  name="back" value="<?php echo get_lang('Back');?>">
-	<input type="submit"  name="saveandexit" value="<?php echo get_lang("SaveAndExit"); ?>">
+	<input type="submit"  name="saveandexit" value="<?php echo get_lang('SaveAndExit'); ?>">
 	<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('this.form','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 	<input type="submit"  name="next" value="<?php echo get_lang('Next'); ?>">  
 </DIV></FORM></DIV>
diff --git a/main/survey/open_edit.php b/main/survey/open_edit.php
index 2b84c2005f..352692eb00 100644
--- a/main/survey/open_edit.php
+++ b/main/survey/open_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: open_edit.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: open_edit.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -51,8 +51,8 @@ $curr_dbname = $_REQUEST['curr_dbname'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("UpdateQuestionType");
-$Multi = get_lang("Open");
+$Add = get_lang('UpdateQuestionType');
+$Multi = get_lang('Open');
 $tool_name = $Add.$Multi;
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
diff --git a/main/survey/question_added.php b/main/survey/question_added.php
index 3081201c04..02d3eff5ee 100644
--- a/main/survey/question_added.php
+++ b/main/survey/question_added.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_added.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: question_added.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -140,10 +140,10 @@ if($qdeleted)
 			Display :: display_sortable_table($table_header, $courses, array (), array (), $parameters);
 		//echo '</form>';	
 ?>	
-	<input type="submit" name="delete" value="<?php  echo get_lang("Delete");?>">
-	<input type="submit" name="addanother" value="<?php echo get_lang("AddAnotherQuestion");?>">
-	<input type="submit" name="addanotherg" value="<?php echo get_lang("AddAnotherGroup");?>">
-	<input type="submit" name="finish" value="<?php echo get_lang("FinishSurvey");?>">
+	<input type="submit" name="delete" value="<?php  echo get_lang('Delete');?>">
+	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddAnotherGroup');?>">
+	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
 </form>	
 <?
 /*
diff --git a/main/survey/question_list.php b/main/survey/question_list.php
index 19cfe1aacb..0c72eed95d 100644
--- a/main/survey/question_list.php
+++ b/main/survey/question_list.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_list.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: question_list.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -82,7 +82,7 @@ if(isset($_POST['importquestion']))
   $selectcount=count($_POST['question']);	
   if($selectcount<=0)
    {
-	$error_message=$error_message=get_lang("PleaseSelectAChoice");		
+	$error_message=$error_message=get_lang('PleaseSelectAChoice');		
    }
  else
   {
@@ -168,7 +168,7 @@ function displayTemplate(url){
 		Display :: display_sortable_table($table_header, $questions, array (), array (), $parameters);
 		else
 		{
-			$noquestions=get_lang("NoQuestionAvailableInThisGroup");
+			$noquestions=get_lang('NoQuestionAvailableInThisGroup');
 			api_display_tool_title($noquestions);
 		}
 ?>
diff --git a/main/survey/question_list_new.php b/main/survey/question_list_new.php
index 9483a34a1a..de22633e6d 100644
--- a/main/survey/question_list_new.php
+++ b/main/survey/question_list_new.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_list_new.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: question_list_new.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 
@@ -134,7 +134,7 @@ if(isset($_POST['importquestion']))
   $selectcount=count($_POST['question']);	
   if($selectcount<=0)
    {
-	  	 $error_message=get_lang("PleaseSelectAChoice");
+	  	 $error_message=get_lang('PleaseSelectAChoice');
    }
  else
   {
@@ -231,13 +231,13 @@ function displayTemplate(url) {
 		Display :: display_sortable_table($table_header, $questions, array (), array (), $parameters);
 		else
 		{
-			$noquestions=get_lang("NoQuestionAvailableInThisGroup");
+			$noquestions=get_lang('NoQuestionAvailableInThisGroup');
 			api_display_tool_title($noquestions);
 		}
 ?>
 		<table>
 		<tr>		
-		<td><input type="submit" name="back" value="<?echo get_lang("Back");?>"></td>
+		<td><input type="submit" name="back" value="<?echo get_lang('Back');?>"></td>
 		<td><input type="submit" name="importquestion" value="<?php echo get_lang('ImportQuestion');?>"></td>
 		</tr>
 		</table>
diff --git a/main/survey/select_question_group-uploaded.php b/main/survey/select_question_group-uploaded.php
index 78cfb36d33..a5a9e2dbf7 100644
--- a/main/survey/select_question_group-uploaded.php
+++ b/main/survey/select_question_group-uploaded.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question_group-uploaded.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: select_question_group-uploaded.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 
@@ -335,7 +335,7 @@ $result=api_sql_query($query);*/
 				$course[] = '<a href='.$_SERVER['PHP_SELF'].'?gid='.$groupid.'&pre_sort='.$pre_sort.'&sortby='.$sort.'&post_sort='.$post_sort.'&surveyid='.$surveyid.'&pre_qid='.$pre_qid.'&qid='.$qid.'&post_qid='.$post_qid.'&curr_dbname='.$curr_dbname.'&cidReq='.$cidReq.'&page_nr='.$page_nr.'&per_page='.$per_page.'&column='.$column.'&action1=moveitem&direction=down><img src="../img/down.gif" border="0" title="lang_move_down"></a>&nbsp;'.$sort.'&nbsp;&nbsp;'.'<a href='.$_SERVER['PHP_SELF'].'?gid='.$groupid.'&pre_sort='.$pre_sort.'&sortby='.$sort.'&post_sort='.$post_sort.'&surveyid='.$surveyid.'&pre_qid='.$pre_qid.'&qid='.$qid.'&post_qid='.$post_qid.'&curr_dbname='.$curr_dbname.'&cidReq='.$cidReq.'&page_nr='.$page_nr.'&per_page='.$per_page.'&column='.$column.'&action1=moveitem&direction=up><img src="../img/up.gif" border="0" title="lang_move_up"></a>';										
 				$course[] = @mysql_result($res,$i,'groupname');
 				$course[] = mysql_result($res1,$k,'qtype');//$obj->qtype;	
-				/*$course[]='<a href="question_edit.php?qid='.$obj->qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$obj->qtype.'&groupid='.$groupid.'&surveyid='.$surveyid.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="select_question_group.php?delete=1&qid[]='.$obj->qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$obj->qtype.'&groupid='.$groupid.'&surveyid='.$surveyid.'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>';
+				/*$course[]='<a href="question_edit.php?qid='.$obj->qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$obj->qtype.'&groupid='.$groupid.'&surveyid='.$surveyid.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="select_question_group.php?delete=1&qid[]='.$obj->qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$obj->qtype.'&groupid='.$groupid.'&surveyid='.$surveyid.'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>';
 				*/
 				$courses[] = $course;
 				$x++;
@@ -355,19 +355,19 @@ if(!empty($courses))
 				SurveyManager :: display_sortable_table($groupid,$surveyid,$curr_dbname,$table_header, $courses, array (), array (), $parameters);
 
 ?>	
-	<!--<input type="submit" name="delete" value="<?php  echo get_lang("Delete");?>">-->
+	<!--<input type="submit" name="delete" value="<?php  echo get_lang('Delete');?>">-->
 	<!--<input type=button value="Back" onClick="history.go(-1)">-->
-	<input type="submit" name="addanother" value="<?php echo get_lang("AddAnotherQuestion");?>">
-	<input type="submit" name="addanotherg" value="<?php echo get_lang("AddNewGroup");?>">
-	<input type="submit" name="finish" value="<?php echo get_lang("FinishSurvey");?>">
+	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
+	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
 <?
 }
 else
 {
 ?>
-    <input type="submit" name="back" value="<?echo get_lang("Back");?>">
-	<input type="submit" name="addanother" value="<?echo get_lang("AddAnotherQuestion");?>">
-	<input type="submit" name="addanotherg" value="<?echo get_lang("AddNewGroup");?>">
+    <input type="submit" name="back" value="<?echo get_lang('Back');?>">
+	<input type="submit" name="addanother" value="<?echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?echo get_lang('AddNewGroup');?>">
 <?
 }	
 ?>
diff --git a/main/survey/select_question_group.php b/main/survey/select_question_group.php
index 2a26b63d02..5daccfb7bb 100644
--- a/main/survey/select_question_group.php
+++ b/main/survey/select_question_group.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question_group.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: select_question_group.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 
@@ -357,7 +357,7 @@ $result=api_sql_query($query);*/
 				}				
 				$course[] = mysql_result($res1,$k,'qtype');//$obj->qtype;
 				$course[] = @mysql_result($res,$i,'groupname');	
-				$course[]='<a href="question_edit.php?qid='.$qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$q_type.'&groupid='.$groupid.'&surveyid='.$surveyid.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="select_question_group.php?delete=1&qid[]='.$qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$q_type.'&groupid='.$groupid.'&surveyid='.$surveyid.'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>';
+				$course[]='<a href="question_edit.php?qid='.$qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$q_type.'&groupid='.$groupid.'&surveyid='.$surveyid.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="select_question_group.php?delete=1&qid[]='.$qid.'&cidReq='.$cidReq.'&curr_dbname='.$curr_dbname.'&qtype='.$q_type.'&groupid='.$groupid.'&surveyid='.$surveyid.'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>';
 				
 				$courses[] = $course;
 				$x++;
@@ -377,19 +377,19 @@ if(!empty($courses))
 				SurveyManager :: display_sortable_table($groupid,$surveyid,$curr_dbname,$table_header, $courses, array (), array (), $parameters);
 
 ?>	
-	<!--<input type="submit" name="delete" value="<?php echo get_lang("Delete");?>">-->
+	<!--<input type="submit" name="delete" value="<?php echo get_lang('Delete');?>">-->
 	<!--<input type=button value="Back" onClick="history.go(-1)">-->
-	<input type="submit" name="addanother" value="<?php echo get_lang("AddAnotherQuestion");?>">
-	<input type="submit" name="addanotherg" value="<?php echo get_lang("AddNewGroup");?>">
-	<input type="submit" name="finish" value="<?php echo get_lang("finishsurvey");?>">
+	<input type="submit" name="addanother" value="<?php echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?php echo get_lang('AddNewGroup');?>">
+	<input type="submit" name="finish" value="<?php echo get_lang('FinishSurvey');?>">
 <?
 }
 else
 {
 ?>
-    <input type="submit" name="back" value="<?echo get_lang("Back");?>">
-	<input type="submit" name="addanother" value="<?echo get_lang("AddAnotherQuestion");?>">
-	<input type="submit" name="addanotherg" value="<?echo get_lang("AddNewGroup");?>">
+    <input type="submit" name="back" value="<?echo get_lang('Back');?>">
+	<input type="submit" name="addanother" value="<?echo get_lang('AddAnotherQuestion');?>">
+	<input type="submit" name="addanotherg" value="<?echo get_lang('AddNewGroup');?>">
 <?
 }	
 ?>
diff --git a/main/survey/survey.php b/main/survey/survey.php
index 1feef2058c..56d01b0c55 100644
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: survey.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 
@@ -133,8 +133,8 @@ api_display_tool_title($tool_name);
 <form method="post" action="<?php echo $_SERVER['PHP_SELF'];?>?cidReq=<?php echo $cidReq; ?>" name="mainForm">
 <input type="hidden" name="cidReq" value="<?php echo $cidReq; ?>" />
 <input type="hidden" name="newsurveyid" value="<?php echo $newsurvey_id; ?>" />
-<input class="checkbox" checked type="radio" name="survey" id="new_survey" value="<?php echo $newsurvey; ?>" /> <label for="new_survey"><?php echo get_lang("Newsurvey"); ?></label><br/>
-<input class="checkbox" type="radio" name="survey" id="existing_survey" value="<?php echo $existingsurvey; ?>" /> <label for="existing_survey"><?php echo  get_lang("Existingsurvey"); ?></label><br />
+<input class="checkbox" checked type="radio" name="survey" id="new_survey" value="<?php echo $newsurvey; ?>" /> <label for="new_survey"><?php echo get_lang('NewSurvey'); ?></label><br/>
+<input class="checkbox" type="radio" name="survey" id="existing_survey" value="<?php echo $existingsurvey; ?>" /> <label for="existing_survey"><?php echo  get_lang('Existingsurvey'); ?></label><br />
 <input type="submit" name="back" value="<?php echo get_lang('Back');?>" />&nbsp;
 <input type="submit" name="action" value="<?php echo get_lang('Ok'); ?>" />
 </form>
diff --git a/main/survey/survey_blank.php b/main/survey/survey_blank.php
index 18fc8044b2..f327089525 100644
--- a/main/survey/survey_blank.php
+++ b/main/survey/survey_blank.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_blank.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_blank.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -35,8 +35,7 @@ require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 require (api_get_path(LIBRARY_PATH)."/groupmanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-//$tool_name=get_lang("AdministrationTools");
-$phpself=$_SERVER['PHP_SELF'];
+
 $surveyid = $_REQUEST['surveyid'];
 $uid = $_REQUEST['uid'];
 $uid1 = $_REQUEST['uid1'];
@@ -79,7 +78,7 @@ if(isset($_POST['Back'])){
 	//echo $sql ="Insert into";
 	$back=$num-2;
 	$cidReq = $_REQUEST['cidReq'];
-	header("location:$phpself?num=$back&cidReq=$cidReq");
+	header("location:".$_SERVER['PHP_SELF']."?num=$back&cidReq=$cidReq");
 	exit;
 }
 
@@ -782,7 +781,7 @@ if ($numb=mysql_num_rows($res) > 0)
 				 <td align="center">
 					<?php if($num > "1"){
 								
-							   echo "<input type=\"button\" name=\"Back\" value=\"Back\" onClick=\"location.href('".$phpself."?temp=$temp&cidReq=$cidReq&db_name=$db_name&surveyid=$surveyid&num=".($num-1)."');\">";
+							   echo "<input type=\"button\" name=\"Back\" value=\"Back\" onClick=\"location.href('".$_SERVER['PHP_SELF']."?temp=$temp&cidReq=$cidReq&db_name=$db_name&surveyid=$surveyid&num=".($num-1)."');\">";
 					} else{
 							echo "<input type=\"button\" name=\"Back\" value=\"Back\" onClick=\"location.href('survey_list.php?cidReq=$cidReq&db_name=$db_name&uid1=$uid1&mail=$mail&sid=$surveyid');\">";
 					}
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index e348d6df59..eaba60e766 100644
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_list.php 10558 2006-12-27 09:43:17Z pcool $
+* 	@version $Id: survey_list.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 /*
@@ -149,7 +149,7 @@ else
 	if(isset($published))
 	{
 	$sname = surveymanager::pick_surveyname($surveyid);
-	$error_message = get_lang('YourSurveyhasbeenPublished');
+	$error_message = get_lang('YourSurveyHasBeenPublished');
 	Display::display_error_message("Survey "."'".$sname."'"." ".$error_message);	
 	}
 	if (isset ($_GET['delete_course']))
@@ -249,7 +249,7 @@ else
 			$survey[] = $ratio;
 			//$NoOfQuestion=surveymanager::no_of_question($gid);
 			//$language=surveymanager::no_of_question($sid);
-			$survey[] = '<a href="survey_edit.php?surveyid='.$obj->survey_id.'&cidReq='.$cidReq.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="survey_list.php?cidReq='.$cidReq.'&action=delete_surveys&survey_delete[]='.$obj->survey_id.'&delete_survey='.$obj->survey_id.'"  onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>'.'<a href="create_survey_in_another_language.php?cidReq='.$cidReq.'&id_survey='.$obj->survey_id.'"><img width="28" src="../img/copy.gif" border="0" align="absmiddle" alt="'.get_lang('CreateInAnotherLanguage').'" title="'.get_lang('CreateInAnotherLanguage').'" /></a>'.'<a href="survey_white.php?surveyid='.$surveyid.'&db_name='.$db_name.'&cidReq='.$cidReq.'&temp='.$template.'">&nbsp;<img src="../img/visible.gif" border="0" align="absmiddle" alt="'.get_lang('ViewSurvey').'"></a>'.'<a href="../announcements/announcements.php?action=add&cidReq='.$cidReq.'&db_name='.$db_name.'&publish_survey='.$obj->survey_id.'">&nbsp;<img src="../img/survey_publish.gif" border="0" align="absmiddle" alt="'.get_lang('Publish').'"></a>'.'<a href="reporting.php?action=reporting&cidReq='.$cidReq.'&db_name='.$db_name.'&surveyid='.$obj->survey_id.'">&nbsp;<img src="../img/surveyreporting.gif" border="0" align="absmiddle" alt="'.get_lang('Reporting').'"></a>';
+			$survey[] = '<a href="survey_edit.php?surveyid='.$obj->survey_id.'&cidReq='.$cidReq.'"><img src="../img/edit.gif" border="0" align="absmiddle" alt="'.get_lang('Edit').'"/></a>'.'<a href="survey_list.php?cidReq='.$cidReq.'&action=delete_surveys&survey_delete[]='.$obj->survey_id.'&delete_survey='.$obj->survey_id.'"  onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmYourChoice')))."'".')) return false;"><img src="../img/delete.gif" border="0" align="absmiddle" alt="'.get_lang('Delete').'"/></a>'.'<a href="create_survey_in_another_language.php?cidReq='.$cidReq.'&id_survey='.$obj->survey_id.'"><img width="28" src="../img/copy.gif" border="0" align="absmiddle" alt="'.get_lang('CreateInAnotherLanguage').'" title="'.get_lang('CreateInAnotherLanguage').'" /></a>'.'<a href="survey_white.php?surveyid='.$surveyid.'&db_name='.$db_name.'&cidReq='.$cidReq.'&temp='.$template.'">&nbsp;<img src="../img/visible.gif" border="0" align="absmiddle" alt="'.get_lang('ViewSurvey').'"></a>'.'<a href="../announcements/announcements.php?action=add&cidReq='.$cidReq.'&db_name='.$db_name.'&publish_survey='.$obj->survey_id.'">&nbsp;<img src="../img/survey_publish.gif" border="0" align="absmiddle" alt="'.get_lang('Publish').'"></a>'.'<a href="reporting.php?action=reporting&cidReq='.$cidReq.'&db_name='.$db_name.'&surveyid='.$obj->survey_id.'">&nbsp;<img src="../img/surveyreporting.gif" border="0" align="absmiddle" alt="'.get_lang('Reporting').'"></a>';
 			$surveys[] = $survey;
 		}
 		$table_header[] = array (' ', false);
diff --git a/main/survey/survey_white.php b/main/survey/survey_white.php
index 06ac4d8246..36dc90be16 100644
--- a/main/survey/survey_white.php
+++ b/main/survey/survey_white.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_white.php 10549 2006-12-24 16:08:47Z pcool $
+* 	@version $Id: survey_white.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -133,6 +133,7 @@ while($o_group = mysql_fetch_object($rsGroups) ){
 			echo '<table><tr><td valign="top">'.$indiceQuestion.'- </td><td valign="top">'.stripslashes($o_question->caption).'</td></tr></table>';
 			
 			$sel1 = $sel2 = "";
+			/** @todo hardcode language strings ahead in a switch statement => won't work for any language other than English */
 			switch ($o_question -> qtype) {
 				
 				
diff --git a/main/survey/template1.php b/main/survey/template1.php
index 55152b7e1d..13b7b7eda2 100644
--- a/main/survey/template1.php
+++ b/main/survey/template1.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: template1.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: template1.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -38,7 +38,7 @@ require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 require (api_get_path(LIBRARY_PATH)."/groupmanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-//$tool_name=get_lang("AdministrationTools");
+
 $surveyid = $_REQUEST['surveyid'];
 $uid = $_REQUEST['uid'];
 $uid1 = $_REQUEST['uid1'];
diff --git a/main/survey/thanks1.php b/main/survey/thanks1.php
index f12b4ffa49..e746a809a2 100644
--- a/main/survey/thanks1.php
+++ b/main/survey/thanks1.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: thanks1.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: thanks1.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -35,7 +35,7 @@ require_once (api_get_path(LIBRARY_PATH).'/fileManage.lib.php');
 require_once (api_get_path(CONFIGURATION_PATH) ."/add_course.conf.php");
 require_once (api_get_path(LIBRARY_PATH)."/add_course.lib.inc.php");
 require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
-//$tool_name=get_lang("AdministrationTools");
+
 $surveyid = $_REQUEST['surveyid'];
 $uid1 = $_REQUEST['uid1'];
 $db_name = $_REQUEST['db_name'];
diff --git a/main/survey/welcome_1.php b/main/survey/welcome_1.php
index 2acada77e8..98693ebbe8 100644
--- a/main/survey/welcome_1.php
+++ b/main/survey/welcome_1.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: welcome_1.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: welcome_1.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -39,7 +39,7 @@ require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 require (api_get_path(LIBRARY_PATH)."/groupmanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-//$tool_name=get_lang("AdministrationTools");
+
 $surveyid = $_REQUEST['surveyid'];
 $uid = $_REQUEST['uid'];
 $uid1 = $_REQUEST['uid1'];
diff --git a/main/survey/yesno.php b/main/survey/yesno.php
index b751f8f61d..6f28e5ae69 100644
--- a/main/survey/yesno.php
+++ b/main/survey/yesno.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: yesno.php 10550 2006-12-24 16:17:25Z pcool $
+* 	@version $Id: yesno.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -50,8 +50,8 @@ api_protect_admin_script();
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 $interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("AddNewQuestionType");
-$Multi = get_lang("YesNo");
+$Add = get_lang('AddNewQuestionType');
+$Multi = get_lang('YesNo');
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 //$tool_name = get_lang('QuestionType');
@@ -427,8 +427,8 @@ function checkLength(form){
 					break;
 			}
 ?>
-						<input type="submit"  name="back" value="<?php echo get_lang("Back");?>">
-						<input type="submit"  name="saveandexit" value="<?php echo get_lang("SaveAndExit");?>">
+						<input type="submit"  name="back" value="<?php echo get_lang('Back');?>">
+						<input type="submit"  name="saveandexit" value="<?php echo get_lang('SaveAndExit');?>">
 						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('yesno','<?php echo $temp;?>','<?php echo $Multi; ?>')">
 						<input type="submit"  name="next" value="<?php echo get_lang('Next');?>"> 
 			</div>
diff --git a/main/survey/yesno_edit.php b/main/survey/yesno_edit.php
index 6e65c569c3..32ea368d8d 100644
--- a/main/survey/yesno_edit.php
+++ b/main/survey/yesno_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: yesno_edit.php 10550 2006-12-24 16:17:25Z pcool $
+* 	@version $Id: yesno_edit.php 10559 2006-12-27 10:52:50Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -48,8 +48,8 @@ $surveyid=$_REQUEST['surveyid'];
 $qid=$_REQUEST['qid'];
 $qtype=$_REQUEST['qtype'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("UpdateQuestionType");
-$Multi = get_lang("YesNo");
+$Add = get_lang('UpdateQuestionType');
+$Multi = get_lang('YesNo');
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
 if(isset($_REQUEST['questtype']))
@@ -423,10 +423,10 @@ if( isset($error_message) )
 			}
 
 ?>
-						<input type="submit"  name="back" value="<?php echo get_lang("Back");?>">
+						<input type="submit"  name="back" value="<?php echo get_lang('Back');?>">
 						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('yesno','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
-						<input type="submit"  name="update" value="<?php echo get_lang("Update");?>">
-						<!--<input name="preview" value="<?php echo get_lang("Preview");?>" type="submit" onClick="return changeAction()" > -->
+						<input type="submit"  name="update" value="<?php echo get_lang('Update');?>">
+						<!--<input name="preview" value="<?php echo get_lang('Preview');?>" type="submit" onClick="return changeAction()" > -->
 
 						<!--<input type="submit"  name="next" value="<?php echo get_lang('Next');?>"> -->
 			</div>