=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2012-12-21 09:23:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2013-01-28 05:28:45 +0000
@@ -29,19 +29,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.Dxf2Namespace;
 
 /**
  * @author Abyot Asalefew
  * @version $Id$
  */
-@XmlRootElement( name = "patientAttribute", namespace = Dxf2Namespace.NAMESPACE )
-@XmlAccessorType( value = XmlAccessType.NONE )
+
 public class PatientAttribute
     extends BaseIdentifiableObject
 {

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java	2012-09-11 13:35:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java	2013-01-28 05:28:45 +0000
@@ -26,8 +26,11 @@
  */
 package org.hisp.dhis.patient;
 
+import static org.hisp.dhis.i18n.I18nUtils.i18n;
+
 import java.util.Collection;
 
+import org.hisp.dhis.i18n.I18nService;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -49,6 +52,13 @@
         this.patientAttributeStore = patientAttributeStore;
     }
 
+    private I18nService i18nService;
+
+    public void setI18nService( I18nService service )
+    {
+        i18nService = service;
+    }
+
     // -------------------------------------------------------------------------
     // Implementation methods
     // -------------------------------------------------------------------------
@@ -60,12 +70,12 @@
 
     public Collection<PatientAttribute> getAllPatientAttributes()
     {
-        return patientAttributeStore.getAll();
+        return i18n( i18nService, patientAttributeStore.getAll() );
     }
 
     public PatientAttribute getPatientAttribute( int id )
     {
-        return patientAttributeStore.get( id );
+        return i18n( i18nService, patientAttributeStore.get( id ) );
     }
 
     public int savePatientAttribute( PatientAttribute patientAttribute )
@@ -80,32 +90,32 @@
 
     public Collection<PatientAttribute> getPatientAttributesByValueType( String valueType )
     {
-        return patientAttributeStore.getByValueType( valueType );
+        return i18n( i18nService, patientAttributeStore.getByValueType( valueType ) );
     }
 
     public PatientAttribute getPatientAttributeByName( String name )
     {
-        return patientAttributeStore.getByName( name );
+        return i18n( i18nService, patientAttributeStore.getByName( name ) );
     }
-    
+
     public PatientAttribute getPatientAttributeByGroupBy( boolean groupBy )
     {
-        return patientAttributeStore.getByGroupBy( groupBy );
+        return i18n( i18nService, patientAttributeStore.getByGroupBy( groupBy ) );
     }
 
     public Collection<PatientAttribute> getOptionalPatientAttributesWithoutGroup()
     {
-        return patientAttributeStore.getOptionalPatientAttributesWithoutGroup();
+        return i18n( i18nService, patientAttributeStore.getOptionalPatientAttributesWithoutGroup() );
     }
 
     public Collection<PatientAttribute> getPatientAttributesByMandatory( boolean mandatory )
     {
-        return patientAttributeStore.getByMandatory( mandatory );
+        return i18n( i18nService, patientAttributeStore.getByMandatory( mandatory ) );
     }
-    
+
     public Collection<PatientAttribute> getPatientAttributesWithoutGroup()
     {
-        return patientAttributeStore.getWithoutGroup();
+        return i18n( i18nService, patientAttributeStore.getWithoutGroup() );
     }
 
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2013-01-28 05:28:45 +0000
@@ -110,7 +110,7 @@
             }
         }
 
-        return programs;
+        return i18n( i18nService, programs);
     }
 
     public Collection<Program> getPrograms( ValidationCriteria validationCriteria )
@@ -125,7 +125,7 @@
             }
         }
 
-        return programs;
+        return i18n( i18nService, programs);
     }
 
     public Collection<Program> getPrograms( int type )

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-01-24 03:09:30 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-01-28 05:28:45 +0000
@@ -269,6 +269,7 @@
 
 	<bean id="org.hisp.dhis.patient.PatientAttributeService" class="org.hisp.dhis.patient.DefaultPatientAttributeService">
 		<property name="patientAttributeStore" ref="org.hisp.dhis.patient.PatientAttributeStore" />
+		<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
 	</bean>
 
 	<bean

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2013-01-28 05:28:45 +0000
@@ -84,7 +84,7 @@
                     <select id="searchingAttributeId" name="searchingAttributeId" #if( $patientAttributes.size() == 0 ) disabled="disabled" #end style='width:119px'>
                         <option value="">$i18n.getString( "search_by_name_identifier" )</option>
                         #foreach( $attribute in $patientAttributes )
-                            <option value="$attribute.id" #if( $searchingAttributeId && $attribute.id == $searchingAttributeId ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
+                            <option value="$attribute.id" #if( $searchingAttributeId && $attribute.id == $searchingAttributeId ) selected="selected" #end>$encoder.htmlEncode( $attribute.displayName )</option>
                         #end
                     </select> 
                     <em title="$i18n.getString( 'required' )" class="required">*</em>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm	2013-01-28 05:28:45 +0000
