=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java	2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java	2013-02-13 15:58:32 +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.patientIdentifierTypeStore = patientIdentifierTypeStore;
     }
 
+    private I18nService i18nService;
+
+    public void setI18nService( I18nService service )
+    {
+        i18nService = service;
+    }
+
     // -------------------------------------------------------------------------
     // Implementation methods
     // -------------------------------------------------------------------------
@@ -60,12 +70,12 @@
 
     public Collection<PatientIdentifierType> getAllPatientIdentifierTypes()
     {
-        return patientIdentifierTypeStore.getAll();
+        return i18n( i18nService, patientIdentifierTypeStore.getAll() );
     }
 
     public PatientIdentifierType getPatientIdentifierType( int id )
     {
-        return patientIdentifierTypeStore.get( id );
+        return i18n( i18nService, patientIdentifierTypeStore.get( id ) );
     }
 
     public int savePatientIdentifierType( PatientIdentifierType patientIdentifierType )
@@ -80,17 +90,17 @@
 
     public PatientIdentifierType getPatientIdentifierType( String name )
     {
-        return patientIdentifierTypeStore.getByName( name );
+        return i18n( i18nService, patientIdentifierTypeStore.getByName( name ) );
     }
 
     public Collection<PatientIdentifierType> getPatientIdentifierTypes( boolean mandatory )
     {
-        return patientIdentifierTypeStore.get( mandatory );
+        return i18n( i18nService, patientIdentifierTypeStore.get( mandatory ) );
     }
-    
+
     public Collection<PatientIdentifierType> getDisplayedPatientIdentifierTypes( boolean personDisplayName )
     {
-        return patientIdentifierTypeStore.get( personDisplayName );
+        return i18n( i18nService, patientIdentifierTypeStore.get( personDisplayName ) );
     }
 
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-02-13 15:16:11 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-02-13 15:58:32 +0000
@@ -1244,7 +1244,6 @@
             sql += "FROM  programstageinstance psi JOIN patientdatavalue pdv ";
             sql += "    on psi.programstageinstanceid = pdv.programstageinstanceid ";
             sql += "WHERE ";
