Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc526ba50afdf6379f38288854850ac6d06e3c37e -r7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c526ba50afdf6379f38288854850ac6d06e3c37e)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816)
@@ -87,6 +87,7 @@
 button.cancel  =Cancel
 button.yes  =Yes
 button.no  =No
+button.save =Save
 label.grouping.popup.drag.selection.message  =Because some learners have already entered this grouping activity, it will only be possible to add new learners to groups. Learners can not be removed from groups. Once a learner is added to a group, the action can not be undone.
 label.branching.popup.drag.selection.message  =Because some learners have already entered this branching activity, it will only be possible to add new learners to branches. Learners can not be removed from branches, therefore, once a learner is added to a branch, the action can not be undone.
 label.grouping.general.instructions.branching  =This grouping activity is used for branching. Groups can therefore not be added or deleted.
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r447de59032bcfa79753e192c0dfe35183e8c27e0 -r7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 447de59032bcfa79753e192c0dfe35183e8c27e0)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816)
@@ -166,7 +166,7 @@
 		},
 		'buttons' : [
 		             {
-		            	'text'   : 'Save',
+		            	'text'   : LABELS.SAVE_BUTTON,
 		            	'id'     : 'classDialogSaveButton',
 		            	'click'  : function() {
 		            		var removedLearners = [],
@@ -209,7 +209,7 @@
 						}
 		             },
 		             {
-		            	'text'   : 'Cancel',
+		            	'text'   : LABELS.CANCEL_BUTTON,
 		            	'id'     : 'classDialogCancelButton',
 		            	'click'  : function() {
 							$(this).dialog('close');
@@ -1532,23 +1532,23 @@
 		if (enableExportPortfolio) {
 			learnerProgressCellsTemplate +=
 				'<a class="button" title="' 
-				+ LABELS.EXPORT_PORTFOLIO_LEARNER_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
-				+ LAMS_URL + 'learning/exportWaitingPage.jsp?mode=learner&role=teacher&lessonID='
-				+ lessonId + '&userID=;00;\',\'ExportPortfolio\',240,640,true)">'
-				+ LABELS.EXPORT_PORTFOLIO
+		+ LABELS.EXPORT_PORTFOLIO_LEARNER_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
+		+ LAMS_URL + 'learning/exportWaitingPage.jsp?mode=learner&role=teacher&lessonID='
+		+ lessonId + '&userID=;00;\',\'ExportPortfolio\',240,640,true)">'
+		+ LABELS.EXPORT_PORTFOLIO
 				+ '</a>';
 		}
 
 		learnerProgressCellsTemplate +=
-			/* + <a class="button" title="'
-			+ LABELS.TIME_CHART_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
-			+ LAMS_URL + 'monitoring/monitoring.do?method=viewTimeChart&lessonID='
-			+ lessonId + '&learnerID=;00;\',\'TimeChart\',600,800,true)">'
-			+ LABELS.TIME_CHART 
-			+ '</a>'*/
+		/* + <a class="button" title="'
+		+ LABELS.TIME_CHART_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
+		+ LAMS_URL + 'monitoring/monitoring.do?method=viewTimeChart&lessonID='
+		+ lessonId + '&learnerID=;00;\',\'TimeChart\',600,800,true)">'
+		+ LABELS.TIME_CHART 
+		+ '</a>'*/
 			'<a class="button" href="#" onClick="javascript:showEmailDialog(;00;)">'
-			+ LABELS.EMAIL_BUTTON
-			+ '</a></td></tr><tr><td class="progressBarCell" id="progressBar;00;"></td></tr>';
+		+ LABELS.EMAIL_BUTTON
+		+ '</a></td></tr><tr><td class="progressBarCell" id="progressBar;00;"></td></tr>';
 	}
 	
 	// remove existing progress bars
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r447de59032bcfa79753e192c0dfe35183e8c27e0 -r7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 447de59032bcfa79753e192c0dfe35183e8c27e0)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816)
@@ -61,6 +61,8 @@
 				EMAIL_BUTTON : '<fmt:message key="button.email"/>',
 				CLOSE_BUTTON : '<fmt:message key="button.close"/>',
 				NOTIFCATIONS : '<fmt:message key="email.notifications"/>',
+				SAVE_BUTTON : '<fmt:message key="button.save"/>',
+				CANCEL_BUTTON : '<fmt:message key="button.cancel"/>',
 				LEARNER_FINISHED_COUNT : '<fmt:message key="learner.finished.count"/>',
 				LEARNER_FINISHED_DIALOG_TITLE : '<fmt:message key="learner.finished.dialog.title"/>',
 				LESSON_PRESENCE_ENABLE_ALERT : '<fmt:message key="lesson.enable.presence.alert"/>',
@@ -274,10 +276,10 @@
 				</td>
 				<td>
 					<c:if test="${enableExportPortfolio}">
-						<input type="checkbox" id="exportAvailableField"
-							<c:if test="${lesson.learnerExportAvailable}">
-								checked="checked"
-							</c:if> 
+					<input type="checkbox" id="exportAvailableField"
+						<c:if test="${lesson.learnerExportAvailable}">
+							checked="checked"
+						</c:if> 
 						/>
 						<fmt:message key="lesson.enable.portfolio"/>
 						<br />
@@ -293,7 +295,6 @@
 						<fmt:message key="lesson.presence.count"/>)
 					</span>
 					<br />
-					
 					<input type="checkbox" id="imAvailableField"
 						<c:if test="${not lesson.learnerPresenceAvailable}">
 							disabled="disabled"
@@ -355,9 +356,9 @@
 				<fmt:message key="button.refresh"/>
 			</a>
 			<c:if test="${enableExportPortfolio}">
-				<a id="exportPortfolioButton" class="button" title="<fmt:message key='button.export.tooltip'/>"
-				   href="#"
-				   onClick="javascript:openPopUp('<lams:LAMSURL/>learning/exportWaitingPage.jsp?mode=teacher&lessonID=${lesson.lessonID}', 'ExportPortfolio', 240, 640, true)">
+			<a id="exportPortfolioButton" class="button" title="<fmt:message key='button.export.tooltip'/>"
+			   href="#"
+			   onClick="javascript:openPopUp('<lams:LAMSURL/>learning/exportWaitingPage.jsp?mode=teacher&lessonID=${lesson.lessonID}', 'ExportPortfolio', 240, 640, true)">
 					<fmt:message key="button.export"/>
 				</a>
 			</c:if>