@@ -48,7 +48,7 @@
 		#foreach( $attribute in $partner.attributes )
 			#if( $patientAttributeValueMap.get( $attribute.id ) != " " )
 			<tr>
-				<td>$attribute.name</td>
+				<td>$attribute.displayName</td>
 				<td>: $encoder.htmlEncode($patientAttributeValueMap.get( $attribute.id ))</td>
 			</tr>
 			#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm	2013-01-28 05:28:45 +0000
@@ -10,7 +10,7 @@
 				
 #foreach($attribute in $program.patientAttributes )
 	<tr>
-		<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+		<td class='text-column'><label>$attribute.displayName #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 		<td class="input-column" >
 			#if( $attribute.valueType == "YES/NO" )
 				<select id="attr$attribute.id" name="attr$attribute.id" >              

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm	2013-01-28 05:28:45 +0000
@@ -41,7 +41,7 @@
   #foreach( $patientAttribute in $!{patientAttributes} )
   {
     "id": "attr_${patientAttribute.id}",
-	"name": "$!encoder.jsonEncode( ${patientAttribute.name} )"
+	"name": "$!encoder.jsonEncode( ${patientAttribute.displayName} )"
   }#if( $velocityCount < $size ),#end
   #end
   ]

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-01-27 13:20:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-01-28 05:28:45 +0000
@@ -50,7 +50,7 @@
 		#foreach( ${attribute} in $!{attributes} )
 			{
 				"id": "attr_${attribute.id}",
-				"name": "${attribute.name}"
+				"name": "${attribute.displayName}"
 			}
 			#if( $velocityCount < $size ),#end
 		#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-01-28 05:28:45 +0000
@@ -70,7 +70,7 @@
 				#end
 				#foreach( $attributeValue in $attributeValues )
 				<tr>
-					<td>$attributeValue.patientAttribute.name</td>
+					<td>$attributeValue.patientAttribute.displayName</td>
 					<td>
 						#if($attributeValue.patientAttribute.valueType=='YES/NO')
 							#if($attributeValue.value=='true')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-01-24 12:46:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-01-28 05:28:45 +0000
@@ -145,7 +145,7 @@
 		#set($value = $patientAttributeValueMap.get($attribute.id))
 		#if( $attribute.valueType != 'CALCULATED')
 		<tr>
-			<td class='text-column'><label>$encoder.htmlEncode($attribute.name) #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
+			<td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($attribute.mandatory)<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
 			<td class="input-column">
 				#if( $attribute.valueType == "YES/NO" )
 					<select id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit"> 
@@ -187,7 +187,7 @@
 		#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 		#if( $attribute.valueType != 'CALCULATED')
 		<tr>
-			<td class='text-column'><label>$encoder.htmlEncode($attribute.name) #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+			<td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 			<td class="input-column">
 				#if( $attribute.valueType == "YES/NO" )
 					<select id="attr$attribute.id"  name="attr$attribute.id" inherit="$!attribute.inherit">              

=== 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-12-14 17:07:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-01-28 05:28:45 +0000
@@ -49,7 +49,7 @@
 				<th>#</th>
 				#foreach( $attribute in $patientAttributes )
 					#if($attribute)
-						<th id="patientAttributeName">$encoder.htmlEncode($attribute.name)</th>
+						<th id="patientAttributeName">$encoder.htmlEncode($attribute.displayName)</th>
 					#end
 				#end
 				

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-12-21 13:42:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2013-01-28 05:28:45 +0000
@@ -73,7 +73,7 @@
 					#foreach($attribute in $patientAttributes )
 						#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 						<tr #alternate( $mark )>
-							<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+							<td class='text-column'><label>$attribute.displayName #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 							<td class="input-column" >
 								#if( $attribute.valueType == "YES/NO" )
 									<select id="attr$attribute.id" name="attr$attribute.id" >              

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-01-28 05:28:45 +0000
@@ -24,7 +24,7 @@
     #set( $key = $patient.id + "_" + $attribute.id )
     #set( $attributeValue = $patientAttributeValueMap.get( $key ) )             
     <attribute>
-        <name>$encoder.xmlEncode( $attribute.name )</name>
+        <name>$encoder.xmlEncode( $attribute.displayName )</name>
         <value>$encoder.xmlEncode( $attributeValue )</value>
     </attribute> 
   #end  

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm	2013-01-28 05:28:45 +0000
@@ -13,7 +13,7 @@
 	#foreach( $attribute in $attributes )
 	  {
 		"id":  ${attribute.id} ,
-		"name": "$!encoder.jsonEncode( ${attribute.name} )"
+		"name": "$!encoder.jsonEncode( ${attribute.displayName} )"
 	  }#if( $velocityCount < $size ),#end
 	#end],
 	

