=== 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	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-07-18 04:15:49 +0000
@@ -287,7 +287,7 @@
 please_fill_out_only_one_of_these_fields = Please fill out at only one of these fields.
 age_year = Age(year)
 create = Create
-migration_patient = Migration person
+change_patient_location = Change person location
 enroll_for = Enroll for
 identifier_and_attribute = Identifier/Attribute
 unenrollment = Un-enrollment
@@ -386,4 +386,5 @@
 value_is_invalid = Value is invalid
 value_is_valid = Value is valid
 incomplete_confirm_message=Are you sure this event is incompleted ?
-incomplete = Incomplete
\ No newline at end of file
+incomplete = Incomplete
+remove_empty_events_success = Remove empty events successfully
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2012-07-18 04:15:49 +0000
@@ -1,9 +1,9 @@
 <script>
-	jQuery('#addRelationshipPatientForm').ready(	function(){
+	jQuery('#patientForm').ready(	function(){
 
 		checkedDuplicate = false;
 		
-		jQuery("#addRelationshipPatientForm").validate({
+		jQuery("#patientForm").validate({
 			 meta:"validate"
 			,errorElement:"span"
 			,submitHandler: function(form)
@@ -12,24 +12,24 @@
 				}
 			,beforeValidateHandler: function(form)
 				{
-					var birthDate = $('#addRelationshipPatientForm [id=birthDate]').val();
-					var age = $('#addRelationshipPatientForm [id=age]').val();
+					var birthDate = $('#patientForm [id=birthDate]').val();
+					var age = $('#patientForm [id=age]').val();
 					if(age !=''){
-						$( "#addRelationshipPatientForm [id=memberValidator]").val(age);
+						$( "#patientForm [id=memberValidator]").val(age);
 					}else{
-						$( "#addRelationshipPatientForm [id=memberValidator]").val(birthDate);
+						$( "#patientForm [id=memberValidator]").val(birthDate);
 					}
 				}
 		});
 		
-		hideById('addRelationshipPatientForm [id=underAgeDiv]');
-		addEventForPatientForm('addRelationshipPatientForm');
+		hideById('patientForm [id=underAgeDiv]');
+		addEventForPatientForm('patientForm');
 	});		
 </script>
 
 <h4>$i18n.getString("add_new_relationship_for"):  $patient.getFullName()</h4>
 																		
-<form id="addRelationshipPatientForm" action="addRelationshipPatient.action" method="get" >
+<form id="patientForm" action="addRelationshipPatient.action" method="get" >
 <input type="hidden" id="relationshipId"  name="relationshipId" value="$patient.id"/> 
 <table>	
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-07-18 04:15:49 +0000
@@ -151,7 +151,7 @@
 	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
 	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
 	var i18n_no_compulsary_data_elements = '$encoder.jsEscape( $i18n.getString( "no_compulsary_data_elements" ) , "'")';
-	var i18n_remove_success = '$encoder.jsEscape( $i18n.getString( "remove_success" ) , "'")';
+	var i18n_remove_empty_events_success = '$encoder.jsEscape( $i18n.getString( "remove_empty_events_success" ) , "'")';
 	
 	isAjax = true;
 	contentDiv = '';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-07-12 10:23:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js	2012-07-18 04:15:49 +0000
@@ -358,7 +358,7 @@
 		{   
 			if(json.response=='success')
 			{
-				showSuccessMessage( i18n_remove_success );
+				showSuccessMessage( i18n_remove_empty_events_success );
 				validateSearchEvents( true )
 			}
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2012-07-18 04:15:49 +0000
@@ -1,4 +1,4 @@
-<h4>$i18n.getString( "migration_patient" )</h4>
+<h4>$i18n.getString( "change_patient_location" )</h4>
 
 <form method='post'>
 	<table>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-07-18 03:52:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2012-07-18 04:15:49 +0000
@@ -98,7 +98,7 @@
 				  <a href="javascript:showProgramEnrollmentSelectForm( '$patient.id' )" title='$i18n.getString( "program_enrollment_management" )'><img src="../images/enroll.png" alt='$i18n.getString( "program_enrollment" )'></a> 
 				  <a href="javascript:showUpdatePatientForm( '$patient.id' )" title='$i18n.getString( "edit_profile" )'><img src="../images/edit.png" alt='$i18n.getString( "edit_profile" )'></a>
 				  <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList('$patient.id')" title='$i18n.getString( "manage_relationship" )'><img src="../images/relationship.png" alt='$i18n.getString( "manage_relationship" )'></a>
-                  <a href="javascript:getPatientLocation( '$patient.id' ); " title='$i18n.getString( "migration_patient" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "migration_patient" )' style='width:25px; height:25px'></a><a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )' )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
+                  <a href="javascript:getPatientLocation( '$patient.id' ); " title='$i18n.getString( "change_patient_location" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "change_patient_location" )' style='width:25px; height:25px'></a><a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )' )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
 				  <a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )' )" title='$i18n.getString( "remove" )'></a>
 				  <a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
 				</td>