diff --git a/admin/operators.php b/admin/operators.php
index 0c5802a8..40c35d0f 100644
--- a/admin/operators.php
+++ b/admin/operators.php
@@ -204,8 +204,8 @@ $rs = $db->GetAll($sql);
 	<p><?php  echo T_("Enter the telephone extension password:"); ?> <input name="extensionp" type="text"/></p>
 <?php  } ?>
 	<p><?php  echo T_("Will this operator be using VoIP?"); ?> <input name="voip" type="checkbox" checked="checked"/></p>
-	<p><?php  echo T_("Jabber/XMPP username for chat:"); ?> <input name="chat_user" type="text"/></p>
-	<p><?php  echo T_("Jabber/XMPP password for chat:"); ?> <input name="chat_password" type="text"/></p>
+	<p><?php  echo T_("Jabber/XMPP chat user"); ?>: <input name="chat_user" type="text"/></p>
+	<p><?php  echo T_("Jabber/XMPP chat password"); ?>: <input name="chat_password" type="text"/></p>
 	<p><?php  echo T_("Will this operator be using chat?"); ?> <input name="chat_enable" type="checkbox"/></p>
 	<p><?php  echo T_("Is the operator a normal interviewer?"); ?> <input name="temporary" type="checkbox" checked="checked"/></p>
 	<p><?php  echo T_("Is the operator a supervisor?"); ?> <input name="supervisor" type="checkbox"/></p>
diff --git a/locale/quexs.pot b/locale/quexs.pot
index 600c2875..dcb8b8ca 100644
--- a/locale/quexs.pot
+++ b/locale/quexs.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: queXS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-04 14:55+1000\n"
+"POT-Creation-Date: 2013-07-17 12:38+1000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Adam Zammit <adam.zammit@acspri.org.au>\n"
 "Language-Team: \n"
@@ -439,7 +439,7 @@ msgid "Contact details"
 msgstr ""
 
 #: availability.php:56
-#: index.php:207
+#: index.php:214
 msgid "Availability"
 msgstr ""
 
@@ -802,31 +802,35 @@ msgstr ""
 msgid "Restart"
 msgstr ""
 
-#: index.php:199
+#: index.php:206
 msgid "Notes"
 msgstr ""
 
-#: index.php:226
+#: index.php:233
 msgid "Call history"
 msgstr ""
 
-#: index.php:235
+#: index.php:242
 msgid "Shifts"
 msgstr ""
 
-#: index.php:244
+#: index.php:251
 msgid "Appointments"
 msgstr ""
 
-#: index.php:261
+#: index.php:268
 msgid "Work history"
 msgstr ""
 
-#: index.php:269
+#: index.php:276
 msgid "Project information"
 msgstr ""
 
-#: index.php:278
+#: index.php:284
+msgid "Supervisor chat"
+msgstr ""
+
+#: index.php:292
 msgid "Info"
 msgstr ""
 
@@ -916,6 +920,39 @@ msgstr ""
 msgid "No future shifts scheduled"
 msgstr ""
 
+#: supervisorchat.php:80
+msgid "Me"
+msgstr ""
+
+#: supervisorchat.php:82
+msgid "Case id"
+msgstr ""
+
+#: supervisorchat.php:87
+msgid "Supervisor is available"
+msgstr ""
+
+#: supervisorchat.php:88
+msgid "Supervisor not available"
+msgstr ""
+
+#: supervisorchat.php:90
+#: supervisorchat.php:93
+msgid "Message"
+msgstr ""
+
+#: supervisorchat.php:90
+msgid "Send"
+msgstr ""
+
+#: supervisorchat.php:93
+msgid "From"
+msgstr ""
+
+#: supervisorchat.php:96
+msgid "Supervisor chat is not enabled"
+msgstr ""
+
 #: functions/functions.calendar.php:265
 msgid "First name:"
 msgstr ""