-            sql += "    psi.organisationunitid in ( " + TextUtils.getCommaDelimitedString( orgunitIds ) + " ) AND ";
             sql += "    psi.programstageid=" + programStage.getId() + " ";
             if ( useCompletedEvents )
             {

=== 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-02-08 13:07:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-02-13 15:58:32 +0000
@@ -266,6 +266,7 @@
 		class="org.hisp.dhis.patient.DefaultPatientIdentifierTypeService">
 		<property name="patientIdentifierTypeStore"
 			ref="org.hisp.dhis.patient.PatientIdentifierTypeStore" />
+		<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
 	</bean>
 
 	<bean id="org.hisp.dhis.patient.PatientAttributeService" class="org.hisp.dhis.patient.DefaultPatientAttributeService">

=== 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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm	2013-02-13 15:58:32 +0000
@@ -33,7 +33,7 @@
 	#foreach( $patientIdentifier in $partner.identifiers )
 	<tr>
 		<td>
-				#if($!patientIdentifier.identifierType)  $!patientIdentifier.identifierType.name
+				#if($!patientIdentifier.identifierType)  $!patientIdentifier.identifierType.displayName
 				#else $i18n.getString( "patient_system_id") #end 
 		</td>
 		<td>: $patientIdentifier.identifier</td>

=== 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	2013-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm	2013-02-13 15:58:32 +0000
@@ -1,7 +1,7 @@
 
 #foreach ($identifierType in $program.patientIdentifierTypes) 
 	<tr>
-		<td class='text-column'><label>$identifierType.name #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
+		<td class='text-column'><label>$identifierType.displayName #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
 		<td class="input-column">
 			<input type="text" id="iden$identifierType.id" name="iden$identifierType.id" class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" />
 		</td>

=== 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	2013-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm	2013-02-13 15:58:32 +0000
@@ -34,7 +34,7 @@
   #foreach( ${identifierType} in $!{identifierTypes} )
   {
 	"id": "iden_${identifierType.id}",
-	"name": "$!encoder.jsonEncode( ${identifierType.name} )"
+	"name": "$!encoder.jsonEncode( ${identifierType.displayName} )"
   },
   #end
   #set( $size = $!{patientAttributes.size()} )

=== 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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-02-13 15:58:32 +0000
@@ -42,7 +42,7 @@
 		#foreach( ${identifier} in $!{identifiers} )
 			{
 				"id": "iden_${identifier.id}",
-				"name": "${identifier.name}"
+				"name": "${identifier.displayName}"
 			},
 		#end
 		#set( $size = ${tabularReport.attributes.size()} )

=== 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	2012-12-18 06:17:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2013-02-13 15:58:32 +0000
@@ -41,7 +41,7 @@
 	  <tr>
 		<th>#</th>
 		#foreach( $identifierType in $identifierTypes)
-			<th>$encoder.htmlEncode($identifierType.name)</th>
+			<th>$encoder.htmlEncode($identifierType.displayName)</th>
 		#end
 		#if( $identifierTypes.size()==0 )
 			<th>$i18n.getString( "full_name" )</th>          

=== 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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-02-13 15:58:32 +0000
@@ -55,7 +55,7 @@
 				#foreach( $identifier in $identifiers )
 				<tr>
 					#if($!identifier.identifierType)
-						<td>$identifier.identifierType.name</td>
+						<td>$identifier.identifierType.displayName</td>
 					#else
 						<td>$i18n.getString("system_identifier")</td>
 					#end

=== 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-02-08 12:46:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-02-13 15:58:32 +0000
@@ -130,7 +130,7 @@
 				#set( $identifier = '' )
 				#set( $identifier = $identiferMap.get( $identifierType.id ) )
 				<tr> 
-					<td class='text-column'><label>$encoder.htmlEncode($identifierType.name) #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
+					<td class='text-column'><label>$encoder.htmlEncode($identifierType.displayName) #if($identifierType.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 					<td class="input-column"><input type="text" id="iden$identifierType.id" name="iden$identifierType.id" value="$!identifier" data="{related:$identifierType.related}" #if($identifierType.related && $!patient.underAge) disabled="disabled" #end class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" /></td>	
 				</tr>
 			#end

=== 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	2013-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-02-13 15:58:32 +0000
@@ -54,7 +54,7 @@
 				#end
 				
 				#foreach( $identifierType in $identifierTypes)
-					<th>$encoder.htmlEncode($identifierType.name)</th>
+					<th>$encoder.htmlEncode($identifierType.displayName)</th>
 				#end
 				#if( $identifierTypes.size()==0 )
 					<th>$i18n.getString( "full_name" )</th>          

=== 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	2013-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2013-02-13 15:58:32 +0000
@@ -61,7 +61,7 @@
 						#set( $identifier = '')
 						#set( $identifier = $identiferMap.get( $identifierType.id ) )
 						<tr #alternate( $mark )>
-							<td class='text-column'><label>$identifierType.name #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
+							<td class='text-column'><label>$identifierType.displayName #if($identifierType.mandatory == true )<em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>       
 							<td class="input-column">
 								<input type="text" id="iden$identifierType.id" name="iden$identifierType.id" value='$!identifier' class="{validate:{required:$identifierType.mandatory, #if($!identifierType.noChars) maxlength:$identifierType.noChars, #end #if($identifierType.type=='number') number:true #elseif($!identifierType.type=='letter') lettersonly:true #end }}" />
 							</td>

=== 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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-02-13 15:58:32 +0000
@@ -11,7 +11,7 @@
   	#if( $identifier.identifierType )
 	    <identifier>
 	    	<id>$identifier.identifierType.id</id>
-	        <name>$encoder.xmlEncode( $identifier.identifierType.name )</name>
+	        <name>$encoder.xmlEncode( $identifier.identifierType.displayName )</name>
 	        <value>$encoder.xmlEncode( $identifier.identifier )</value>
 	    </identifier>
     #else

=== 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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm	2013-02-13 15:58:32 +0000
@@ -4,7 +4,7 @@
 	#foreach( $identifierType in $identifierTypes )
 	  {
 		"id":  ${identifierType.id} ,
-		"name": "$!encoder.jsonEncode( ${identifierType.name} )"
+		"name": "$!encoder.jsonEncode( ${identifierType.displayName} )"
 	  }#if( $velocityCount < $size ),#end
 	#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-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-02-13 15:58:32 +0000
@@ -12,7 +12,7 @@
   	#if( $identifier.identifierType )
 	    <identifier>
 	    	<id>$identifier.identifierType.id</id>
-	        <name>$!encoder.xmlEncode( $identifier.identifierType.name )</name>
+	        <name>$!encoder.xmlEncode( $identifier.identifierType.displayName )</name>
 	        <value>$!encoder.xmlEncode( $identifier.identifier )</value>
 	    </identifier>
     #else

=== 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	2013-01-28 05:28:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2013-02-13 15:58:32 +0000
@@ -87,7 +87,7 @@
 						<select name="identifierTypeId" id="identifierTypeId" style='width:18em' >
 							<option value="">[$i18n.getString( "please_select" )]</option>       
 							#foreach($identifierType in $identifierTypes)
-								<option value="$identifierType.id">$identifierType.name</option>
+								<option value="$identifierType.id">$identifierType.displayName</option>
 							#end
 						</select>
 					</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2013-02-13 15:58:32 +0000
@@ -111,7 +111,7 @@
 		</tr>
 		#foreach( $patientIdentifier in $representative.identifiers )
 		  <tr>  
-			<td class="bold text-column">#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.name: #else $i18n.getString("system_identifier"): #end</td>      
+			<td class="bold text-column">#if( $patientIdentifier.identifierType )$patientIdentifier.identifierType.displayName: #else $i18n.getString("system_identifier"): #end</td>      
 			  <td> $!patientIdentifier.identifier </td>
 		   </tr>
 		#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-01-28 09:09:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-02-13 15:58:32 +0000
@@ -110,10 +110,10 @@
 		<td>
 			<select style="width:100%;" size="15" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();">
 				#foreach( $identifier in $availableIdentifierTypes )
-					<option value="iden_$identifier.id">$identifier.name</option>
+					<option value="iden_$identifier.id">$identifier.displayName</option>
 				#end
 				#foreach( $attribute in $availableAttributes )
-					<option value="attr_$attribute.id">$attribute.name</option>
+					<option value="attr_$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/listPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2012-10-22 04:00:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2013-02-13 15:58:32 +0000
@@ -7,9 +7,7 @@
     
       <table class="listTable">
           <col>          
-          <col width="20">
-          <col width="20">     
-          <col width="20">
+          <col width="120">
 		  <tr>
 		  	<td></td>
 			<td colspan="4" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddPatientIdentifierTypeForm.action'" style="width:70px"></td>
@@ -23,17 +21,12 @@
             #foreach( $identifierType in $identifierTypes )
               <tr id="tr${identifierType.id}">
               
-                <td onclick="showPatientIdentifierTypeDetails( $identifierType.id )">$encoder.htmlEncode( $identifierType.name )</td>                
+                <td onclick="showPatientIdentifierTypeDetails( $identifierType.id )">$encoder.htmlEncode( $identifierType.displayName )</td>                
                 
                 <td style="text-align:center"#alternate( $mark )>
                   <a href="showUpdatePatientIdentifierTypeForm.action?id=$identifierType.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-                </td>
- 
-                <td style="text-align:center"#alternate( $mark )>
-                  <a href="javascript:removePatientIdentifierType( '$identifierType.id', '$encoder.jsEncode( $identifierType.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
-                </td>            
-                
-                <td style="text-align:center"#alternate( $mark )>
+                  <a href="javascript:translate( 'PatientIdentifierType', '$identifierType.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+				  <a href="javascript:removePatientIdentifierType( '$identifierType.id', '$encoder.jsEncode( $identifierType.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
                   <a href="javascript:showPatientIdentifierTypeDetails( $identifierType.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
                 </td>
                 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2013-02-13 15:58:32 +0000
@@ -22,7 +22,8 @@
 							
 							<td style="text-align:center"#alternate( $mark )>
 							  <a href="showUpdateProgramStageForm.action?id=$association.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
-							  <a href="javascript:translate( 'ProgramStage', '$association.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>#if( $program.type=='1' )
+							  <a href="javascript:translate( 'ProgramStage', '$association.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+							  #if( $program.type=='1' )
 								<a href="javascript:removeItem( '$association.id', '$encoder.jsEncode( $association.name )', i18n_confirm_delete , 'removeProgramStage.action' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 							  #end
 							  <a href="javascript:showProgramStageDetails( $association.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-01-28 09:09:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-02-13 15:58:32 +0000
@@ -118,10 +118,10 @@
 			<td>
 				<select size="15" style="width:100%;" multiple id="availablePropertyIds" name="availablePropertyIds" ondblclick="selectProperties();" #if( $program.type=='3' ) disabled #end>
 					#foreach( $identifier in $availableIdentifierTypes )
-						<option value="iden_$identifier.id">$identifier.name</option>
+						<option value="iden_$identifier.id">$identifier.displayName</option>
 					#end
 					#foreach( $attribute in $availableAttributes )
-						<option value="attr_$attribute.id">$attribute.name</option>
+						<option value="attr_$attribute.id">$attribute.displayName</option>
 					#end
 				</select>
 			</td>