diff --git a/admin/addshift.php b/admin/addshift.php
index ea921742..d77a4d73 100644
--- a/admin/addshift.php
+++ b/admin/addshift.php
@@ -244,7 +244,7 @@ if ($questionnaire_id != false)
 		<!--<tr><td/><td/><td/><td>Select all</td></tr>-->
 		</table>
 		<!--<p><input type="submit" name="addshift" value="Add Shift"/></p>-->
-		<p><input type="submit" name="submit" value="Submit changes"/></p>
+		<p><input type="submit" name="submit" value="<? echo T_("Submit changes"); ?>"/></p>
 		<p><input type="hidden" name="year" value="<? echo $year; ?>"/></p>
 		<p><input type="hidden" name="woy" value="<? echo $woy; ?>"/></p>
 		<p><input type="hidden" name="qid" value="<? echo $questionnaire_id; ?>"/></p>
diff --git a/admin/callhistory.php b/admin/callhistory.php
index 91162b6b..d7abe1d1 100644
--- a/admin/callhistory.php
+++ b/admin/callhistory.php
@@ -69,8 +69,12 @@ if ($operator_id)
 	if (empty($rs))
 		print "<p>" . T_("No calls ever made") . "</p>";
 	else
+	{
+		translate_array($rs,array("des"));
 		xhtml_table($rs,array("start","end","case_id","opname","des","firstName"),array(T_("Date/Time call start"),T_("Time end"),T_("Case ID"),T_("Operator"),T_("Outcome"),T_("Respondent")));
+	}
 }
+
 else
 	print "<p>" . T_("No operator") . "</p>";
 
diff --git a/admin/callrestrict.php b/admin/callrestrict.php
index ffc51048..187bcd94 100644
--- a/admin/callrestrict.php
+++ b/admin/callrestrict.php
@@ -119,7 +119,7 @@ $daysofweek = $db->Execute($sql);
 	$count = 0;
 	foreach($shifts as $shift)
 	{
-		print "<tr id='row-$count' class='row_to_clone'><td>" . $daysofweek->GetMenu("day[$count]",$shift['dt']) . "</td><td><input size=\"8\" name=\"start[$count]\" maxlength=\"8\" type=\"text\" value=\"{$shift['start']}\"/></td><td><input name=\"end[$count]\" type=\"text\" size=\"8\" maxlength=\"8\" value=\"{$shift['end']}\"/></td></tr>";
+		print "<tr id='row-$count' class='row_to_clone'><td>" . $daysofweek->GetMenu("day[$count]",T_($shift['dt'])) . "</td><td><input size=\"8\" name=\"start[$count]\" maxlength=\"8\" type=\"text\" value=\"{$shift['start']}\"/></td><td><input name=\"end[$count]\" type=\"text\" size=\"8\" maxlength=\"8\" value=\"{$shift['end']}\"/></td></tr>";
 		$daysofweek->MoveFirst();
 		$count++;
 	}
diff --git a/admin/clientquestionnaire.php b/admin/clientquestionnaire.php
index 58384ad5..2713e964 100644
--- a/admin/clientquestionnaire.php
+++ b/admin/clientquestionnaire.php
@@ -264,7 +264,7 @@ foreach($clients as $v)
 }
 
 
-print "</table><p><input type=\"submit\" name=\"submit\"/></p></form>";
+print "</table><p><input type=\"submit\" name=\"submit\" value=\"" . T_("Assign clients to questionnaires") . "\"/></p></form>";
 
 
 xhtml_foot();
diff --git a/admin/clients.php b/admin/clients.php
index 42d669b7..83b8bdf9 100644
--- a/admin/clients.php
+++ b/admin/clients.php
@@ -90,7 +90,7 @@ if ($a)
 	<p><? echo T_("Enter the first name of an client to add:"); ?> <input name="firstname" type="text"/></p>
 	<p><? echo T_("Enter the surname of an client to add:"); ?> <input name="lastname" type="text"/></p>
 	<p><? echo T_("Enter the Time Zone of an client to add:"); ?> <input name="Time_zone_name" type="text" value="<? echo DEFAULT_TIME_ZONE; ?>"/></p>
-	<p><input type="submit" value="Add user" /></p>
+	<p><input type="submit" value="<? echo T_("Add user"); ?>" /></p>
 </form>
 
 <?