=== 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	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2013-01-28 05:28:45 +0000
@@ -16,7 +16,7 @@
     #set( $attributeValue = false )
     #set( $attributeValue = $patientAttributeValueMap.get( $attribute.id ) )             
     <attribute>
-        <name>$!encoder.xmlEncode( $attribute.name )</name>
+        <name>$!encoder.xmlEncode( $attribute.displayName )</name>
         <value>$!encoder.xmlEncode( $attributeValue )</value>
     </attribute> 
   #end  

=== 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	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2013-01-28 05:28:45 +0000
@@ -15,7 +15,7 @@
     #set( $attributeValue = false )
     #set( $attributeValue = $patientAttributeValueMap.get( $attribute.id ) )             
     <attribute>
-        <name>$!encoder.xmlEncode( $attribute.name )</name>
+        <name>$!encoder.xmlEncode( $attribute.displayName )</name>
         <value>$!encoder.xmlEncode( $attributeValue )</value>
     </attribute> 
   #end  

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-01-28 05:28:45 +0000
@@ -25,7 +25,7 @@
     #set( $key = $patient.id + "_" + $attribute.id )
     #set( $attributeValue = $patientAttributeValueMap.get( $key ) )             
     <attribute>
-        <name>$!encoder.xmlEncode( $attribute.name )</name>
+        <name>$!encoder.xmlEncode( $attribute.displayName )</name>
         <value>$!encoder.xmlEncode( $attributeValue )</value>
     </attribute> 
   #end  

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-01-28 05:28:45 +0000
@@ -1,5 +1,4 @@
 <input type='hidden' id='searchByProgramStage' name='searchByProgramStage' value="false">
-<input type='hidden' id='searchByProgramStage' name='searchByProgramStage' value="false">
 <input type='hidden' id='orgunitId' name='orgunitId' value='$organisationUnit.id' >
 <input type="hidden" id='hideLink' name='hideLink' value='false'>
 <input type='hidden' id='isSearchByProgram' name='isSearchByProgram' value='false' >
@@ -71,7 +70,7 @@
 				<option value="fixedAttr_gender">$i18n.getString( "gender" )</option>
 				<option value="fixedAttr_phoneNumber">$i18n.getString( "phone_number" )</option>
 				#foreach( $attribute in $patientAttributes )
-					<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.name )</option>
+					<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.displayName )</option>
 				#end
 			  </select>
 			  <em title="$i18n.getString( 'required' )" class="required">*</em></label>
@@ -101,7 +100,7 @@
 					<option value="fixedAttr_gender">$i18n.getString( "gender" )</option>
 					<option value="fixedAttr_phoneNumber">$i18n.getString( "phone_number" )</option>
 					#foreach( $attribute in $patientAttributes )
-						<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.name )</option>
+						<option value="attr_$attribute.id" valueType='$attribute.valueType'>$encoder.htmlEncode( $attribute.displayName )</option>
 					#end
 				  </select>
 				  <em title="$i18n.getString( 'required' )" class="required">*</em></label>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2013-01-28 05:28:45 +0000
@@ -99,7 +99,7 @@
 						<select name="attributeId" id="attributeId" style='width:18em'>
 							<option value="">[$i18n.getString( "please_select" )]</option>       
 							#foreach($attribute in $attributes)
-								<option value="$attribute.id">$attribute.name</option>
+								<option value="$attribute.id">$attribute.displayName</option>
 							#end
 						</select>
 					</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2012-12-21 09:23:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2013-01-28 05:28:45 +0000
@@ -15,9 +15,7 @@
 			
 		<table class="listTable">
 			<col>          
-			<col width="20">
-			<col width="20">
-			<col width="20">          		  
+			<col width="120">          		  
 			<thead>
 			  <tr>
 				<th>$i18n.getString( "name" )</th>
@@ -28,17 +26,12 @@
             #foreach( $patientAttribute in $patientAttributes )
               <tr id="tr${patientAttribute.id}">
               
-                <td onclick="showPatientAttributeDetails( $patientAttribute.id )">$encoder.htmlEncode( $patientAttribute.name )</td>                
+                <td onclick="showPatientAttributeDetails( $patientAttribute.id )">$encoder.htmlEncode( $patientAttribute.displayName )</td>                
                 
                 <td style="text-align:center">
                   <a href="showUpdatePatientAttributeForm.action?id=$patientAttribute.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-                </td>                
- 
-                <td style="text-align:center">
-                  <a href="javascript:removePatientAttribute( '$patientAttribute.id', '$encoder.jsEncode( $patientAttribute.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
-                </td>            
-                
-                <td style="text-align:center">
+					<a href="javascript:translate( 'PatientAttribute', '$patientAttribute.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+					<a href="javascript:removePatientAttribute( '$patientAttribute.id', '$encoder.jsEncode( $patientAttribute.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
                   <a href="javascript:showPatientAttributeDetails( $patientAttribute.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
                 </td>