=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2011-07-25 06:49:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2011-09-01 04:50:41 +0000
@@ -6,7 +6,7 @@
     <tr>            
         <td>
             <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
-            <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
+            <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
             <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
             <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
         </td>

=== 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-08-31 07:51:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2011-09-01 04:50:41 +0000
@@ -48,7 +48,7 @@
 					$encoder.htmlEncode( $patient.getFullName() )
 				</td>			
 				<td>			
-					$encoder.htmlEncode( $patient.gender )
+					$i18n.getString( $patient.gender )
 				</td>
 				<td>			
 					$format.formatDate( $patient.birthDate )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm	2011-05-12 07:02:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/loadVisitPlan.vm	2011-09-01 04:50:41 +0000
@@ -4,7 +4,7 @@
         <tr>            
             <td>
                 <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
-                <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
+                <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
                 <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
                 <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
             </td>   

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-07-25 06:49:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-09-01 04:50:41 +0000
@@ -8,7 +8,7 @@
     <tr>            
         <td>
             <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
-            <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
+            <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
             <strong>$i18n.getString( "date_of_birth" ):</strong>
 			$format.formatDate( $patient.birthDate )<br>
             <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-07-27 04:18:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-09-01 04:50:41 +0000
@@ -10,7 +10,7 @@
 	</tr>
 	<tr>
 	    <td><strong>$i18n.getString( "gender" ):</strong></td>
-	    <td>$encoder.htmlEncode( $patient.gender )</td>
+	    <td>$i18n.getString( $patient.gender )</td>
 	</tr>    
 	<tr>
 	    <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2011-03-24 17:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2011-09-01 04:50:41 +0000
@@ -2,7 +2,7 @@
 <patient>
   <id>$patient.id</id>  
   <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
-  <gender>$encoder.xmlEncode( $patient.gender )</gender>
+  <gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dobType>#if($!patient.dobType)$!patient.dobType#else $i18n.getString('none') #end</dobType>
   <dateOfBirth>$format.formatDate( $!patient.birthDate )</dateOfBirth>
   <age>$encoder.xmlEncode( $patient.getAge() )</age>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2010-07-06 09:34:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2011-09-01 04:50:41 +0000
@@ -2,7 +2,7 @@
 <patient>
   <id>$patient.id</id>  
   <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
-  <gender>$encoder.xmlEncode( $patient.gender )</gender>
+  <gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$encoder.xmlEncode( $patient.getAge() )</age>
   <bloodGroup>$encoder.xmlEncode( $patient.getBloodGroup() )</bloodGroup>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm	2011-03-24 17:27:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm	2011-09-01 04:50:41 +0000
@@ -19,7 +19,7 @@
             $encoder.htmlEncode( $patient.lastName )
         </td>               
         <td>            
-            $encoder.htmlEncode( $patient.gender )
+            $i18n.getString($patient.gender )
         </td>
         <td>            
             $format.formatDate( $patient.birthDate )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-08-25 05:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-09-01 04:50:41 +0000
@@ -482,4 +482,6 @@
 specfiy_birth_date_or_age = Specfiy birth date or age
 update_this_patient = Update this beneficiary
 search_patients_by_attributes = Search beneficiaries by attributes
-delete_program_data_entry_confirm = Do you want to delete program data entry ? 
\ No newline at end of file
+delete_program_data_entry_confirm = Do you want to delete program data entry ? 
+F = F
+M = M
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPartner.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPartner.vm	2011-08-01 02:39:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPartner.vm	2011-09-01 04:50:41 +0000
@@ -13,7 +13,7 @@
 	<tr>
 		<td>
 			<label><strong>$i18n.getString( "gender" ) : </strong></label>
-				$partner.gender
+				$i18n.getString($partner.gender)
 		</td>
 	</tr>
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPatient.vm	2011-08-01 02:39:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/detailsPatient.vm	2011-09-01 04:50:41 +0000
@@ -17,7 +17,7 @@
 	</tr>
 	<tr>
 		<td><label><strong>$i18n.getString('gender') : </strong></label>
-			$patient.gender
+			$i18n.getString($patient.gender)
 		</td>
 	</tr>
 	<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-08-31 07:51:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-09-01 04:50:41 +0000
@@ -73,7 +73,7 @@
 					
 				<td>$!patient.getFullName()</td>
 				
-				<td>$!patient.gender</td>
+				<td>$i18n.getString($!patient.gender)</td>
 				
 				<td>$format.formatDate( $!patient.birthDate)</td>
 				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm	2011-07-20 06:34:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programEnrollmentSelectForm.vm	2011-09-01 04:50:41 +0000
@@ -16,7 +16,7 @@
 		</tr>
 		<tr>
 			<td><strong>$i18n.getString( "gender" ):</strong></td>
-			<td>$encoder.htmlEncode( $patient.gender )</td>
+			<td>$i18n.getString( $patient.gender )</td>
 		</tr>    
 		<tr>
 			<td><strong>$i18n.getString( "date_of_birth" ):</strong></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programUnenrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programUnenrollmentSelectForm.vm	2011-08-01 02:39:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programUnenrollmentSelectForm.vm	2011-09-01 04:50:41 +0000
@@ -35,7 +35,7 @@
     </tr>
     <tr>
         <td><strong>$i18n.getString( "gender" ):</strong></td>
-        <td>$encoder.htmlEncode( $patient.gender )</td>
+        <td>$i18n.getString( $patient.gender )</td>
     </tr>    
     <tr>
         <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm	2011-08-01 02:39:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipList.vm	2011-09-01 04:50:41 +0000
@@ -10,7 +10,7 @@
         <tr>              
             <td>
                 <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
-                <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
+                <strong>$i18n.getString( "gender" ):</strong>$i18n.getString( $patient.gender )<br>
                 <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
                 <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
             </td>               

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseDuplicate.vm	2010-03-03 11:02:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseDuplicate.vm	2011-09-01 04:50:41 +0000
@@ -4,7 +4,7 @@
 <patient>
   <id>$patient.id</id>  
   <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
-  <gender>$encoder.xmlEncode( $patient.gender )</gender>
+  <gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$encoder.xmlEncode( $patient.getAge() )</age>
   <bloodGroup>#if( $patient.bloodGroup ) $encoder.xmlEncode( $patient.bloodGroup ) #else N/A #end</bloodGroup>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatients.vm	2010-03-03 11:02:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePatients.vm	2011-09-01 04:50:41 +0000
@@ -4,7 +4,7 @@
 <patient>
   <id>$patient.id</id>  
   <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
-  <gender>$encoder.xmlEncode( $i18n.getString( $patient.textGender ))</gender>
+  <gender>$encoder.xmlEncode( $i18n.getString( $patient.gender ))</gender>
   <dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$encoder.xmlEncode( $patient.getAge() )</age>
   <bloodGroup>#if( $patient.bloodGroup ) $encoder.xmlEncode( $patient.bloodGroup ) #else N/A #end</bloodGroup>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm	2011-08-01 02:39:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm	2011-09-01 04:50:41 +0000
@@ -27,7 +27,7 @@
 				</td>
 				<td>$!patient.getFullName()</td>
 				<td>$!patient.getAge()</td>
-				<td>$!patient.gender</td>
+				<td>$i18n.getString( $!patient.gender )</td>
 				<td>$!patient.dobType</td>
 				<td>$format.formatDate($!patient.birthDate)</td>
 				<td>$!patient.organisationUnit.name</td>