=== 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	2011-09-30 08:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-10-04 03:10:03 +0000
@@ -65,7 +65,7 @@
 date_of_birth 													= Date of Birth
 search_by_name_identifier 										= Search by Name or Identifier
 operation 														= Operation
-search_result_matching_the_search_criteria 						= Result Matching the search criteria:
+search_result_matching_the_search_criteria 						= Result matches the search criteria
 registering_unit 												= Registering Unit
 select 															= Select
 name_based_data_entry_and_reports 								= Name based data entry and reports
@@ -317,7 +317,7 @@
 view_patient_chart												= View Patient chart
 generate_patient_chart											= Generate patient chart
 patient_chart_management										= Patient Chart Management
-intro_registration_patient 										= Create, modify and search for Beneficiaries. Any type of data can be registered for a Beneficiary by including attributes.
+intro_patient_registration 										= Create, modify and search for Beneficiaries. Any type of data can be registered for a Beneficiary by including attributes.
 registration 													= Registration
 select_relationship 											= Select Relationship
 please_select_a_representative 									= Please select a representing relationship
@@ -354,12 +354,12 @@
 program_enrollment 												= Program Enrollment Management
 patient_details 												= Beneficiary Details
 enrolled_in_program 											= Enrolled in Programs
-update_patient 													= Update Beneficiary
+update_patient 													= Edit profile of beneficiary
 search_by_name_identifier 										= Search by Name or Identifier
-add_new_patient 												= Add New Beneficiary
+add_new_patient 												= Register new beneficiary
 patient_identifier 												= Beneficiary Identifier
 system_identifier 												= System Generated Identifier
-registration_patient_management 								= Registration beneficiary management
+patient_registration_management 								= Beneficiary registration management
 patient_duplicate 												= Beneficiary duplicate
 edit_this_patient 												= Edit profile of this beneficiary
 check_duplicate 												= Check duplicate
@@ -414,13 +414,13 @@
 specfiy_birth_date_or_age 										= Specfiy birth date or age
 update_this_patient 											= Update this beneficiary
 search_patients_by_attributes 									= Search beneficiaries by attributes
-registration_patient 											= Registration Beneficiary
+patient_registration 											= Beneficiary Registration
 confirm_delete_patient 											= Are you sure you want to delete the Beneficiary?
 specify_date_of_birth 											= Please specify a date of birth
 please_enter_a_valid_birth_date 								= Please enter a valid date of birth
 specify_identifier 												= Please specify a valid Identifier.
 enter_a_valid_identifier 										= Please enter a valid Identifier
-relationship_management 										= Manage Relationship
+relationship_management 										= Relationship management
 save_success 													= Save successfully
 yes_and_attribute 												= Yes and Inherit Attribute
 identifiers														= Identifiers

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2011-10-04 03:10:03 +0000
@@ -2,7 +2,7 @@
 <h3>$i18n.getString( "dhis-web-caseentry" )</h3>
 
 <ul id="introList">
-	#introListImgItem( "patient.action" "registration_patient" "patient" )
+	#introListImgItem( "patient.action" "patient_registration" "patient" )
     #introListImgItem( "dataEntrySelect.action" "data_entry" "dataentry" )
 	#introListImgItem( "multipledataEntrySelect.action" "multiple_dataentry" "dataentry" )
     #introListImgItem( "reportSelect.action" "summary_report" "summaryreport" )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2011-10-04 03:10:03 +0000
@@ -1,7 +1,7 @@
 
 <table>
 	<tr>
-		<td>$i18n.getString( "search_result_matching_the_search_criteria" )</td>
+		<td>$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 		<td>$i18n.getString( $searchText )</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2011-10-04 03:10:03 +0000
@@ -1,7 +1,7 @@
 
 <h2>$i18n.getString( "registration" )&nbsp;</h2>
 <ul>
-	<li><a href="patient.action">$i18n.getString( "registration_patient" )</a></li>		
+	<li><a href="patient.action">$i18n.getString( "patient_registration" )</a></li>		
 </ul>
 
 <h2>$i18n.getString( "data_entry" )&nbsp;</h2>

=== 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	2011-09-27 07:13:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2011-10-04 03:10:03 +0000
@@ -2,7 +2,7 @@
 <table>
 	
 	<tr>
-		<td>$i18n.getString( "search_result_matching_the_search_criteria" )</td>
+		<td>$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 		<td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm	2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm	2011-10-04 03:10:03 +0000
@@ -2,7 +2,7 @@
 <a href="index.action"><h2>$i18n.getString( "registration" )&nbsp;</h2></a>
 
 <ul>
-	<li><a href="patient.action">$i18n.getString( "registration_patient" )</a></li>
+	<li><a href="patient.action">$i18n.getString( "patient_registration" )</a></li>
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2011-09-27 08:33:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2011-10-04 03:10:03 +0000
@@ -1,6 +1,6 @@
 <div id='selectDiv'>
 	
-	<h3>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
+	<h3>$i18n.getString( "patient_registration_management" ) #openHelp( "patient" )</h3>
 	
 	<input type="hidden" id="isShowPatientList" name="isShowPatientList" />
 	<table>