@@ -1031,12 +1068,6 @@ msgstr ""
 msgid " Extension "
 msgstr ""
 
-#: functions/functions.voip.php:555
-#: functions/functions.voip.php:567
-#: functions/functions.voip.php:579
-msgid "Case id"
-msgstr ""
-
 #: functions/functions.voip.php:589
 msgid "Unregistered"
 msgstr ""
@@ -1065,19 +1096,19 @@ msgstr ""
 msgid "Allow operator to see?"
 msgstr ""
 
-#: functions/functions.operator.php:141
+#: functions/functions.operator.php:166
 msgid "morning"
 msgstr ""
 
-#: functions/functions.operator.php:142
+#: functions/functions.operator.php:167
 msgid "afternoon"
 msgstr ""
 
-#: functions/functions.operator.php:143
+#: functions/functions.operator.php:168
 msgid "evening"
 msgstr ""
 
-#: functions/functions.operator.php:852
+#: functions/functions.operator.php:877
 msgid "ERROR: You do not have server side authentication enabled therefore queXS cannot determine which user is accessing the system."
 msgstr ""
 
@@ -1087,6 +1118,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#: voip/downloadvoipclient.php:52
+msgid "Error: Cannot write to temporary directory"
+msgstr ""
+
 #: admin/clientquestionnaire.php:150
 #: admin/clientquestionnaire.php:271
 msgid "Assign clients to questionnaires"
@@ -1130,7 +1165,6 @@ msgid "Operator Performance"
 msgstr ""
 
 #: admin/operatorperformance.php:73
-#: admin/shiftreport.php:65
 msgid "Please select a questionnaire"
 msgstr ""
 
@@ -1169,7 +1203,6 @@ msgid "till"
 msgstr ""
 
 #: admin/operatorperformance.php:96
-#: admin/shiftreport.php:72
 msgid "Please select a shift"
 msgstr ""
 
@@ -1231,92 +1264,104 @@ msgstr ""
 msgid "Update priorities"
 msgstr ""
 
-#: admin/operators.php:135
+#: admin/operators.php:139
 msgid "Added:"
 msgstr ""
 
-#: admin/operators.php:138
+#: admin/operators.php:142
 msgid "FreePBX has been reloaded for the new VoIP extension to take effect"
 msgstr ""
 
-#: admin/operators.php:163
+#: admin/operators.php:167
 msgid "Could not add operator. There may already be an operator of this name:"
 msgstr ""
 
-#: admin/operators.php:163
+#: admin/operators.php:167
 msgid "Or there may already be an telephone extension number"
 msgstr ""
 
-#: admin/operators.php:171
-#: admin/operators.php:186
+#: admin/operators.php:175
+#: admin/operators.php:190
 msgid "Add an operator"
 msgstr ""
 
-#: admin/operators.php:187
+#: admin/operators.php:191
 msgid "Adding an operator here will give the user the ability to call cases"
 msgstr ""
 
-#: admin/operators.php:187
+#: admin/operators.php:191
 msgid "Assign Operator to Questionnaire"
 msgstr ""
 
-#: admin/operators.php:187
+#: admin/operators.php:191
 msgid "tool"
 msgstr ""
 
-#: admin/operators.php:188
+#: admin/operators.php:192
 msgid "Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here."
 msgstr ""
 
-#: admin/operators.php:189
+#: admin/operators.php:193
 msgid "The username and extension must be unique for each operator."
 msgstr ""
 
-#: admin/operators.php:191
+#: admin/operators.php:195
 msgid "Enter the username of an operator to add:"
 msgstr ""
 
-#: admin/operators.php:193
+#: admin/operators.php:197
 msgid "Enter the password of an operator to add:"
 msgstr ""
 
-#: admin/operators.php:195
+#: admin/operators.php:199
 msgid "Enter the first name of an operator to add:"
 msgstr ""
 