diff --git a/admin/databasestrings.php b/admin/databasestrings.php
index d5ae9763..6a26a07c 100755
--- a/admin/databasestrings.php
+++ b/admin/databasestrings.php
@@ -65,6 +65,12 @@ T_("Supervisor Outcomes (referred to supervisor)");
 T_("Refusal Outcomes (respondent refused)");
 T_("Final Outcomes (completed, final refusal, etc)");
 T_("Appointments");
-
+T_("Monday");
+T_("Tuesday");
+T_("Wednesday");
+T_("Thursday");
+T_("Friday");
+T_("Saturday");
+T_("Sunday");
 
 ?>
diff --git a/admin/dataoutput.php b/admin/dataoutput.php
index 661aeb48..829ee40e 100644
--- a/admin/dataoutput.php
+++ b/admin/dataoutput.php
@@ -117,14 +117,14 @@ if (isset($_GET['sample_var']))
 
 xhtml_head(T_("Data output"),true,false,array("../js/window.js"));
 
-print "<h3>Please select a questionnaire</h3>";
+print "<h3>" . T_("Please select a questionnaire") . "</h3>";
 $questionnaire_id = false;
 if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
 display_questionnaire_chooser($questionnaire_id);
 
 if ($questionnaire_id)
 {
-	print "<p><a href='?data&amp;questionnaire_id=$questionnaire_id'>Download all data for this questionnaire</a></p>";
+	print "<p><a href='?data&amp;questionnaire_id=$questionnaire_id'>".  T_("Download all data for this questionnaire") . "</a></p>";
 
 	$sample_import_id = false;
 	if (isset($_GET['sample_import_id'])) $sample_import_id = bigintval($_GET['sample_import_id']);
@@ -132,14 +132,14 @@ if ($questionnaire_id)
 
 	if ($sample_import_id)
 	{
-		print "<p><a href='?data&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id'>Download data for this sample</a></p>";
+		print "<p><a href='?data&amp;questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id'>" . T_("Download data for this sample") . "</a></p>";
 		//get sample vars
 		$sql = "SELECT sv.var as value, sv.var as description 
 			FROM `sample_var` as sv
 			WHERE sv.sample_id = (SELECT sample_id FROM sample WHERE import_id = '$sample_import_id' LIMIT 1)";
 	
 		//download a key file linking the caseid to the sample
-		print "<h3>Download key file: select sample var</h3>";
+		print "<h3>" . T_("Download key file: select sample var") . "</h3>";
 
 		display_chooser($db->GetAll($sql),"sample_var","sample_var",true,"questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id");
 
diff --git a/admin/displayappointments.php b/admin/displayappointments.php
index 8a8fefb7..3b10cc46 100644
--- a/admin/displayappointments.php
+++ b/admin/displayappointments.php
@@ -110,7 +110,10 @@ else
 	$rs = $db->GetAll($sql);
 	
 	if (!empty($rs))
+	{
+		translate_array($rs,array("outcome"));
 		xhtml_table($rs,array("description","case_id","start","end","makerName","firstName","lastName","outcome","callerName","link"),array(T_("Questionnaire"),T_("Case ID"),T_("Start"),T_("End"),T_("Operator Name"),T_("Respondent Name"),T_("Surname"),T_("Current outcome"),T_("Operator who called"),T_("Delete")));
+	}
 	else
 		print "<p>" . T_("No appointments in the future") . "</p>";
 	
diff --git a/admin/import.php b/admin/import.php
index a2e86b16..728af951 100644
--- a/admin/import.php
+++ b/admin/import.php
@@ -118,7 +118,7 @@ else
 	<p><input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /></p>
 	<p><? echo T_("Choose the CSV sample file to upload:"); ?><input name="file" type="file" /></p>
 	<p><? echo T_("Description for file:"); ?><input name="description" type="text" /></p>
-	<p><input type="submit" name="import_file"/></p>
+	<p><input type="submit" name="import_file" value="<? echo T_("Add sample"); ?>"/></p>
 	</form>
 
 	<?
diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php
index 170791aa..2fb63408 100644
--- a/admin/operatorquestionnaire.php
+++ b/admin/operatorquestionnaire.php
@@ -264,7 +264,7 @@ foreach($operators as $v)
 }
 
 
-print "</table><p><input type=\"submit\" name=\"submit\"/></p></form>";
+print "</table><p><input type=\"submit\" name=\"submit\" value=\"" . T_("Assign operators to questionnaires") . "\"/></p></form>";
 
 
 xhtml_foot();
diff --git a/admin/operatorskill.php b/admin/operatorskill.php
index 1da0f6d7..a43a90c0 100644
--- a/admin/operatorskill.php
+++ b/admin/operatorskill.php
@@ -240,7 +240,7 @@ print "<form action=\"\" method=\"post\"><table>";
 print "<tr><th></th>";
 foreach($outcome_types as $q)
 {
-	print "<th><a href=\"javascript:checkQid({$q['outcome_type_id']})\">{$q['description']}</a></th>";
+	print "<th><a href=\"javascript:checkQid({$q['outcome_type_id']})\">" . T_($q['description']) . "</a></th>";
 }
 print "</tr>";
 
@@ -263,7 +263,7 @@ foreach($operators as $v)
 }
 
 
