=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-21 03:37:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-05-21 04:33:28 +0000
@@ -641,4 +641,5 @@
 categoryoptioncomboname = Category option combo
 organisationunitname = Organisation unit
 orgunit_group = Organisation unit group
-validation_rules_are_being_processed_please_wait = Validation rules are being processed please wait ...
\ No newline at end of file
+validation_rules_are_being_processed_please_wait = Validation rules are being processed please wait ...
+events = Events
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-05-06 08:28:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-05-21 04:33:28 +0000
@@ -24,7 +24,7 @@
 			<th>$i18n.getString('system_identifier')</th>
 			#end
 			
-			<th>$i18n.getString('program_stage')</th>
+			<th>$i18n.getString('events')</th>
 			<th>$i18n.getString('operations')</th>
 		</tr>
 	</thead>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-19 05:57:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-21 04:33:28 +0000
@@ -40,7 +40,7 @@
 				<input type="text" class="{validate:{maxlength:160}} criteria" id="commentInput"
                         style="width:380px;#if($programStage.captureCoordinates=='false') margin-left:10px; #end "
                        onkeypress="keypressOnComment( event, this );">
-				<input id="commentButton" type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( this )'>
+				<input id="commentButton" type="button" style='width:40px' value="$i18n.getString('add')" onclick='addComment( byId("commentInput"), $programStageInstance.id )'>
 			</th>
 		</tr>
 
@@ -49,7 +49,7 @@
 			<th class='coordinates1'><label for="filterDataSetSection">$i18n.getString( "filter_on_section" )</label></th>
 			<th colspan='3'>
 				<select id="filterDataSetSection" name="filterDataSetSection" onchange="filterOnSection()" style="width:430px;margin-left:10px;" >
-					<option value='all'>$i18n.getString("show_all_sections")</option>
+					<option value='all'>[$i18n.getString("show_all_sections")]</option>
 					#foreach( $section in $sections )
 						<option value='$section.id'>$encoder.htmlEncode( $section.displayName )</option>
 					#end