-#: admin/operators.php:196
+#: admin/operators.php:200
 msgid "Enter the surname of an operator to add:"
 msgstr ""
 
-#: admin/operators.php:197
+#: admin/operators.php:201
 msgid "Enter the Time Zone of an operator to add:"
 msgstr ""
 
-#: admin/operators.php:199
+#: admin/operators.php:203
 msgid "Enter the telephone extension number:"
 msgstr ""
 
-#: admin/operators.php:200
+#: admin/operators.php:204
 msgid "Enter the telephone extension password:"
 msgstr ""
 
-#: admin/operators.php:202
+#: admin/operators.php:206
 msgid "Will this operator be using VoIP?"
 msgstr ""
 
-#: admin/operators.php:203
+#: admin/operators.php:207
+msgid "Jabber/XMPP chat user"
+msgstr ""
+
+#: admin/operators.php:208
+msgid "Jabber/XMPP chat password"
+msgstr ""
+
+#: admin/operators.php:209
+msgid "Will this operator be using chat?"
+msgstr ""
+
+#: admin/operators.php:210
 msgid "Is the operator a normal interviewer?"
 msgstr ""
 
-#: admin/operators.php:204
+#: admin/operators.php:211
 msgid "Is the operator a supervisor?"
 msgstr ""
 
-#: admin/operators.php:205
+#: admin/operators.php:212
 msgid "Is the operator a refusal converter?"
 msgstr ""
 
-#: admin/operators.php:206
+#: admin/operators.php:213
 msgid "Add user"
 msgstr ""
 
@@ -1386,10 +1431,20 @@ msgstr ""
 
 #: admin/shiftreport.php:96
 #: admin/shiftreport.php:104
+#: admin/displayappointments.php:229
+#: admin/displayappointments.php:243
+#: admin/supervisor.php:231
+#: admin/supervisor.php:244
+#: admin/supervisor.php:253
+#: admin/operatorlist.php:118
+#: admin/operatorlist.php:249
+#: admin/operatorlist.php:258
 msgid "Edit"
 msgstr ""
 
 #: admin/shiftreport.php:104
+#: admin/systemsort.php:92
+#: admin/systemsort.php:106
 msgid "Date"
 msgstr ""
 
@@ -1980,100 +2035,104 @@ msgstr ""
 msgid "Download complete sample file with current outcomes"
 msgstr ""
 
-#: admin/operatorlist.php:59
+#: admin/operatorlist.php:60
 msgid "If changing usernames, you must specify a new password"
 msgstr ""
 
-#: admin/operatorlist.php:87
+#: admin/operatorlist.php:90
 msgid "Successfully updated user"
 msgstr ""
 
-#: admin/operatorlist.php:91
+#: admin/operatorlist.php:94
 msgid "Failed to update user. Please make sure the username and extension are unique"
 msgstr ""
 
-#: admin/operatorlist.php:100
+#: admin/operatorlist.php:103
 msgid "Operator edit"
 msgstr ""
 
-#: admin/operatorlist.php:121
-#: admin/operatorlist.php:252
+#: admin/operatorlist.php:124
+#: admin/operatorlist.php:258
 msgid "Username"
 msgstr ""
 
-#: admin/operatorlist.php:125
+#: admin/operatorlist.php:128
 msgid "Update password (leave blank to keep existing password)"
 msgstr ""
 
-#: admin/operatorlist.php:131
+#: admin/operatorlist.php:134
 msgid "Extension Password"
 msgstr ""
 
-#: admin/operatorlist.php:132
+#: admin/operatorlist.php:137
+msgid "Uses chat"
+msgstr ""
+
+#: admin/operatorlist.php:138
 msgid "Timezone"
 msgstr ""
 
-#: admin/operatorlist.php:134
+#: admin/operatorlist.php:140
 msgid "Uses VoIP"
 msgstr ""
 
-#: admin/operatorlist.php:137
+#: admin/operatorlist.php:143
 msgid "Update operator"
 msgstr ""
 