-print "</table><p><input type=\"submit\" name=\"submit\"/></p></form>";
+print "</table><p><input type=\"submit\" name=\"submit\" value=\"" . T_("Modify operator skills") ."\"/></p></form>";
 
 
 xhtml_foot();
diff --git a/admin/outcomes.php b/admin/outcomes.php
index c02d5490..7951ffdf 100644
--- a/admin/outcomes.php
+++ b/admin/outcomes.php
@@ -131,7 +131,10 @@ if ($questionnaire_id != false)
 	$rs = $db->GetAll($sql);
 	
 	if (!empty($rs))
+	{
+		translate_array($rs,array("des"));
 		xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"));
+	}
 	else
 		print "<p>" . T_("No outcomes recorded for this questionnaire") . "</p>";
 
@@ -182,7 +185,10 @@ if ($questionnaire_id != false)
 		$rs = $db->GetAll($sql);
 		
 		if (!empty($rs))
+		{
+			translate_array($rs,array("des"));
 			xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"));
+		}
 		else
 			print "<p>" . T_("No outcomes recorded for this sample") . "</p>";
 	}
diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php
index e2c13684..1eaa0f9b 100644
--- a/admin/questionnaireprefill.php
+++ b/admin/questionnaireprefill.php
@@ -161,7 +161,7 @@ if ($questionnaire_id != false)
 		<label for="value"><? echo T_("The value to pre fill"); ?> </label><input type="text" name="value" id="value"/>		<br/>
 		<input type="hidden" name="questionnaire_id" value="<? print($questionnaire_id); ?>"/>
 		<input type="hidden" name="sgqa" value="<? print($sgqa); ?>"/>
-		<input type="submit" name="add_prefill" value="Add pre fill"/></p>
+		<input type="submit" name="add_prefill" value="<? print(T_("Add pre fill")); ?>"/></p>
 		</form>
 		<?
 	}
diff --git a/admin/shifttemplate.php b/admin/shifttemplate.php
index 71ed1eec..11c2e374 100644
--- a/admin/shifttemplate.php
+++ b/admin/shifttemplate.php
@@ -109,8 +109,7 @@ $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week -
 	FROM day_of_week";
 	
 $daysofweek = $db->Execute($sql);
-	
-	
+
 ?>
 	<form method="post" action="">
 	<table>
@@ -119,7 +118,7 @@ $daysofweek = $db->Execute($sql);
 	$count = 0;
 	foreach($shifts as $shift)
 	{
-		print "<tr id='row-$count' class='row_to_clone'><td>" . $daysofweek->GetMenu("day[$count]",$shift['dt']) . "</td><td><input size=\"8\" name=\"start[$count]\" maxlength=\"8\" type=\"text\" value=\"{$shift['start']}\"/></td><td><input name=\"end[$count]\" type=\"text\" size=\"8\" maxlength=\"8\" value=\"{$shift['end']}\"/></td></tr>";
+		print "<tr id='row-$count' class='row_to_clone'><td>" . $daysofweek->GetMenu("day[$count]",T_($shift['dt'])) . "</td><td><input size=\"8\" name=\"start[$count]\" maxlength=\"8\" type=\"text\" value=\"{$shift['start']}\"/></td><td><input name=\"end[$count]\" type=\"text\" size=\"8\" maxlength=\"8\" value=\"{$shift['end']}\"/></td></tr>";
 		$daysofweek->MoveFirst();
 		$count++;
 	}
