diff --git a/main/survey/addanother.php b/main/survey/addanother.php
index 8d3c158759..7252215c9f 100644
--- a/main/survey/addanother.php
+++ b/main/survey/addanother.php
@@ -23,7 +23,7 @@
 ==============================================================================
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: addanother.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: addanother.php 10549 2006-12-24 16:08:47Z pcool $
 ==============================================================================
 */
 
@@ -59,10 +59,10 @@ $curr_dbname = $_REQUEST['curr_dbname'];
 $group_id=$_GET['newgroupid'];
 $table_survey = Database :: get_course_table('survey');
 //$table_group=Database::get_course_table('survey_group');
-$tool_name = get_lang('New_survey');
+$tool_name = get_lang('CreateNewSurvey');
 $tool_name1 = get_lang('AddAnotherQuestion');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
-//$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+
 $course_id = $_SESSION['_course']['id'];
 if(isset($_REQUEST['surveyid']))
 $surveyid=$_REQUEST['surveyid'];
@@ -86,9 +86,10 @@ if(isset($_POST['next']))
 			$groupid=$_POST['exiztinggroup'];
 			$add_question=$_POST['add_question'];
 			$curr_dbname = $_REQUEST['curr_dbname'];
+			/** @todo it seems a bad idea to use language strings for switch statements and $_POST variables */
 			switch ($_POST['add_question'])
 			{
-				case get_lang('yesno'):
+				case get_lang('YesNo'):
 				header("location:yesno.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 				break;
 				case get_lang('MultipleChoiceSingle'):
@@ -100,7 +101,7 @@ if(isset($_POST['next']))
 				case get_lang('Open'):
 				header("location:open.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 				break;
-				case get_lang('numbered'):
+				case get_lang('Numbered'):
 				header("location:numbered.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 				break;
 				default :
@@ -152,11 +153,12 @@ if(isset($group_id))
 <td>
 
 <select name="add_question" >	
-	<option value="<?php echo get_lang('yesno'); ?>" ><?php echo get_lang('yesno');?></option>
+	<?php /** @todo it seems a bad idea to use language strings for switch statements and $_POST variables */ ?>
+	<option value="<?php echo get_lang('YesNo'); ?>" ><?php echo get_lang('YesNo');?></option>
 	<option value="<?php echo get_lang('MultipleChoiceSingle'); ?>"  ><?php echo get_lang('MultipleChoiceSingle');?></option>
 	<option value="<?php echo get_lang('MultipleChoiceMulti'); ?>" ><?php echo get_lang('MultipleChoiceMulti');?></option>
 	<option value="<?php echo get_lang('Open');?>" ><?php echo get_lang('Open');?></option>
-	<option value="<?php echo get_lang('numbered');?>"><?php echo get_lang('numbered');?></option>
+	<option value="<?php echo get_lang('Numbered');?>"><?php echo get_lang('Numbered');?></option>
 </select>
 </td>
 </tr>
@@ -199,8 +201,8 @@ if(isset($group_id))
 <tr>
 <td>&nbsp;</td>
 <td>
-	<input type="submit" name="back" value="<?php echo get_lang("back");?>">
-	<input type="submit" name="next" value="<?php echo get_lang("next");?>">
+	<input type="submit" name="back" value="<?php echo get_lang('Back');?>">
+	<input type="submit" name="next" value="<?php echo get_lang('Next');?>">
 </tr>
 
 </table>
diff --git a/main/survey/attach_existingsurvey.php b/main/survey/attach_existingsurvey.php
index 80761c4041..539191ed1f 100644
--- a/main/survey/attach_existingsurvey.php
+++ b/main/survey/attach_existingsurvey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_existingsurvey.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: attach_existingsurvey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -60,9 +60,9 @@ $table_group = Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_course_survey_rel = Database :: get_main_table(TABLE_MAIN_COURSE_SURVEY);
-$tool_name = get_lang('New_survey');
-$tool_name1 = get_lang('Newsurvey');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$tool_name = get_lang('CreateNewSurvey');
+$tool_name1 = get_lang('CreateNewSurvey');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $course_id = $_SESSION['_course']['id'];
 $oldsurveyid=$_REQUEST['surveyid'];
 $survey_name=surveymanager::get_surveyname($db_name,$oldsurveyid);
@@ -111,7 +111,7 @@ if ($_POST['action'] == 'add_survey')
 				
 		if(!empty($result))
 		{
-			$error_message=get_lang('thiscodealradyexist');
+			$error_message=get_lang('ThisCodeAlreadyExist');
 		}
 		else
 		{
@@ -171,15 +171,15 @@ window.open(inf+".htm", 'popup', 'width=600,height=600,toolbar = no, status = no
 <input type="hidden" name="db_name" value="<?php echo $db_name; ?>">
 <table>
 <tr>
- <td><?php echo get_lang('surveycode'); ?></td>
+ <td><?php echo get_lang('SurveyCode'); ?></td>
  <td><input type="text" name="survey_code" size="20"  maxlength="39" value="<?php echo $surveycode; ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveytitle'); ?></td>
+  <td><?php echo get_lang('SurveyTitle'); ?></td>
   <td><input type="text" name="survey_title" size="40"  maxlength="79" value="<?php echo $surveytitle; ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveysubtitle'); ?></td>
+  <td><?php echo get_lang('SurveySubtitle'); ?></td>
   <td><input type="text" name="survey_subtitle" size="40"  maxlength="79" value="<?php echo $surveysubtitle; ?>"></td>
 </tr>
 <tr>
@@ -187,7 +187,7 @@ window.open(inf+".htm", 'popup', 'width=600,height=600,toolbar = no, status = no
    if($_SESSION['is_platformAdmin']=='1'||$_SESSION['is_courseAdmin'])
    {
  echo "<td>";
- echo get_lang('author'); 
+ echo get_lang('Author'); 
  echo "</td>";
  echo "<td>";  	
  UserManager::get_teacher_list($course_id, $author_id);
@@ -196,7 +196,7 @@ window.open(inf+".htm", 'popup', 'width=600,height=600,toolbar = no, status = no
 ?>  
 </tr>
 <tr>
-  <td><?php echo get_lang('surveylanguage'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyLanguage'); ?>&nbsp;</td>
   <td>
 	<select name="survey_language">
     <option value="english"  selected="selected">English</option>
@@ -206,7 +206,7 @@ window.open(inf+".htm", 'popup', 'width=600,height=600,toolbar = no, status = no
   </td>
 </tr>
 <tr id="subtitle">
-  <td><?php echo get_lang('availablefrom'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableFrom'); ?>&nbsp;</td>
   <td>	
 <select name="fday">
 <?php 
@@ -250,7 +250,7 @@ december -->
 	</tr>
 				
 <tr id="subtitle">
-  <td><?php echo get_lang('availabletill'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableTill'); ?>&nbsp;</td>
   <td>
 <select name="end_fday">
 	<?php for($i=1;$i<=31;$i++){
@@ -300,7 +300,7 @@ december -->
 </td>
 </tr>
  <tr>
-  <td><?php echo get_lang('surveytemplate'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyTemplate'); ?>&nbsp;</td>
 <td>
 <select name="template">
 <option value="template1" <?php if($template=="template1") echo " selected  "; ?>>OFO_nl</option>
@@ -309,10 +309,10 @@ december -->
 <option value="template4" <?php if($template=="template4") echo " selected  "; ?>>FOD P&O_NL</option>
 <option value="template5" <?php if($template=="template5") echo " selected  "; ?>>Blank</option>
 </select>
-<input type="button" value="<?php echo get_lang('preview');?>" onClick="displayTemplate(new_calendar_item)">
+<input type="button" value="<?php echo get_lang('Preview');?>" onClick="displayTemplate(new_calendar_item)">
 </td>
 </tr>
-<tr><td valign="top"><?php echo get_lang('surveyintroduction'); ?>&nbsp;</td>
+<tr><td valign="top"><?php echo get_lang('SurveyIntroduction'); ?>&nbsp;</td>
  <td>
    <?php
          api_disp_html_area('content',$content,'300px');
@@ -336,14 +336,14 @@ december -->
         </td>
  </tr>
   <tr>
- <td><?php echo get_lang('surveyattached');?></td>
+ <td><?php echo get_lang('SurveyAttached');?></td>
   <td><?php echo $survey_name;?></td>
  </tr>
  </table>
  <table>
  <tr>
   <td></td>
-  <td><input type="submit" name="back" value="<?php echo get_lang('Back'); ?>">&nbsp;<input type="submit" name="saveandexit" value="<?php echo get_lang('createlater'); ?>">&nbsp;<input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+  <td><input type="submit" name="back" value="<?php echo get_lang('Back'); ?>">&nbsp;<input type="submit" name="saveandexit" value="<?php echo get_lang('CreateLater'); ?>">&nbsp;<input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
   </tr>
 </table>
 </form>
diff --git a/main/survey/attach_question.php b/main/survey/attach_question.php
index 11463ab682..dab1fd6f87 100644
--- a/main/survey/attach_question.php
+++ b/main/survey/attach_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_question.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: attach_question.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -60,9 +60,9 @@ $table_group = Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_course_survey_rel = Database :: get_main_table(TABLE_MAIN_COURSE_SURVEY);
-$tool_name = get_lang('New_survey');
-$tool_name1 = get_lang('Newsurvey');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$tool_name = get_lang('CreateNewSurvey');
+$tool_name1 = get_lang('CreateNewSurvey');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $course_id = $_SESSION['_course']['id'];
 $oldsurveyid = $_REQUEST['surveyid'];
 $survey_name = surveymanager::get_surveyname($db_name,$oldsurveyid);
@@ -114,7 +114,7 @@ if ($_POST['action'] == 'add_survey')
 		$result=SurveyManager::get_survey_code($table_survey,$surveycode);				
 		if(!empty($result))
 		{
-         	 $error_message=get_lang('thiscodealradyexist');
+         	 $error_message=get_lang('ThisCodeAlreadyExist');
 		}
 		else
 		{
@@ -184,15 +184,15 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 <input type="hidden" name="surveyid" value="<?php echo $oldsurveyid; ?>">
 <table>
 <tr>
- <td><?php echo get_lang('surveycode'); ?></td>
+ <td><?php echo get_lang('SurveyCode'); ?></td>
  <td><input type="text" name="survey_code" size="20" maxlength="39" value="<?php echo $surveycode; ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveytitle'); ?></td>
+  <td><?php echo get_lang('SurveyTitle'); ?></td>
   <td><input type="text" name="survey_title" size="40" maxlength="79" value="<?php echo $surveytitle; ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveysubtitle'); ?></td>
+  <td><?php echo get_lang('SurveySubtitle'); ?></td>
   <td><input type="text" name="survey_subtitle" size="40" maxlength="79" value="<?php echo $surveysubtitle; ?>"></td>
 </tr>
 <tr>
@@ -200,7 +200,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
    if($_SESSION['is_platformAdmin']=='1'||$_SESSION['is_courseAdmin'])
    {
  echo "<td>";
- echo get_lang('author'); 
+ echo get_lang('Author'); 
  echo "</td>";
  echo "<td>";  	
  UserManager::get_teacher_list($course_id, $author_id);
@@ -209,7 +209,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 ?>  
 </tr>
 <tr>
-  <td><?php echo get_lang('surveylanguage'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyLanguage'); ?>&nbsp;</td>
   <td>
 	<select name="survey_language">
     <option value="english"  selected="selected">English</option>
@@ -219,7 +219,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
   </td>
 </tr>
 <tr id="subtitle">
-  <td><?php echo get_lang('availablefrom'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableFrom'); ?>&nbsp;</td>
   <td>	
 <select name="fday">
 <?php 
@@ -263,7 +263,7 @@ december -->
 	</tr>
 				
 <tr id="subtitle">
-  <td><?php echo get_lang('availabletill'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableTill'); ?>&nbsp;</td>
   <td>
 <select name="end_fday">
 	<?php for($i=1;$i<=31;$i++){
@@ -313,7 +313,7 @@ december -->
 </td>
 </tr>
  <tr>
-  <td><?php echo get_lang('surveytemplate'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyTemplate'); ?>&nbsp;</td>
 <td>
 <select name="template">
 <option value="template1">OFO_nl</option>
@@ -322,10 +322,10 @@ december -->
 <option value="template4">FOD P&O_NL</option>
 <option value="template5">Blank</option>
 </select>
-<input type="button" value="<?php echo get_lang('preview');?>" onClick="displayTemplate(new_calendar_item)">
+<input type="button" value="<?php echo get_lang('Preview');?>" onClick="displayTemplate(new_calendar_item)">
 </td>
 </tr>
-<tr><td valign="top"><?php echo get_lang('surveyintroduction'); ?>&nbsp;</td>
+<tr><td valign="top"><?php echo get_lang('SurveyIntroduction'); ?>&nbsp;</td>
  <td>
    <?php
          api_disp_html_area('content',$content,'300px');
@@ -349,14 +349,14 @@ december -->
  </td>
  </tr>
  <tr>
- <td><?php echo get_lang('surveyattached');?>&nbsp;&nbsp;<?php echo $survey_name;?></td>
+ <td><?php echo get_lang('SurveyAttached');?>&nbsp;&nbsp;<?php echo $survey_name;?></td>
  </tr>
  </table>
  <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="back" value="<?php echo get_lang('back');?>"></td>
-  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('createlater'); ?>"></td>
-  <td><input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+  <td><input type="submit" name="back" value="<?php echo get_lang('Back');?>"></td>
+  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('CreateLater'); ?>"></td>
+  <td><input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
 </tr>
 </table>
 </form>
diff --git a/main/survey/attach_survey.php b/main/survey/attach_survey.php
index 5095474f91..5d86a66cbb 100644
--- a/main/survey/attach_survey.php
+++ b/main/survey/attach_survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: attach_survey.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: attach_survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -60,9 +60,9 @@ $table_group = Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
 $table_course_survey_rel = Database :: get_main_table(TABLE_MAIN_COURSE_SURVEY);
-$tool_name = get_lang('New_survey');
-$tool_name1 = get_lang('Newsurvey');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$tool_name = get_lang('CreateNewSurvey');
+$tool_name1 = get_lang('CreateNewSurvey');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $course_id = $_SESSION['_course']['id'];
 $oldsurveyid=$_REQUEST['surveyid'];
 $gids = $_REQUEST['gids'];
@@ -113,7 +113,7 @@ if ($_POST['action'] == 'add_survey')
 				
 		if(!empty($result))
 		{
-			$error_message=get_lang('thiscodealradyexist');
+			$error_message=get_lang('ThisCodeAlradyExists');
 		}
 		else
 		{
@@ -181,15 +181,15 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 <input type="hidden" name="gids" value="<?php echo $gids; ?>">
 <table>
 <tr>
- <td><?php echo get_lang('surveycode'); ?></td>
+ <td><?php echo get_lang('SurveyCode'); ?></td>
  <td><input type="text" name="survey_code" size="20" maxlength="39" value="<?php echo $surveycode; ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveytitle'); ?></td>
+  <td><?php echo get_lang('SurveyTitle'); ?></td>
   <td><input type="text" name="survey_title" size="40" maxlength="79" value="<?php echo $surveytitle ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveysubtitle'); ?></td>
+  <td><?php echo get_lang('SurveySubtitle'); ?></td>
   <td><input type="text" name="survey_subtitle" size="40" maxlength="79" value="<?php echo $surveysubtitle ?>"></td>
 </tr>
 <tr>
@@ -197,7 +197,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
    if($_SESSION['is_platformAdmin']=='1'||$_SESSION['is_courseAdmin'])
    {
  echo "<td>";
- echo get_lang('author'); 
+ echo get_lang('Author'); 
  echo "</td>";
  echo "<td>";  	
  UserManager::get_teacher_list($course_id, $author_id);
@@ -206,7 +206,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
 ?>  
 </tr>
 <tr>
-  <td><?php echo get_lang('surveylanguage'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyLanguage'); ?>&nbsp;</td>
   <td>
 	<select name="survey_language">
     <option value="english"  selected="selected">English</option>
@@ -216,7 +216,7 @@ window.open(inf+".htm", 'popup', 'width=900,height=800,toolbar = no, status = no
   </td>
 </tr>
 <tr id="subtitle">
-  <td><?php echo get_lang('availablefrom'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableFrom'); ?>&nbsp;</td>
   <td>	
 <select name="fday">
 <?php 
@@ -260,7 +260,7 @@ december -->
 	</tr>
 				
 <tr id="subtitle">
-  <td><?php echo get_lang('availabletill'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableTill'); ?>&nbsp;</td>
   <td>
 <select name="end_fday">
 	<?php for($i=1;$i<=31;$i++){
@@ -310,7 +310,7 @@ december -->
 </td>
 </tr>
  <tr>
-  <td><?php echo get_lang('surveytemplate'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyTemplate'); ?>&nbsp;</td>
 <td>
 <select name="template">
 <option value="template1">OFO_nl</option>
@@ -319,10 +319,10 @@ december -->
 <option value="template4">FOD P&O_NL</option>
 <option value="template5">Blank</option>
 </select>
-<input type="button" value="<?php echo get_lang('preview');?>" onClick="displayTemplate(new_calendar_item)">
+<input type="button" value="<?php echo get_lang('Preview');?>" onClick="displayTemplate(new_calendar_item)">
 </td>
 </tr>
-<tr><td valign="top"><?php echo get_lang('surveyintroduction'); ?>&nbsp;</td>
+<tr><td valign="top"><?php echo get_lang('SurveyIntroduction'); ?>&nbsp;</td>
  <td>
    <?php
          api_disp_html_area('content',$content,'300px');
@@ -346,14 +346,14 @@ december -->
  </td>
  </tr>
   <tr>
- <td><?php echo get_lang('surveyattached');?>&nbsp;&nbsp;<?php echo $survey_name;?></td>
+ <td><?php echo get_lang('SurveyAttached');?>&nbsp;&nbsp;<?php echo $survey_name;?></td>
  </tr>
  </table>
  <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="back" value="<?php echo get_lang('back');?>"></td>
-  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('createlater'); ?>"></td>
-  <td><input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+  <td><input type="submit" name="back" value="<?php echo get_lang('Back');?>"></td>
+  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('CreateLater'); ?>"></td>
+  <td><input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
 </tr>
 </table>
 </form>
diff --git a/main/survey/choose_language.php b/main/survey/choose_language.php
index 6bcc16df2c..bcd136378a 100644
--- a/main/survey/choose_language.php
+++ b/main/survey/choose_language.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: choose_language.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: choose_language.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -37,7 +37,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'];
@@ -72,17 +72,18 @@ $code_survey = mysql_result($res_sname, 0, 'code');
 mysql_data_seek($res_sname,0);
 
 $surveyname = '';
-while($obj_sname = mysql_fetch_object($res_sname)){
+while($obj_sname = mysql_fetch_object($res_sname))
+{
 	$surveyname .= $obj_sname->title.'<br>';
 }
 mysql_data_seek($res_sname,0);
 
 Display::display_header($tool_name);
-?><center><?api_display_tool_title($surveyname);?></center><?
+api_display_tool_title($surveyname);
 api_display_tool_title($tool_name);
 if($error_message)
 {
-Display::display_error_message($error_message);	
+	Display::display_error_message($error_message);	
 }
 ?>
 <link href="../css/survey_white.css" rel="stylesheet" type="text/css">
diff --git a/main/survey/create_from_existing_survey.php b/main/survey/create_from_existing_survey.php
index fa4c239c97..e35212fda5 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: create_from_existing_survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -43,9 +43,7 @@ require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 $cidReq = $_REQUEST['cidReq'];
 $db_name = $_REQUEST['db_name'];
 $table_survey = Database :: get_course_table('survey');
-//$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
-//$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('a_survey'));
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $n='e';
 $tool_name = get_lang('CreateFromExistingSurveys');
 $surveyid=$_GET['surveyid'];
@@ -148,12 +146,12 @@ if( isset($error_message) )
 		$table_header[] = array (' ', false);
 		$table_header[] = array (get_lang('QuesGroup'), true);
 		$table_header[] = array (get_lang('NoOfQuestions'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		Display :: display_sortable_table($table_header, $surveys, array (), array (), $parameters);
 		?>		
 		<table>
 		<tr>
-		<td><input type="submit" name="back" value="<?php  echo get_lang('back');?>"></td>
+		<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="import" value="<?php echo get_lang('ImportGroups');?>"></td>
 		</tr>
diff --git a/main/survey/create_new_group.php b/main/survey/create_new_group.php
index 8ec2346f7a..7013e29533 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: create_new_group.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -47,10 +47,10 @@ $cidReq=$_GET['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $table_group = Database :: get_course_table('survey_group');
 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-$tool_name1 = get_lang('createnewgroup1');
-$tool_name = get_lang('createnewgroup');
+$tool_name1 = get_lang('CreateNewGroup');
+$tool_name = get_lang('CreateNewGroup');
 $header1 = get_lang('GroupList');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $surveyid = $_GET['surveyid'];
 $surveyname = SurveyManager::pick_surveyname($surveyid);
 
@@ -187,11 +187,9 @@ $table_group =  Database :: get_course_table('survey_group');
                $i++;
 		
 		}
-		//$table_header[] = array (' ', false);
-		//$table_header[] = array (get_lang('SNo'), true);
 		$table_header[] = array (get_lang('QuesGroup'), true);
-		$table_header[] = array (get_lang('SurveyName1'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('SurveyName'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		$table_header[] = array (get_lang('OrderBy'), true);
 		$table_header[] = array (' ', false);
 		Display :: display_sortable_table($table_header, $surveys, array ('column'=>get_lang('OrderBy')), array (), $parameters);
@@ -212,7 +210,7 @@ api_display_tool_title($tool_name);
 <!--<input type="hidden" name="cidReq" value="<?php echo $_REQUEST['cidReq']; ?>">-->
 <table>
 <tr>
-  <td><?php echo get_lang('groupname'); ?></td>
+  <td><?php echo get_lang('GroupName'); ?></td>
   <td><input type="text" name="groupname" size="40" maxlength="39" value="<?php echo $code ?>"></td>
 </tr>
 	   <tr><td valign="top"><?php echo get_lang('GroupIntroduction'); ?>&nbsp;</td>
@@ -226,9 +224,9 @@ api_display_tool_title($tool_name);
 </table>
 <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="back" value="<?php echo get_lang('back'); ?>"></td>
-  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('saveandexit'); ?>"></td>
-  <td><input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+  <td><input type="submit" name="back" value="<?php echo get_lang('Back'); ?>"></td>
+  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('SaveAndExit'); ?>"></td>
+  <td><input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
 </tr>
 </form>
 <?php
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index 76828d948c..6f825bdff4 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 10333 2006-12-06 00:38:18Z yannoo $
+* 	@version $Id: create_new_survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -77,7 +77,7 @@ api_protect_admin_script();
 // an api function for this would be nice since this is used in a lot of places in Dokeos
 $MonthsLong = array(get_lang("JanuaryLong"), get_lang("FebruaryLong"), get_lang("MarchLong"), get_lang("AprilLong"), get_lang("MayLong"), get_lang("JuneLong"), get_lang("JulyLong"), get_lang("AugustLong"), get_lang("SeptemberLong"), get_lang("OctoberLong"), get_lang("NovemberLong"), get_lang("DecemberLong")); 
 $tool_name = get_lang('CreateNewSurvey');
-$tool_name1 = get_lang('Newsurvey');
+$tool_name1 = get_lang('CreateNewSurvey');
 
 $arr_date = explode("-",date("Y-m-d"));
 $curr_year = $arr_date[0];
diff --git a/main/survey/create_survey.php b/main/survey/create_survey.php
index ad08aac0a5..fe6ffb465c 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: create_survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -40,35 +40,11 @@ require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 //$table_category = Database :: get_main_table(TABLE_MAIN_CATEGORY);
 $table_survey = Database :: get_main_table(MAIN_SURVEY_IFA_TABLE);
 $table_course = Database::get_main_table(TABLE_MAIN_COURSE);
-$tool_name = get_lang('a_survey');
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
+$tool_name = get_lang('CreateSurvey');
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
-//define("NEW_SURVEY", 1);
-//define("EXISTING_SURVEY", 2);
 $newsurvey = '0';
-//$existingsurvey = '1';
-
-
-/*
-if ($_POST['action'] == 'add_survey')
-{
-	$sql = "SELECT * FROM $table_survey WHERE id='".intval($_POST['id'])."'";
-	$res = api_sql_query($sql,__FILE__,__LINE__);
-	$id = mysql_fetch_object($res);
-	$code = trim(strtoupper(stripslashes($_POST['code'])));
-	//$author_name = $_POST['author'];
-	//$title = $_POST['title'];
-	//$language = trim(stripslashes($_POST['lang']));
-	//$datefrom = $_POST['datefrom'];
-	//$datetill = $_POST['datetill'];
-	
-	if (empty ($code))
-		$error_message = get_lang('PleaseEnterSurveyCode');
-
-	}
-*/
-
 
 if ($_POST['action'] == 'add_survey')
 {
@@ -104,7 +80,7 @@ api_display_tool_title($tool_name);
 <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>
 <br/>
-<input class="checkbox" type="radio" name="survey" id="Existing_survey" value="<?php echo $existingsurvey ?>"  > <label for="visibility_open_platform"><?php echo  get_lang("Existingsurvey") ?></label><?php SurveyManager::select_survey_list();?>
+<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();?>
 
 
 </td></tr>
diff --git a/main/survey/create_survey_in_another_language.php b/main/survey/create_survey_in_another_language.php
index 81dc657da5..f3a99e4414 100644
--- a/main/survey/create_survey_in_another_language.php
+++ b/main/survey/create_survey_in_another_language.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: create_survey_in_another_language.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: create_survey_in_another_language.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -60,7 +60,7 @@ if(isset($_POST['submit'])){
 }
 
 $tool_name = get_lang('CreateInAnotherLanguage');
-$interbredcrump[] = array('url'=>'survey_list.php','name'=>get_lang('SurveyList'));
+$interbreadcrumb[] = array('url'=>'survey_list.php','name'=>get_lang('SurveyList'));
 Display::display_header($tool_name);
 api_display_tool_title($tool_name);
 
diff --git a/main/survey/existing_surveys_new.php b/main/survey/existing_surveys_new.php
index 26a56f271b..56de0ebaea 100644
--- a/main/survey/existing_surveys_new.php
+++ b/main/survey/existing_surveys_new.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: existing_surveys_new.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: existing_surveys_new.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -46,9 +46,7 @@ $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
 $table_course_survey_rel = Database :: get_main_table(TABLE_MAIN_COURSE_SURVEY);
-//$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
-//$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('a_survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $n='e';
 $tool_name = get_lang('ImportFromExisting');
 $tool_name1 = get_lang('SurveysOfAllCourses');
@@ -120,8 +118,8 @@ function displayTemplate(url) {
 				$surveys[] = $survey;				
 			}
         }
-		$table_header[] = array (get_lang('SurveyName1'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('SurveyName'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		$table_header[] = array (get_lang('CourseName'), true);
 		$table_header[] = array (get_lang('Language'), true);
 		$table_header[] = array (get_lang('AvailableFrom'), true);
diff --git a/main/survey/group_add_question.php b/main/survey/group_add_question.php
index c87c9a1e04..88e5155e06 100644
--- a/main/survey/group_add_question.php
+++ b/main/survey/group_add_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: group_add_question.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: group_add_question.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -41,9 +41,9 @@ require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 $cidReq=$_GET['cidReq'];
 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 //$table_survey = Database :: get_main_table(MAIN_SURVEY_IFA_TABLE);
-$tool_name1 = get_lang('AddQuestion1');
+$tool_name1 = get_lang('AddQuestion');
 $tool_name = get_lang('AddQuestion');
-$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
+$interbreadcrumb[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $surveyid=$_GET['surveyid'];
@@ -79,7 +79,7 @@ if(isset($_POST['next']))
 	}
 }
 Display::display_header($tool_name1);
-$GName = get_lang('groupname');
+$GName = get_lang('GroupName');
 api_display_tool_title($tool_name);
 $name = surveymanager :: get_groupname($gid);
 ?>
@@ -129,8 +129,8 @@ if( isset($error_message) )
 </tr>
 <tr>
 <td>
-<input type="submit" name= 'back' value="<?php echo get_lang('back');?>">
-<input type="submit" name= 'next' value="<?php echo get_lang('next');?>"></td>
+<input type="submit" name= 'back' value="<?php echo get_lang('Back');?>">
+<input type="submit" name= 'next' value="<?php echo get_lang('Next');?>"></td>
 </tr>
 </table>
 </form>
diff --git a/main/survey/group_edit.php b/main/survey/group_edit.php
index f1abd5d7ea..16836e8c98 100644
--- a/main/survey/group_edit.php
+++ b/main/survey/group_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: group_edit.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: group_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -46,9 +46,9 @@ $cidReq=$_GET['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $table_group = Database :: get_course_table('survey_group');
 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-$tool_name1 = get_lang('createnewgroup1');
+$tool_name1 = get_lang('CreateNewGroup');
 $tool_name = get_lang('ModifyGroupInformation');
-$interbredcrump[] = array ("url" => "survey_list.php?", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?", "name" => get_lang('Survey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $groupid = $_GET['groupid'];
@@ -130,7 +130,7 @@ $introduction = $obj->introduction;
 <!--<input type="hidden" name="cidReq" value="<?php echo $_REQUEST['cidReq']; ?>">-->
 <table>
 <tr>
-  <td><?php echo get_lang('groupname'); ?></td>
+  <td><?php echo get_lang('GroupName'); ?></td>
   <td><input type="text" name="groupname" size="40" value="<?php echo $groupname ?>"></td>
 </tr>
 	   <tr><td valign="top"><?php echo get_lang('GroupIntroduction'); ?>&nbsp;</td>
@@ -144,9 +144,9 @@ $introduction = $obj->introduction;
 </table>
 <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="back" value="<?php echo get_lang('back'); ?>"></td>
-  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('saveandexit'); ?>"></td>
-  <td><input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+  <td><input type="submit" name="back" value="<?php echo get_lang('Back'); ?>"></td>
+  <td><input type="submit" name="saveandexit" value="<?php echo get_lang('SaveAndExit'); ?>"></td>
+  <td><input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
 </tr>
 </form>
 <?php
diff --git a/main/survey/group_list.php b/main/survey/group_list.php
index dccb71fbd5..0ed280eb84 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: group_list.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -46,7 +46,7 @@ $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');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $tool_name = get_lang('GroupList');
 //Display :: display_header($tool_name);
 //api_display_tool_title($tool_name);
@@ -117,14 +117,14 @@ $table_group =  Database :: get_course_table('survey_group');
 		//$table_header[] = array (get_lang('SNo'), true);
 		$table_header[] = array (get_lang('QuesGroup'), true);
 		$table_header[] = array (get_lang('NoOfQuestions'), true);
-		$table_header[] = array (get_lang('SurveyName1'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('SurveyName'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		//echo '<form method="post" action="course_list.php">';
 		Display :: display_sortable_table($table_header, $surveys, array (), array (), $parameters);
 		?>		
 		<table>
 		<tr>
-		<td><input type="submit" name="back1" value="<?php echo get_lang('back');?>"></td>
+		<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="import" value="<?php echo get_lang('Import');?>"></td>
 		</tr>
diff --git a/main/survey/import.php b/main/survey/import.php
index 12d89adc68..997f2b93db 100644
--- a/main/survey/import.php
+++ b/main/survey/import.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: import.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: import.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -36,10 +36,10 @@ api_protect_admin_script();
 require_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 $cidReq = $_REQUEST['cidReq'];
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
 $tool_name = get_lang('SelectQuestion');
 $Sname = get_lang('SurveyName');
-$GName = get_lang('groupname');
+$GName = get_lang('GroupName');
 $Author = get_lang('Author');
 $surveyid=$_REQUEST['surveyid'];
 $newgroupid = $_REQUEST['newgroupid'];
diff --git a/main/survey/mcma.php b/main/survey/mcma.php
index d32133bcfb..9d5a876b26 100644
--- a/main/survey/mcma.php
+++ b/main/survey/mcma.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcma.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: mcma.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -51,16 +51,10 @@ $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");
+$Add = get_lang("AddNewQuestionType");
 $Multi = get_lang("MultipleChoiceMulti");
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
-//$interbredcrump[] = array ("url" => "survey.php?cidReq=$cidReq&n=$n", "name" => get_lang('CreateSurvey'));
-/*
-if($n=="n")
-$interbredcrump[] = array ("url" => "create_new_survey.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
-else
-$interbredcrump[] = array ("url" => "create_from_existing.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
-*/
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+
 //$n=$_REQUEST['n'];
 if ($_POST['action'] == 'addquestion')
 {
@@ -413,7 +407,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);	
@@ -567,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 $Multi; ?>')">
 						<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 df0ae441a4..b6c7fafec5 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: mcma_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -40,7 +40,7 @@ api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 $n=$_REQUEST['n'];
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $cidReq = $_REQUEST['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $groupid=$_REQUEST['groupid'];
@@ -50,7 +50,7 @@ $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");
+$Add = get_lang("UpdateQuestionType");
 $Multi = get_lang("MultipleChoiceMulti");
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
@@ -418,7 +418,7 @@ if( isset($error_message) )
 
 ?>
 						<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>">
-						<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 $Multi; ?>')">
 						<input type="submit"  name="update" value="<?php echo get_lang('Update'); ?>">
 						
 			</div>
diff --git a/main/survey/mcsa.php b/main/survey/mcsa.php
index 8bc50e032a..bd09f004f9 100644
--- a/main/survey/mcsa.php
+++ b/main/survey/mcsa.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: mcsa.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: mcsa.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -50,19 +50,12 @@ $add_question = $_REQUEST['add_question'];
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("addnewquestiontype");
+$Add = get_lang("AddNewQuestionType");
 $Multi = get_lang("MultipleChoiceSingle");
 $groupid = $_REQUEST['groupid'];
 $surveyid = $_REQUEST['surveyid'];
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
-//$interbredcrump[] = array ("url" => "survey.php?cidReq=$cidReq", "name" => get_lang('CreateSurvey'));
-/*
-if($n=="n")
-$interbredcrump[] = array ("url" => "create_new_survey.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
-else
-$interbredcrump[] = array ("url" => "create_from_existing.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 
-*/
 //$n=$_REQUEST['n'];
 if ($_POST['action'] == 'addquestion')
 {
@@ -384,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('YouCanntAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddmorethanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
@@ -514,7 +507,7 @@ $start=1;$end=5;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 ?>
 						<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('mcsa','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('mcsa','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 						<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/mcsa_edit.php b/main/survey/mcsa_edit.php
index 043a09bd67..892d53fe98 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: mcsa_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -41,7 +41,7 @@ api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 $n=$_REQUEST['n'];
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $cidReq = $_REQUEST['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $groupid=$_REQUEST['groupid'];
@@ -49,7 +49,7 @@ $surveyid=$_REQUEST['surveyid'];
 $qid=$_REQUEST['qid'];
 $qtype=$_REQUEST['qtype'];
 $table_question = Database :: get_course_table('questions');
-$Add = get_lang("updatequestiontype");
+$Add = get_lang("UpdateQuestionType");
 $Multi = get_lang("MultipleChoiceSingle");
 $tool_name = $Add.$Multi;
 $rs=SurveyManager::get_question_data($qid,$curr_dbname);
@@ -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('YouCanntAddmorethanTen')."<br>";
+				  $error_message = get_lang('YouCantAddmorethanTen')."<br>";
 				if( isset($error_message) )
                   {
 	                  Display::display_error_message($error_message);	
@@ -394,7 +394,7 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 
 ?>
 						<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>">
-						<input type="button" value="<?php echo get_lang('preview');?>" onClick="preview('mcsa','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('mcsa','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 						<input type="submit"  name="update" value="<?php echo get_lang('Update'); ?>"> 
 			</div>
 <!--this partcular field helps in identify the item to be add at the itemadd.php-->
diff --git a/main/survey/new_survey.php b/main/survey/new_survey.php
index fbfa7bb912..761845c870 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: new_survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -31,8 +31,8 @@ api_protect_admin_script();
 
 require_once(api_get_path(LIBRARY_PATH).'/usermanager.lib.php');
 
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
-$interbredcrump[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('AdministrationTools'));
+$interbreadcrumb[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
 $tool_name = get_lang('Survey');
 Display::display_header($tool_name);
 ?>
@@ -65,7 +65,7 @@ $group_table = Database :: get_main_table(TABLE_MAIN_GROUP);
 			$group[] = $group;
 		}
 		$table_header[] = array('',false);
-		$table_header[] = array (get_lang('serialno'), true);
+		$table_header[] = array (get_lang('SerialNo'), true);
 		$table_header[] = array (get_lang('FirstName'), true);
 		$table_header[] = array (get_lang('LastName'), true);
 		$table_header[] = array (get_lang('LoginName'), true);
diff --git a/main/survey/numbered.php b/main/survey/numbered.php
index 07a39a1c7c..2ae582ea1b 100644
--- a/main/survey/numbered.php
+++ b/main/survey/numbered.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: numbered.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: numbered.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -51,18 +51,13 @@ $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'];
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
-//$interbredcrump[] = array ("url" => "survey.php?cidReq=$cidReq&n=$n", "name" => get_lang('CreateSurvey'));
-/*
-if($n=="n")
-$interbredcrump[] = array ("url" => "create_new_survey.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
-else
-$interbredcrump[] = array ("url" => "create_from_existing.php?cidReq=$cidReq&n=$n", "name" => get_lang('New_survey'));
-*/
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+
+
 //$n=$_REQUEST['n'];
 if ($_POST['action'] == 'addquestion')
 {
@@ -545,7 +540,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('numbered','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+						<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('numbered','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 						<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/numbered_edit.php b/main/survey/numbered_edit.php
index 31342135da..be289facbb 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: numbered_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -34,7 +34,7 @@ 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)."/surveymanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $$cidReq = $_REQUEST['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $groupid=$_REQUEST['groupid'];
@@ -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'";
@@ -366,7 +366,7 @@ $start=1;$end=$check;$upx=2;$upy=1;$dwnx=0;$dwny=1;$jd=0;$sn=1;
 
 			<input type="HIDDEN" name="end1" value="<?php echo $end; ?>">
 			<input type="submit"  name="back" value="<?php echo get_lang('Back'); ?>">
-			<input type="button" value="<?php echo get_lang('preview');?>" onClick="preview('numbered','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+			<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('numbered','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 			<input type="submit"  name="update" value="<?php echo get_lang('Update'); ?>"> 
 			</div>
 <!--this partcular field helps in identify the item to be add at the itemadd.php-->
diff --git a/main/survey/open.php b/main/survey/open.php
index c73944c38b..a0b031c347 100644
--- a/main/survey/open.php
+++ b/main/survey/open.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: open.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: open.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -44,14 +44,14 @@ if($status==5)
 api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $cidReq=$_GET['cidReq'];
 $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,8 +223,8 @@ 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="button" value="<?php echo get_lang('preview');?>" onClick="preview('this.form','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+	<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>
 <DIV id=bottomnav align=center></DIV>
diff --git a/main/survey/open_edit.php b/main/survey/open_edit.php
index 353abae91c..2b84c2005f 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: open_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -45,14 +45,14 @@ if($status==5)
 api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $cidReq=$_GET['cidReq'];
 $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'];
@@ -180,7 +180,7 @@ border=0>
 <BR>
 <DIV align=center> 
 	<input type="submit"  name="back" value="<?php echo get_lang('Back');?>">
-	<input type="button" value="<?php echo get_lang('preview');?>" onClick="preview('this.form','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
+	<input type="button" value="<?php echo get_lang('Preview');?>" onClick="preview('this.form','<?php echo $temp; ?>','<?php echo $Multi; ?>')">
 	<input type="submit"  name="update" value="<?php echo get_lang('Update'); ?>">  
 	
 </DIV></FORM></DIV>
diff --git a/main/survey/preview_mcma.php b/main/survey/preview_mcma.php
index c25616ba5e..e4e04bcbcf 100644
--- a/main/survey/preview_mcma.php
+++ b/main/survey/preview_mcma.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_mcma.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: preview_mcma.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -47,7 +47,7 @@ $tool_name = get_lang('ViewQuestions');
 $header1 = get_lang('SurveyName');
 $header2 = get_lang('GroupName');
 $header3 = get_lang('Type');
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $questionid = '1';
@@ -103,13 +103,13 @@ Display::display_header($tool_name);
      <td><?php api_display_tool_title($qid)?></td>
   </tr>
 <tr>
-  <td><?php echo get_lang('question'); ?></td>
+  <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
 <td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
-  <td></br><?php echo get_lang('answer'); ?></td>
+  <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
   <tr>
   <?
@@ -119,8 +119,8 @@ Display::display_header($tool_name);
 <?		
 	}  
   ?>
-<td></br><input type="button" name="back" value="<?php  echo get_lang('back'); ?>" onClick="javascript:history.go(-1);"></td>
- <!-- <td></br><input type="submit" value="<?php  echo get_lang('import'); ?>"></td>-->
+<td></br><input type="button" name="back" value="<?php  echo get_lang('Back'); ?>" onClick="javascript:history.go(-1);"></td>
+ <!-- <td></br><input type="submit" value="<?php  echo get_lang('Import'); ?>"></td>-->
 </tr>
 </table>
 </form>
diff --git a/main/survey/preview_open.php b/main/survey/preview_open.php
index 44f3100fc5..5db8a818f5 100644
--- a/main/survey/preview_open.php
+++ b/main/survey/preview_open.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_open.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: preview_open.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -47,7 +47,7 @@ $tool_name = get_lang('ViewQuestions');
 $header1 = get_lang('SurveyName');
 $header2 = get_lang('GroupName');
 $header3 = get_lang('Type');
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $questionid = '1';
@@ -101,19 +101,19 @@ Display::display_header($tool_name);
     <td><?php api_display_tool_title($qid)?></td>
   </tr>
 <tr>
-  <td><?php echo get_lang('question'); ?></td>
+  <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
 <td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
-  <td></br><?php echo get_lang('answer'); ?></td>
+  <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
   <tr>
 <td><textarea  cols="50" rows="3" name="questions"> <?echo $enterquestion;?></textarea></td>
 </tr>
-  <td></br><input type="submit" value="<?php  echo get_lang('back'); ?> "></td>
- <!-- <td></br><input type="submit" value="<?php  echo get_lang('import'); ?>"></td>-->
+  <td></br><input type="submit" value="<?php  echo get_lang('Back'); ?> "></td>
+ <!-- <td></br><input type="submit" value="<?php  echo get_lang('Import'); ?>"></td>-->
 </tr>
 </table>
 
diff --git a/main/survey/preview_yesno.php b/main/survey/preview_yesno.php
index e5d6f857af..f40805e508 100644
--- a/main/survey/preview_yesno.php
+++ b/main/survey/preview_yesno.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: preview_yesno.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: preview_yesno.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -52,7 +52,7 @@ $tool_name = get_lang('ViewQuestions');
 $header1 = get_lang('SurveyName');
 $header2 = get_lang('GroupName');
 $header3 = get_lang('Type');
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $questionid = '1';
@@ -109,13 +109,13 @@ $ques_type = $_GET['qtype'];
    <td><?php api_display_tool_title($qid); ?></td>
   </tr>
 <tr>
-  <td><?php echo get_lang('question'); ?></td>
+  <td><?php echo get_lang('Question'); ?></td>
   </tr>
 <tr>
 <td><textarea  cols="50" rows="6" name="questions"> <?echo $enterquestion;?></textarea></td>
 </tr>
 <tr>
-  <td></br><?php echo get_lang('answer'); ?></td>
+  <td></br><?php echo get_lang('Answer'); ?></td>
   </tr>
    <tr>
   <?
@@ -126,8 +126,8 @@ $ques_type = $_GET['qtype'];
 	}  
   ?>
 <tr>
-  <td></br><input type="submit" name="back" value="<?php  echo get_lang('back'); ?> "></td>
- <!-- <td></br><input type="submit" value="<?php  echo get_lang('import'); ?>"></td>-->
+  <td></br><input type="submit" name="back" value="<?php  echo get_lang('Back'); ?> "></td>
+ <!-- <td></br><input type="submit" value="<?php  echo get_lang('Import'); ?>"></td>-->
 </tr>
 </table>
 </form>	
diff --git a/main/survey/question_added.php b/main/survey/question_added.php
index 44ad83410f..3081201c04 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: question_added.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -42,7 +42,7 @@ $cidReq=$_GET['cidReq'];
 $table_survey = Database :: get_course_table('survey');
 $table_group =  Database :: get_course_table('survey_group');
 $table_question = Database :: get_course_table('questions');
-$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
+$interbreadcrumb[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
 $groupid=$_REQUEST['groupid'];
 $surveyid=$_REQUEST['surveyid'];
 $qdeleted=0;
@@ -94,7 +94,7 @@ if (isset($_POST['finish']))
 	$tool_name = get_lang('QuestionsAdded');
 	Display :: display_header($tool_name);
 	$survey_name=get_lang('SurveyName').$survey_name;
-	$author=get_lang('author').$author;	
+	$author=get_lang('Author').$author;	
 	api_display_tool_title($survey_name);	
 	api_display_tool_title($tool_name);	
 if($qdeleted)
@@ -115,8 +115,8 @@ if($qdeleted)
 	$table_header[] = array (' ', false);
 	//$table_header[] = array (get_lang('SNo'), true);
 	$table_header[] = array (get_lang('questions'), true);
-	$table_header[] = array (get_lang('group'), true);
-	$table_header[] = array (get_lang('type'), true);	
+	$table_header[] = array (get_lang('Group'), true);
+	$table_header[] = array (get_lang('Type'), true);	
 	$courses = array ();
 	for($i=0;$i<$num;$i++)
 	{
@@ -143,7 +143,7 @@ if($qdeleted)
 	<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="finish" value="<?php echo get_lang("FinishSurvey");?>">
 </form>	
 <?
 /*
diff --git a/main/survey/question_list.php b/main/survey/question_list.php
index 59f56ba98a..19cfe1aacb 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: question_list.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -40,12 +40,12 @@ if($status==5)
 {
 api_protect_admin_script();
 }
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $cidReq = $_REQUEST['cidReq'];
 $db_name = $_REQUEST['db_name'];
 $tool_name = get_lang('SelectQuestion');
 $Sname = get_lang('SurveyName');
-$GName = get_lang('groupname');
+$GName = get_lang('GroupName');
 $Author = get_lang('Author');
 $surveyid=$_REQUEST['surveyid'];
 $groupid=$_REQUEST['groupid'];
@@ -159,9 +159,9 @@ function displayTemplate(url){
 		}
 		$table_header[] = array (' ', false);
 		$table_header[] = array (get_lang('Question'), true);
-		$table_header[] = array (get_lang('QuestionType1'), true);
+		$table_header[] = array (get_lang('QuestionType'), true);
 		$table_header[] = array (get_lang('Group'),true);
-		$table_header[] = array	(get_lang('surveyname'),true);
+		$table_header[] = array	(get_lang('SurveyName'),true);
 		$table_header[] = array('', false);
 		
 		if($datacount>0)
diff --git a/main/survey/question_list_new.php b/main/survey/question_list_new.php
index a7741c47d9..9483a34a1a 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: question_list_new.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 
@@ -41,13 +41,13 @@ if($status==5)
 {
 api_protect_admin_script();
 }
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $cidReq = $_REQUEST['cidReq'];
 $db_name = $_REQUEST['db_name'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $tool_name = get_lang('SelectQuestion');
 $Sname = get_lang('SurveyName');
-$GName = get_lang('groupname');
+$GName = get_lang('GroupName');
 $Author = get_lang('Author');
 $surveyid=$_REQUEST['surveyid'];
 $groupid=$_REQUEST['groupid'];
@@ -223,9 +223,9 @@ function displayTemplate(url) {
 		}
 		$table_header[] = array (' ', false);
 		$table_header[] = array (get_lang('Question'), true);
-		$table_header[] = array (get_lang('QuestionType1'), true);
+		$table_header[] = array (get_lang('QuestionType'), true);
 		$table_header[] = array (get_lang('Group'),true);
-		$table_header[] = array	(get_lang('surveyname'),true);
+		$table_header[] = array	(get_lang('SurveyName'),true);
 		$table_header[] = array('', false);
 		if($datacount>0)
 		Display :: display_sortable_table($table_header, $questions, array (), array (), $parameters);
@@ -237,7 +237,7 @@ function displayTemplate(url) {
 ?>
 		<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/question_type.php b/main/survey/question_type.php
index ed12fc0297..9e11aa6e80 100644
--- a/main/survey/question_type.php
+++ b/main/survey/question_type.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: question_type.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: question_type.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -45,7 +45,7 @@ $table_survey = Database :: get_main_table(TABLE_MAIN_SURVEY);
 $table_group =  Database :: get_main_table(TABLE_MAIN_GROUP);
 $table_question = Database :: get_main_table(TABLE_MAIN_SURVEYQUESTION);
 $tool_name = get_lang('SelectQuestionByType');
-$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
 //$questtype=$_POST['add_question'];
 
 Display::display_header($tool_name);
@@ -83,11 +83,11 @@ if( isset($error_message) )
 
 <select name="add_question">
 	<option value="0"><?php  echo get_lang('Select');?></option>
-	<option value="<?php  echo get_lang('yesno');?>" <?php  if(isset($_POST['add_question'])){if($_POST['add_question']=="1")echo "selected";}?>><?php echo get_lang('yesno');?></option>
+	<option value="<?php  echo get_lang('YesNo');?>" <?php  if(isset($_POST['add_question'])){if($_POST['add_question']=="1")echo "selected";}?>><?php echo get_lang('YesNo');?></option>
 	<option value="<?php  echo get_lang('MultipleChoiceSingle');?>" <?php  if(isset($_POST['add_question'])){if($_POST['add_question']=="2")echo "selected";}?>><?php echo get_lang('MultipleChoiceSingle');?></option>
 	<option value="<?php  echo get_lang('MultipleChoiceMulti');?>" <?php  if(isset($_POST['add_question'])){if($_POST['add_question']=="3")echo "selected";}?>><?php echo get_lang('MultipleChoiceMulti');?></option>
 	<option value="<?php  echo get_lang('Open');?>" <?php  if(isset($_POST['add_question'])){if($_POST['add_question']=="4")echo "selected";}?>><?php echo get_lang('Open');?></option>
-	<option value="<?php echo get_lang('numbered');?>" <?php if(isset($_POST['add_question'])){if($_POST['add_question']=="5")echo "selected";}?>><?php echo get_lang('numbered');?></option>
+	<option value="<?php echo get_lang('Numbered');?>" <?php if(isset($_POST['add_question'])){if($_POST['add_question']=="5")echo "selected";}?>><?php echo get_lang('Numbered');?></option>
 </select>
 </td>
 </tr>
@@ -95,7 +95,7 @@ if( isset($error_message) )
 <tr>
 <td></td>
 <td>
-<input type="submit" name= 'next' value="<?php echo get_lang('next');?>">
+<input type="submit" name= 'next' value="<?php echo get_lang('Next');?>">
 </td>
 </tr>
 </table>
diff --git a/main/survey/reporting.php b/main/survey/reporting.php
index 8b41cc3431..a941ff1156 100644
--- a/main/survey/reporting.php
+++ b/main/survey/reporting.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: reporting.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: reporting.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -46,7 +46,7 @@ if($_SESSION['status']==5)
 }
 
 $tool_name = get_lang('SurveyReporting');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 Display::display_header($tool_name);
 
 echo '<table align="center">
diff --git a/main/survey/select_question.php b/main/survey/select_question.php
index 44d6d22ca1..568dc070c9 100644
--- a/main/survey/select_question.php
+++ b/main/survey/select_question.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: select_question.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 if(isset($_POST['add_question']))
@@ -35,7 +35,7 @@ $language_file = 'survey';
     $add_question=$_REQUEST['add_question'];
 	switch ($_POST['add_question'])
 	{
-		case get_lang('yesno'):
+		case get_lang('YesNo'):
 		header("location:yesno.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 		break;
 		case get_lang('MultipleChoiceSingle'):
@@ -47,7 +47,7 @@ $language_file = 'survey';
 		case get_lang('Open'):
 		header("location:open.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 		break;
-		case get_lang('numbered'):
+		case get_lang('Numbered'):
 		header("location:numbered.php?add_question=$add_question&groupid=$groupid&surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname");
 		break;
 		default :
@@ -89,11 +89,11 @@ if( isset($error_message) )
 <td>
 <select name="add_question" onChange="javascript:this.form.submit();">
 	<option value="0"><?php echo get_lang('Select');?></option>
-	<option value="<?php echo get_lang('YesNo'); ?>" <?php if($add_question12==get_lang('yesno'))echo "selected";?>><?php echo get_lang('yesno');?></option>
+	<option value="<?php echo get_lang('YesNo'); ?>" <?php if($add_question12==get_lang('YesNo'))echo "selected";?>><?php echo get_lang('YesNo');?></option>
 	<option value="<?php echo get_lang('MultipleChoiceSingle'); ?>" <?php if($add_question12==get_lang('MultipleChoiceSingle')) { echo " selected ";}?>><?php echo get_lang('MultipleChoiceSingle');?></option>
 	<option value="<?php echo get_lang('MultipleChoiceMulti'); ?>" <?php if($add_question12==get_lang('MultipleChoiceMulti')) { echo " selected ";}?>><?php echo get_lang('MultipleChoiceMulti');?></option>
 	<option value="<?php echo get_lang('Open'); ?>" <?php if($add_question12==get_lang('Open')) { echo "selected";}?>><?php echo get_lang('Open');?></option>
-	<option value="<?php echo get_lang('Numbered'); ?>" <?php if($add_question12==get_lang('numbered')) { echo "selected";}?>><?php echo get_lang('numbered');?></option>
+	<option value="<?php echo get_lang('Numbered'); ?>" <?php if($add_question12==get_lang('Numbered')) { echo "selected";}?>><?php echo get_lang('Numbered');?></option>
 </select>
 </td>
 </tr>
diff --git a/main/survey/select_question_group-uploaded.php b/main/survey/select_question_group-uploaded.php
index 7b86e191ed..78cfb36d33 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: select_question_group-uploaded.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 
@@ -56,16 +56,16 @@ $cidReq = $_GET['cidReq'];
 $db_name = $_REQUEST['db_name'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 //$table_survey = Database :: get_course_table('survey');
-$tool_name1 = get_lang('selectquestiongroup1');
-$tool_name = get_lang('selectquestiongroup');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$tool_name1 = get_lang('AddQuestionGroup');
+$tool_name = get_lang('AddQuestionGroup');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 /*if($page = $_REQUEST['page'])
 {
- $interbredcrump[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateNewSurvey'));
+ $interbreadcrumb[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateNewSurvey'));
 }
 else
 {
- $interbredcrump[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateFromExistingSurvey'));
+ $interbreadcrumb[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateFromExistingSurvey'));
 }*/
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
@@ -288,7 +288,7 @@ if(isset($messege) && $messege )
 </tr>
 <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="question_group" value="<?php echo get_lang("importquestionsfromexistinggroup"); ?>"></td>
+  <td><input type="submit" name="question_group" value="<?php echo get_lang('ImportQuestionsFromExistingGroup'); ?>"></td>
 </tr>
 </table>
 </form>
@@ -303,10 +303,10 @@ $result=api_sql_query($query);*/
 	$parameters['cidReq']=$cidReq;
 	//$table_header[] = array (' ', false);
 	//$table_header[] = array (get_lang('SNo'), true);
-	$table_header[] = array (get_lang('questions1'), true);
+	$table_header[] = array (get_lang('Questions'), true);
     $table_header[] = array (get_lang('ChangeOrder'), true);
-	$table_header[] = array (get_lang('group'), true);
-	$table_header[] = array (get_lang('type1'), true);	
+	$table_header[] = array (get_lang('Group'), true);
+	$table_header[] = array (get_lang('Type'), true);	
 	$table_header[]=array('',true);
 	$courses = array ();
 	if($num){
@@ -359,13 +359,13 @@ if(!empty($courses))
 	<!--<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="finish" value="<?php echo get_lang("FinishSurvey");?>">
 <?
 }
 else
 {
 ?>
-    <input type="submit" name="back" value="<?echo get_lang("back");?>">
+    <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 5b4bfa8bbe..2a26b63d02 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: select_question_group.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 
@@ -56,16 +56,16 @@ $cidReq = $_GET['cidReq'];
 $db_name = $_REQUEST['db_name'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 //$table_survey = Database :: get_course_table('survey');
-$tool_name1 = get_lang('selectquestiongroup1');
-$tool_name = get_lang('selectquestiongroup');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$tool_name1 = get_lang('AddQuestionGroup');
+$tool_name = get_lang('AddQuestionGroup');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 /*if($page = $_REQUEST['page'])
 {
- $interbredcrump[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateNewSurvey'));
+ $interbreadcrumb[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateNewSurvey'));
 }
 else
 {
- $interbredcrump[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateFromExistingSurvey'));
+ $interbreadcrumb[] = array ("url" => "create_new_survey.php?surveyid=$surveyid&cidReq=$cidReq&curr_dbname=$curr_dbname&page=$page", "name" => get_lang('CreateFromExistingSurvey'));
 }*/
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
@@ -288,7 +288,7 @@ if(isset($messege) && $messege )
 </tr>
 <tr>
   <td>&nbsp;</td>
-  <td><input type="submit" name="question_group" value="<?php echo get_lang("importquestionsfromexistinggroup"); ?>"></td>
+  <td><input type="submit" name="question_group" value="<?php echo get_lang('ImportQuestionsFromExistingGroup'); ?>"></td>
 </tr>
 </table>
 </form>
@@ -304,10 +304,10 @@ $result=api_sql_query($query);*/
 	//$table_header[] = array (' ', false);
 	//$table_header[] = array (get_lang('SNo'), true);
 	
-	$table_header[] = array (get_lang('questions1'), true);
+	$table_header[] = array (get_lang('Questions'), true);
     $table_header[] = array (get_lang('ChangeOrder'), true);	
-	$table_header[] = array (get_lang('type1'), true);	
-	$table_header[] = array (get_lang('group'), true);
+	$table_header[] = array (get_lang('Type'), true);	
+	$table_header[] = array (get_lang('Group'), true);
 	$table_header[]=array('',true);
 	$courses = array ();
 	$question_number = 0;
@@ -387,7 +387,7 @@ if(!empty($courses))
 else
 {
 ?>
-    <input type="submit" name="back" value="<?echo get_lang("back");?>">
+    <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_type.php b/main/survey/select_question_type.php
index 91892aca4d..0616d78351 100644
--- a/main/survey/select_question_type.php
+++ b/main/survey/select_question_type.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: select_question_type.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: select_question_type.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -36,7 +36,7 @@ $language_file = 'survey';
 	require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 	$cidReq=$_GET['cidReq'];
 	$tool_name = get_lang('AddQuestion');
-	$interbredcrump[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
+	$interbreadcrumb[] = array ("url" => "survey.php", "name" => get_lang('CreateSurvey'));
 	$group_name=$_GET['groupname'];
 	$surveyid=$_REQUEST['surveyid'];
 	$groupid=$_REQUEST['groupid'];
diff --git a/main/survey/survey.php b/main/survey/survey.php
index b043cc6f51..1feef2058c 100644
--- a/main/survey/survey.php
+++ b/main/survey/survey.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 
@@ -136,7 +136,7 @@ api_display_tool_title($tool_name);
 <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('Ok1'); ?>" />
+<input type="submit" name="action" value="<?php echo get_lang('Ok'); ?>" />
 </form>
 <?php
 /*
diff --git a/main/survey/survey_all_courses.php b/main/survey/survey_all_courses.php
index 0c55b8a847..12d9db0bd1 100644
--- a/main/survey/survey_all_courses.php
+++ b/main/survey/survey_all_courses.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_all_courses.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_all_courses.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -156,8 +156,8 @@ function displayTemplate(url) {
 				
 			}
         }
-		$table_header[] = array (get_lang('SurveyName1'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('SurveyName'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		$table_header[] = array (get_lang('CourseName'), true);
 		$table_header[] = array (get_lang('Language'), true);
 		$table_header[] = array (get_lang('AvailableFrom'), true);
diff --git a/main/survey/survey_edit.php b/main/survey/survey_edit.php
index e9d525b280..90329aab67 100644
--- a/main/survey/survey_edit.php
+++ b/main/survey/survey_edit.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_edit.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 /*
 ==============================================================================
@@ -54,7 +54,7 @@ $table_survey = Database :: get_course_table('survey');
 $tbl_category = Database :: get_main_table(TABLE_MAIN_CATEGORY);
 $noPHP_SELF = true;
 $tool_name = get_lang('ModifySurveyInformation');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 $coursePathWeb = api_get_path(WEB_COURSE_PATH);
 $coursePathSys = api_get_path(SYS_COURSE_PATH);
 $maxFilledSpace = get_setting('default_document_quotum');
@@ -158,19 +158,19 @@ $lang=$obj->lang;
 <input type="hidden" name="action" value="update_survey">
 <table>
 <tr>
- <td><?php echo get_lang('surveycode'); ?></td>
+ <td><?php echo get_lang('SurveyCode'); ?></td>
  <td><input type="text" name="survey_code" size="20"   maxlength="19" value="<?php if($formSent){echo $surveycode;}else {echo $obj->code;} ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveytitle'); ?></td>
+  <td><?php echo get_lang('SurveyTitle'); ?></td>
   <td><input type="text" name="survey_title" size="40"  maxlength="79" value="<?php if($formSent){echo $surveytitle;}else {echo $obj->title;} ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveysubtitle'); ?></td>
+  <td><?php echo get_lang('SurveySubtitle'); ?></td>
   <td><input type="text" name="survey_subtitle" size="40"   maxlength="79" value="<?php if($formSent){echo $surveysubtitle;}else {echo $obj->subtitle;} ?>"></td>
 </tr>
 <tr>
-  <td><?php echo get_lang('author'); ?></td>
+  <td><?php echo get_lang('Author'); ?></td>
   <td>
   	<?php
 	UserManager::get_teacher_list($cidReq,$obj->author);
@@ -178,7 +178,7 @@ $lang=$obj->lang;
   </td>
 </tr>
 <tr>
-  <td><?php echo get_lang('surveylanguage'); ?>&nbsp;</td>
+  <td><?php echo get_lang('SurveyLanguage'); ?>&nbsp;</td>
   <td>
 	<select name="survey_language">
     <option value="english" <?if($lang=='english') echo "selected";?>>English</option>
@@ -188,7 +188,7 @@ $lang=$obj->lang;
   </td>
 </tr>
 <tr id="subtitle">
-  <td><?php echo get_lang('availablefrom'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableFrom'); ?>&nbsp;</td>
   <td>	
         <select name="fday">
 		<?php for($i=1;$i<=31;$i++){
@@ -233,7 +233,7 @@ december -->
 	</tr>
 				
 <tr id="subtitle">
-  <td><?php echo get_lang('availabletill'); ?>&nbsp;</td>
+  <td><?php echo get_lang('AvailableTill'); ?>&nbsp;</td>
   <td>
   	  <select name="end_fday">
 		<?php for($i=1;$i<=31;$i++){
@@ -283,7 +283,7 @@ december -->
 </td>
 </tr>
 
-<tr><td valign="top"><?php echo get_lang('surveyintroduction'); ?>&nbsp;</td>
+<tr><td valign="top"><?php echo get_lang('SurveyIntroduction'); ?>&nbsp;</td>
 <td>
 <?php
    api_disp_html_area('content',$obj->intro,'300px');
@@ -301,7 +301,7 @@ december -->
  </tr>
  <tr>
  <td></td>
- <td><input type="submit" name="back" value="<?php echo get_lang('back'); ?>">&nbsp;<input type="submit" name="updateandreturn" value="<?php echo get_lang('saveandexit'); ?>">&nbsp;<input type="submit" name="next" value="<?php echo get_lang('next'); ?>"></td>
+ <td><input type="submit" name="back" value="<?php echo get_lang('Back'); ?>">&nbsp;<input type="submit" name="updateandreturn" value="<?php echo get_lang('SaveAndExit'); ?>">&nbsp;<input type="submit" name="next" value="<?php echo get_lang('Next'); ?>"></td>
  </tr>
 </table>
 </form>
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index 3c92467514..3dda66e922 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_list.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -51,7 +51,7 @@ $obj=@mysql_fetch_object($res);
 $db_name = $obj->db_name ;
 $published = $_REQUEST['published'];
 $surveyid=$_REQUEST['surveyid'];
-//$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
+//$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
 if (isset ($_REQUEST['action']))
 {
 	 $cidReq=$_REQUEST['cidReq'];
@@ -87,8 +87,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced')
 	{
 		$titles[] = $title;
 	}
-	//$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
-	//$interbredcrump[] = array ("url" => 'survey_list.php', "name" => get_lang('SurveyList'));
+	//$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+	//$interbreadcrumb[] = array ("url" => 'survey_list.php', "name" => get_lang('SurveyList'));
 	$tool_name = get_lang('SearchASurvey');
 	Display :: display_header($tool_name);
 	api_display_tool_title($tool_name);
@@ -142,7 +142,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced')
 	}
 else
 {
-	//$interbredcrump[] = array ("url" => "index.php", "name" => get_lang('Survey'));
+	//$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('Survey'));
 	$tool_name = get_lang('Survey');
 	Display :: display_header($tool_name);
 	api_display_tool_title($tool_name);
@@ -249,13 +249,13 @@ 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('Edit1').'"/></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('Delete1').'"/></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);
-		$table_header[] = array (get_lang('SurveyName1'), true);
+		$table_header[] = array (get_lang('SurveyName'), true);
 		$table_header[] = array (get_lang('SurveyCode'), true);
-		$table_header[] = array (get_lang('author'), true);
+		$table_header[] = array (get_lang('Author'), true);
 		$table_header[] = array (get_lang('Language'), true);
 		$table_header[] = array (get_lang('AvailableFrom'), true);
 		$table_header[] = array (get_lang('AvailableTill'), true);
@@ -268,7 +268,7 @@ else
 		echo '</select>';
 		echo '<input type="hidden" name="cidReq" value="'.$cidReq.'">';
 		
-		echo '&nbsp;&nbsp;<input type="submit" value="'.get_lang('Ok1').'" onclick="return validate(\'frm\');"/>';
+		echo '&nbsp;&nbsp;<input type="submit" value="'.get_lang('Ok').'" onclick="return validate(\'frm\');"/>';
 		echo '</form>';
 	}
 	else
diff --git a/main/survey/survey_report.php b/main/survey/survey_report.php
index f9cf480dfd..a294b3c64d 100644
--- a/main/survey/survey_report.php
+++ b/main/survey/survey_report.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: survey_report.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_report.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 /*
@@ -48,7 +48,7 @@ if($_SESSION['status']==5)
 $screen = isset($_POST['screen']) ? $_POST['screen'] : '1' ;
 
 $tool_name = get_lang('SurveyReporting');
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('Survey'));
 Display::display_header($tool_name);
 
 switch($screen) {
diff --git a/main/survey/survey_white.php b/main/survey/survey_white.php
index d1491a76a2..06ac4d8246 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: survey_white.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -56,8 +56,8 @@ $sql = 'select * from '.$db_name.'.survey where survey_id='.$surveyid;
 
 $rs = api_sql_query($sql,__FILE__,__LINE__);
 $o_survey = mysql_fetch_object($rs);
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
-$tool_name = get_lang('preview');
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
+$tool_name = get_lang('Preview');
 Display::display_header($tool_name);
 api_display_tool_title("Survey Name : ".$o_survey->title);
 
diff --git a/main/survey/surveytemp_white.php b/main/survey/surveytemp_white.php
index fcb4d531cb..34f6cdef42 100644
--- a/main/survey/surveytemp_white.php
+++ b/main/survey/surveytemp_white.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: surveytemp_white.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: surveytemp_white.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -134,7 +134,7 @@ if(isset($_POST['saveandexit']) || isset($_POST['next']) || isset($_POST['finish
 
 
 
-$interbredcrump[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
+$interbreadcrumb[] = array ("url" => "survey_list.php", "name" => get_lang('SurveyList'));
 $tool_name = $o_survey->title;
 Display::display_header($tool_name);
 api_display_tool_title("Survey Name : ".$o_survey->title);
@@ -365,7 +365,7 @@ echo $content;
 						}
 						
 						if($group_offset < $nbGroups){	
-							echo '<input type="submit" name="saveandexit" value="'.get_lang('saveandexit').'" onclick="return confirm(\'Are you sure ?\')">';					
+							echo '<input type="submit" name="saveandexit" value="'.get_lang('SaveAndExit').'" onclick="return confirm(\''.get_lang('AreYouSure').'\')">';					
 							echo '<input type="submit" name="next" value="'.get_lang('Next').'">&nbsp;';						
 						}
 						else {
diff --git a/main/survey/yesno.php b/main/survey/yesno.php
index 23ab43c638..ebeb0b1e31 100644
--- a/main/survey/yesno.php
+++ b/main/survey/yesno.php
@@ -20,7 +20,7 @@
 /**
 *	@package dokeos.survey
 * 	@author 
-* 	@version $Id: yesno.php 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: yesno.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -48,10 +48,10 @@ if($status==5)
 api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$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');
@@ -429,8 +429,8 @@ 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('yesno','<?php echo $temp;?>','<?php echo $Multi; ?>')">
-						<input type="submit"  name="next" value="<?php echo get_lang("next");?>"> 
+						<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>
 <!--this partcular field helps in identify the item to be add at the itemadd.php-->			
 </form>
diff --git a/main/survey/yesno_edit.php b/main/survey/yesno_edit.php
index 8dab4fcaa6..45671a114d 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 10223 2006-11-27 14:45:59Z pcool $
+* 	@version $Id: yesno_edit.php 10549 2006-12-24 16:08:47Z pcool $
 */
 
 // name of the language file that needs to be included 
@@ -36,11 +36,11 @@ require_once (api_get_path(LIBRARY_PATH)."/surveymanager.lib.php");
 $status = surveymanager::get_status();
 if($status==5)
 {
-api_protect_admin_script();
+	api_protect_admin_script();
 }
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 $n=$_REQUEST['n'];
-$interbredcrump[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
+$interbreadcrumb[] = array ("url" => "survey_list.php?cidReq=$cidReq&n=$n", "name" => get_lang('Survey'));
 $cidReq = $_REQUEST['cidReq'];
 $curr_dbname = $_REQUEST['curr_dbname'];
 $groupid=$_REQUEST['groupid'];
@@ -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,12 +423,12 @@ if( isset($error_message) )
 			}
 
 ?>
-						<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="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="next" value="<?php echo get_lang("next");?>"> -->
+						<!--<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-->			
 </form>