-#: admin/operatorlist.php:230
+#: admin/operatorlist.php:236
 msgid "Windows bat file"
 msgstr ""
 
-#: admin/operatorlist.php:231
+#: admin/operatorlist.php:237
 msgid "*nix script file"
 msgstr ""
 
-#: admin/operatorlist.php:233
+#: admin/operatorlist.php:239
 msgid "Enable"
 msgstr ""
 
-#: admin/operatorlist.php:235
+#: admin/operatorlist.php:241
 msgid "Disable"
 msgstr ""
 
-#: admin/operatorlist.php:239
+#: admin/operatorlist.php:245
 msgid "Enable VoIP"
 msgstr ""
 
-#: admin/operatorlist.php:241
+#: admin/operatorlist.php:247
 msgid "Disable VoIP"
 msgstr ""
 
-#: admin/operatorlist.php:249
+#: admin/operatorlist.php:255
 msgid "Operator list"
 msgstr ""
 
-#: admin/operatorlist.php:252
+#: admin/operatorlist.php:258
 msgid "Enable/Disable"
 msgstr ""
 
-#: admin/operatorlist.php:256
+#: admin/operatorlist.php:262
 msgid "Download the file for each user and save in the same folder as the voip.exe executable. When the file is executed, it will run the voip.exe program with the correct connection details to connect the operator to the VoIP server"
 msgstr ""
 
-#: admin/operatorlist.php:258
+#: admin/operatorlist.php:264
 msgid "Download Windows VoIP Executable"
 msgstr ""
 
-#: admin/operatorlist.php:259
+#: admin/operatorlist.php:265
 msgid "Download Linux VoIP Executable"
 msgstr ""
 
-#: admin/operatorlist.php:264
+#: admin/operatorlist.php:270
 msgid "Enable/Disable VoIP"
 msgstr ""
 
-#: admin/operatorlist.php:265
+#: admin/operatorlist.php:271
 msgid "Windows VoIP"
 msgstr ""
 
-#: admin/operatorlist.php:266
+#: admin/operatorlist.php:272
 msgid "*nix VoIP"
 msgstr ""
 
@@ -2814,7 +2873,7 @@ msgstr ""
 
 #: admin/index.php:66
 #: admin/index.php:68
-#: admin/index.php:110
+#: admin/index.php:111
 msgid "Operator management"
 msgstr ""
 
@@ -2905,19 +2964,19 @@ msgstr ""
 msgid "Set centre information"
 msgstr ""
 
-#: admin/index.php:104
+#: admin/index.php:105
 msgid "Start and monitor system wide case sorting"
 msgstr ""
 
-#: admin/index.php:108
+#: admin/index.php:109
 msgid "VoIP"
 msgstr ""
 
-#: admin/index.php:109
+#: admin/index.php:110
 msgid "Start and monitor VoIP"
 msgstr ""
 
-#: admin/index.php:111
+#: admin/index.php:112
 msgid "Extension status"
 msgstr ""
 
@@ -3235,6 +3294,26 @@ msgstr ""
 msgid "Select sample:"
 msgstr ""
 
+#: admin/supervisorchat.php:63
+msgid "Allow interviewers to chat with the supervisor over XMPP (Jabber). Required is a BOSH enabled XMPP/Jabber server. The operators and the supervisor will need XMPP/Jabber accounts."
+msgstr ""
+
+#: admin/supervisorchat.php:73
+msgid "Enable supervisor chat?"
+msgstr ""
+
+#: admin/supervisorchat.php:74
+msgid "Set BOSH URL"
+msgstr ""
+
+#: admin/supervisorchat.php:75
+msgid "Supervisor XMPP/Jabber id"
+msgstr ""
+
+#: admin/supervisorchat.php:76
+msgid "Update"
+msgstr ""
+
 #: admin/centreinfo.php:66
 msgid "Set centre information: "
 msgstr ""