diff --git a/admin/supervisor.php b/admin/supervisor.php
index e48f5ef9..4af4b8e9 100644
--- a/admin/supervisor.php
+++ b/admin/supervisor.php
@@ -120,7 +120,9 @@ if (isset($_GET['call_id']))
 				FROM outcome as o, `call` as c
 				WHERE c.call_id = '$call_id'";
 		
-			display_chooser($db->GetAll($sql), "set_outcome_id", "set_outcome_id",true,false,false);
+			$rs2 = $db->GetAll($sql);
+			translate_array($rs2,array("description"));
+			display_chooser($rs2, "set_outcome_id", "set_outcome_id",true,false,false);
 		?>
 		<p><input type="hidden" name="call_id" value="<? echo $call_id;?>"/><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Set outcome"); ?>"/></p>
 		</form>
@@ -165,7 +167,7 @@ if ($case_id != false)
 		print "<h1>" . T_("Project") . ": {$rs['qd']}</h1>";
 		print "<h1>" . T_("Sample") . ": {$rs['sd']}</h1>";
 
-		print "<h2>". T_("Current outcome:") ." {$rs['description']}</h2>";
+		print "<h2>". T_("Current outcome:") ." " . T_($rs['description']) . "</h2>";
 
 		$current_outcome_id = $rs['outcome_id'];
 
@@ -184,7 +186,10 @@ if ($case_id != false)
 		$rs = $db->GetAll($sql);
 	
 		if (!empty($rs))
+		{
+			translate_array($rs,array("outcome"));
 			xhtml_table($rs,array("description","start","end","makerName","firstName","lastName","outcome","callerName","link"),array(T_("Questionnaire"),T_("Start"),T_("End"),T_("Operator Name"),T_("Respondent Name"),T_("Surname"),T_("Current outcome"),T_("Operator who called"),T_("Delete")));
+		}
 		else
 			print "<p>" . T_("No appointments for this case") . "</p>";
 
@@ -203,8 +208,10 @@ if ($case_id != false)
 		if (empty($rs))
 			print "<p>" . T_("No calls made") . "</p>";
 		else
+		{
+			translate_array($rs,array("des"));
 			xhtml_table($rs,array("start","des","phone","link","firstName"),array(T_("Date/Time"),T_("Outcome"),T_("Phone number"),T_("Change outcome"),T_("Operator")));
-	
+		}
 	
 		//view notes
 		$sql = "SELECT DATE_FORMAT(CONVERT_TZ(c.datetime,'UTC',op.Time_zone_name),'".DATE_TIME_FORMAT."') as time, op.firstName, op.lastName, c.note as note
@@ -251,8 +258,10 @@ if ($case_id != false)
 		<?              
 			$sql = "SELECT outcome_id as value,description, CASE WHEN outcome_id = '$current_outcome_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
 				FROM outcome";
-		
-			display_chooser($db->GetAll($sql), "outcome_id", "outcome_id",true,false,false);
+	
+			$rs2 = $db->GetAll($sql);
+			translate_array($rs2,array("description"));
+			display_chooser($rs2, "outcome_id", "outcome_id",true,false,false);
 	
 		?>
 		<p><input type="hidden" name="case_id" value="<? echo $case_id;?>"/><input class="submitclass" type="submit" name="submit" value="<? echo T_("Set outcome"); ?>"/></p>
diff --git a/admin/timezonetemplate.php b/admin/timezonetemplate.php
index 91d5d0aa..a235818a 100644
--- a/admin/timezonetemplate.php
+++ b/admin/timezonetemplate.php
@@ -101,7 +101,7 @@ $sql = "SELECT Time_zone_name
 		?>
 		<form action="" method="get"><p>
 		<label for="time_zone"><? echo T_("Timezone: "); ?></label><input type="text" name="time_zone" id="time_zone" value="<? echo DEFAULT_TIME_ZONE; ?>"/>
-		<input type="submit" name="add_timezone" value="Add Timezone"/></p>
+		<input type="submit" name="add_timezone" value="<? echo T_("Add Timezone"); ?>"/></p>
 		</form>
 		<?
 xhtml_foot();
diff --git a/appointmentlist.php b/appointmentlist.php
index dbaf3d0d..3d157ba6 100644
--- a/appointmentlist.php
+++ b/appointmentlist.php
@@ -91,6 +91,7 @@ if (empty($rs))
 }
 else
 {
+	translate_array($rs,array("des"));
 	xhtml_table($rs,array("start","end","respname","des","firstName"),array(T_("Start"),T_("End"),T_("Respondent"),T_("Outcome"),T_("Operator")));
 }
 		
diff --git a/callhistory.php b/callhistory.php
index b0b79a43..df66075f 100644
--- a/callhistory.php
+++ b/callhistory.php
@@ -74,7 +74,10 @@ if ($operator_id)
 	if (empty($rs))
 		print "<p>" . T_("No calls ever made") . "</p>";
 	else
+	{
+		translate_array($rs,array("des"));
 		xhtml_table($rs,array("start","case_id","des","firstName"),array(T_("Date/Time"),T_("Case ID"),T_("Outcome"),T_("Respondent")));
+	}
 }
 else
 	print "<p>" . T_("No operator") . "</p>";
diff --git a/calllist.php b/calllist.php
index 9815cba3..68571e54 100644
--- a/calllist.php
+++ b/calllist.php
@@ -75,7 +75,10 @@ if ($case_id)
 	if (empty($rs))
 		print "<p>" . T_("No calls made") . "</p>";
 	else
+	{
+		translate_array($rs,array("des"));
 		xhtml_table($rs,array("start","des","cphone","firstName"),array(T_("Date/Time"),T_("Outcome"),T_("Number called"),T_("Operator")));
+	}
 }
 else
 	print "<p>" . T_("No case") . "</p>";
diff --git a/client/index.php b/client/index.php
index 79d2e363..c202b0e9 100644
--- a/client/index.php
+++ b/client/index.php
@@ -105,7 +105,10 @@ if ($client_id)
 			$rs = $db->GetAll($sql);
 			
 			if (!empty($rs))
+			{
+				translate_array($rs,array("des"));
 				xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"));
+			}
 			else
 				print "<p>" . T_("No outcomes recorded for this questionnaire") . "</p>";
 		
diff --git a/nocaseavailable.php b/nocaseavailable.php
index 01759dc1..e47cdf7e 100644
--- a/nocaseavailable.php
+++ b/nocaseavailable.php
@@ -51,6 +51,11 @@ include ("functions/functions.xhtml.php");
  */
 include ("functions/functions.operator.php");
 
+/**
+ * Limesurvey functions
+ */
+include ("functions/functions.limesurvey.php");
+
 xhtml_head(T_("No case available"),true,array("css/table.css"));
 
 $operator_id = get_operator_id();
@@ -146,7 +151,7 @@ else
 //no link to limesurvey
 $sql = "SELECT q.lime_sid, q.description
 	FROM questionnaire as q, operator_questionnaire as oq
-	WHERE oq.operator_id = '1'
+	WHERE oq.operator_id = '$operator_id'
 	AND q.questionnaire_id = oq.questionnaire_id";
 
 $rs = $db->GetAll($sql);
@@ -170,6 +175,28 @@ else
 	print "<p class='error'>" . T_("ERROR: Cannot find questionnaires with LimeSurvey ID's") . "</p>";
 
 
+
+//quota's full
+$sql = "SELECT questionnaire_sample_quota_id,q.questionnaire_id,sample_import_id,lime_sgqa,value,comparison,completions,quota_reached,q.lime_sid
+	FROM questionnaire_sample_quota as qsq, questionnaire as q, operator_questionnaire as oq
+	WHERE oq.operator_id = '$operator_id'
+	AND qsq.questionnaire_id = oq.questionnaire_id
+	AND q.questionnaire_id = oq.questionnaire_id";
+	
+$rs = $db->GetAll($sql);
+
+if (isset($rs) && !empty($rs))
+{
+	foreach($rs as $r)
+	{
+		if ($r['quota_reached'] == 1)
+		{
+			print "<p class='error'>" . T_("ERROR: Quota reached for this question") . " - " . $r['lime_sgqa'];
+		}
+	}
+}
+
+
 //no tokens table associated with questionnaire in limesurvey