=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-07-26 03:52:08 +0000
@@ -567,6 +567,15 @@
         executeSql( "DELETE FROM userroleauthorities WHERE authority='F_VALIDATIONCRITERIA_UPDATE'" );
         executeSql( "DELETE FROM userroleauthorities WHERE authority='F_OPTIONSET_UPDATE'" );
         executeSql( "DELETE FROM userroleauthorities WHERE authority='F_ATTRIBUTE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PATIENTATTRIBUTE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PATIENT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_UPDATE_PROGRAM_INDICATOR'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PROGRAM_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PROGRAMSTAGE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PROGRAMSTAGE_SECTION_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PATIENTIDENTIFIERTYPE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PROGRAM_ATTRIBUTE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_PATIENT_DATAVALUE_UPDATE'" );
 
         // update denominator of indicator which has indicatortype as 'number'
         executeSql( "UPDATE indicator SET denominator = 1, denominatordescription = '' WHERE indicatortypeid IN (SELECT DISTINCT indicatortypeid FROM indicatortype WHERE indicatornumber = true) AND denominator IS NULL" );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-07-05 09:21:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-07-26 03:52:08 +0000
@@ -152,7 +152,7 @@
     }
 
     @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = { "application/xml", "text/xml" } )
-    @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_UPDATE')" )
+    @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
     public void putXmlEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid ) throws IOException
     {
         Event event = eventService.getEvent( uid );
@@ -171,7 +171,7 @@
     }
 
     @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = "application/json" )
-    @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_UPDATE')" )
+    @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
     public void putJsonEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid ) throws IOException
     {
         Event event = eventService.getEvent( uid );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-07-26 03:52:08 +0000
@@ -57,7 +57,7 @@
       <result name="success" type="velocity">/content.vm</result>
       <param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
       <param name="stylesheets">style/style.css</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="loadProgramStageInstances"
@@ -76,14 +76,14 @@
       <result name="success" type="velocity">/content.vm</result>
       <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
       <param name="stylesheets">style/style.css</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="completeDataEntry"
       class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="programcompleted" type="velocity-json">/dhis-web-caseentry/jsonResponseProgramCompleted.vm</result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="uncompleteDataEntry"
@@ -91,7 +91,7 @@
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveExecutionDate"
@@ -103,13 +103,13 @@
         /dhis-web-commons/ajax/jsonResponseInput.vm
       </result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="registerIrregularEncounter"
       class="org.hisp.dhis.caseentry.action.caseentry.RegisterIrregularEncounterAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="cacheManifest" class="org.hisp.dhis.commons.action.NoAction">
@@ -150,7 +150,7 @@
       <result name="input" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseInput.vm
       </result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="loadAnonymousPrograms"
@@ -238,7 +238,7 @@
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 	
 	<action name="saveProgramInstanceComment"
@@ -246,7 +246,7 @@
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <!-- save value -->
@@ -258,14 +258,14 @@
         /dhis-web-caseentry/responseInput.vm
       </result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
     
      <action name="saveCoordinatesEvent"
       class="org.hisp.dhis.caseentry.action.caseentry.SaveCoordinatesEventAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <!-- save providing-facility -->
@@ -275,7 +275,7 @@
       <result name="success" type="velocity">status.vm</result>
       <result name="input" type="velocity">status.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <!-- Multi DataEntry -->
@@ -328,7 +328,7 @@
       <result name="success" type="velocity">/content.vm</result>
       <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
       <param name="javascripts">../dhis-web-commons/javascripts/date.js</param>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="completeProgramStageDataEntry"
@@ -336,7 +336,7 @@
       <result name="success" type="redirect">
         getDataRecords.action?programId=${programId}
       </result>
-      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <!-- Single-event DataEntry -->
@@ -369,13 +369,13 @@
       <result name="success" type="velocity">/content.vm</result>
       <param name="page">/dhis-web-caseentry/addSingleEventRegistration.vm</param>
       <param name="stylesheets">style/style.css</param>
-      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveValues"
       class="org.hisp.dhis.caseentry.action.caseentry.SaveValuesAction">
       <result name="success" type="velocity-xml">status.vm</result>
-      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD,F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <!-- Report -->
@@ -541,7 +541,7 @@
       <param name="javascripts">
       	../dhis-web-commons/javascripts/jQuery/jquery-barcode.min.js
       </param>
-      <param name="requiredAuthorities">F_PATIENT_UPDATE</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
     </action>
 
     <action name="updatePatient"
@@ -549,7 +549,7 @@
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
-      <param name="requiredAuthorities">F_PATIENT_UPDATE</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
     </action>
 
     <action name="validatePatient"
@@ -685,7 +685,7 @@
     <action name="savePatientIdentifierAndAttribute"
       class="org.hisp.dhis.caseentry.action.patient.SaveIdentifierAndAttributeAction">
       <result name="success" type="velocity-xml">status.vm</result>
-      <param name="requiredAuthorities">F_PATIENT_UPDATE, F_PROGRAM_ENROLLMENT</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD, F_PROGRAM_ENROLLMENT</param>
     </action>
 
     <action name="setProgramInstanceStatus"
@@ -698,7 +698,7 @@
       class="org.hisp.dhis.caseentry.action.patient.GetProgramAction">
       <result name="success" type="velocity">/content.vm</result>
       <param name="page">/dhis-web-caseentry/identifierAndAttributeForm.vm</param>
-      <param name="requiredAuthorities">F_PATIENT_UPDATE</param>
+      <param name="requiredAuthorities">F_PATIENT_ADD</param>
     </action>
 
     <action name="getVisitSchedule"

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2013-07-26 03:52:08 +0000
@@ -135,20 +135,20 @@
         class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="showCompletedProgramStageForm"
         class="org.hisp.dhis.light.namebaseddataentry.action.GetProgramStageFormAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/namebased/completedProgramStageForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
     
     <action name="markCompleteProgramStageHasSection"
         class="org.hisp.dhis.light.namebaseddataentry.action.MarkCompleteProgramStageAction">
       <result name="success" type="redirect">showPatientProgramList.action?patientId=${patientId}</result>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveProgramStageForm"
@@ -167,7 +167,7 @@
       </result>
       <result name="error" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/namebased/programStageForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="showBeneficiaryDetail"
@@ -260,7 +260,7 @@
         class="org.hisp.dhis.light.namebaseddataentry.action.SaveRepeatableEventAction">
       <result name="success" type="redirect">showPatientProgramStageList.action?patientId=${patientId}&amp;programInstanceId=${programInstanceId}&amp;programId=${programId}&amp;validated=false
       </result>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 	  
 	  <action name="showPatientLocationForm"
@@ -363,7 +363,7 @@
 	class="org.hisp.dhis.light.singleevent.action.GetSingleEventFormAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveSingleEvent"
@@ -374,7 +374,7 @@
       <result name="error" type="velocity">/dhis-web-light/main.vm</result>
       <result name="redirect" type="redirect">findSingleEventOptionSet.action?keyword=${keyword}&amp;dataElementIdForSearching=${dataElementIdForSearching}&amp;organisationUnitId=${organisationUnitId}&amp;patientId=${patientId}&amp;programId=${programId}&amp;programStageInstanceId=${programStageInstanceId}&amp;isEditing=${isEditing}</result>
       <param name="page">/dhis-web-light/singleevent/singleEventForm.vm</param>
-	   <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	   <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
     
     <action name="findSingleEventOptionSet"
@@ -520,7 +520,7 @@
         class="org.hisp.dhis.light.anonymous.action.ShowAnonymousFormAction">
       <result name="success" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveAnonymousForm"
@@ -528,7 +528,7 @@
       <result name="success" type="redirect">/light/anonymous.action?validated=true&amp;orgUnitId=${orgUnitId}</result>
       <result name="error" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/anonymous/anonymousProgramForm.vm</param>
-	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_UPDATE,F_PATIENT_DATAVALUE_DELETE</param>
+	  <param name="requiredAuthorities">F_PATIENT_DATAVALUE_ADD,F_PATIENT_DATAVALUE_DELETE</param>
     </action>
     
     

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-07-26 03:52:08 +0000
@@ -62,14 +62,14 @@
 			<param name="page">/dhis-web-maintenance-patient/updateRelationshipTypeForm.vm</param>
 			<param name="javascripts">javascript/relationship.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="updateRelationshipType"
 			class="org.hisp.dhis.patient.action.relationship.UpdateRelationshipTypeAction">
 			<result name="success" type="redirect">relationshipType.action
 			</result>
-			<param name="requiredAuthorities">F_RELATIONSHIPTYPE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="validateRelationshipType"
@@ -156,14 +156,14 @@
 				/dhis-web-maintenance-patient/updatePatientAttibuteForm.vm</param>
 			<param name="javascripts">javascript/patientAttribute.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="updatePatientAttribute"
 			class="org.hisp.dhis.patient.action.patientattribute.UpdatePatientAttributeAction">
 			<result name="success" type="redirect">patientAttribute.action
 			</result>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="validatePatientAttribute"
@@ -199,13 +199,13 @@
 			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/patientAttribute.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 		
 		<action name="savePatientAttributeVisitSchedule"
 			class="org.hisp.dhis.patient.action.patientattribute.SavePatientAttributeVisitScheduleAction">
 			<result name="success" type="redirect">index.action</result>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<!-- Program -->
@@ -260,14 +260,14 @@
 			<param name="page">/dhis-web-maintenance-patient/updateProgramForm.vm</param>
 			<param name="javascripts">javascript/program.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="updateProgram"
 			class="org.hisp.dhis.patient.action.program.UpdateProgramAction">
 			<result name="success" type="redirect">program.action
 			</result>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="validateProgram"
@@ -304,14 +304,14 @@
 			class="org.hisp.dhis.patient.action.program.GetProgramAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programAssociations.vm</param>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="defineProgramAssociations"
 			class="org.hisp.dhis.patient.action.program.DefineProgramAssociationsAction">
 			<result name="success" type="redirect">program.action
 			</result>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<!-- ProgramStage -->
@@ -367,7 +367,7 @@
 			<result name="success" type="redirect">
 				programStage.action?id=${programId}
 			</result>
-			<param name="requiredAuthorities">F_PROGRAMSTAGE_UPDATE</param>
+			<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
 		</action>
 
 		<action name="showUpdateProgramStageForm"
@@ -377,7 +377,7 @@
 				/dhis-web-maintenance-patient/updateProgramStageForm.vm</param>
 			<param name="javascripts">javascript/commons.js,javascript/programStage.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PROGRAMSTAGE_UPDATE</param>
+			<param name="requiredAuthorities">F_PROGRAMSTAGE_ADD</param>
 		</action>
 
 		<action name="removeProgramStage"
@@ -442,14 +442,14 @@
 				/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm</param>
 			<param name="javascripts">javascript/commons.js,javascript/programStageSection.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_UPDATE</param>
+			<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_ADD</param>
 		</action>
 
 		<action name="updateProgramStageSection"
 			class="org.hisp.dhis.patient.action.programstage.UpdateProgramStageSectionAction">
 			<result name="success" type="redirect">programStageSectionList.action?id=${programStageId}
 			</result>
-			<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_UPDATE</param>
+			<param name="requiredAuthorities">F_PROGRAMSTAGE_SECTION_ADD</param>
 		</action>
 
 		<action name="getProgramStageSection"
@@ -690,14 +690,14 @@
 			<param name="page">/dhis-web-maintenance-patient/updatePatientAttibuteGroupForm.vm</param>
 			<param name="javascripts">javascript/patientAttributeGroup.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="updatePatientAttributeGroup"
 			class="org.hisp.dhis.patient.action.patientattributegroup.UpdatePatientAttributeGroupAction">
 			<result name="success" type="redirect">patientAttributeGroup.action
 			</result>
-			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTATTRIBUTE_ADD</param>
 		</action>
 
 		<action name="validatePatientAttributeGroup"
@@ -762,7 +762,7 @@
 				/dhis-web-maintenance-patient/updatePatientIdentifierType.vm</param>
 			<param name="javascripts">javascript/patientIdentifierType.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_ADD</param>
 		</action>
 
 		<action name="patientIdentifierType"
@@ -804,7 +804,7 @@
 			class="org.hisp.dhis.patient.action.patientidentifiertype.UpdatePatientIdentifierTypeAction">
 			<result name="success" type="redirect">patientIdentifierType.action
 			</result>
-			<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_UPDATE</param>
+			<param name="requiredAuthorities">F_PATIENTIDENTIFIERTYPE_ADD</param>
 		</action>
 
 		<!-- Case Aggregation Condition -->
@@ -1002,7 +1002,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm</param>
 			<param name="javascripts">javascript/program.js</param>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="defineProgramsForValidationCriteria"
@@ -1010,7 +1010,7 @@
 			<result name="success" type="redirect">
 				validationCriteria.action
 			</result>
-			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
+      <param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<!-- Program Validation -->
@@ -1166,14 +1166,14 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/updateProgramIndicator.vm</param>
 			<param name="javascripts">javascript/commons.js,javascript/programIndicator.js</param>
-			<param name="requiredAuthorities">F_UPDATE_PROGRAM_INDICATOR</param>
+			<param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
 		</action>
 
 		<action name="updateProgramIndicator"
 			class="org.hisp.dhis.patient.action.programtindicator.UpdateProgramIndicatorAction">
 			<result name="success" type="redirect">programIndicator.action?programId=${programId}
 			</result>
-			<param name="requiredAuthorities">F_UPDATE_PROGRAM_INDICATOR</param>
+			<param name="requiredAuthorities">F_ADD_PROGRAM_INDICATOR</param>
 		</action>
 
 		<action name="removeProgramIndicator"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-07-26 03:52:08 +0000
@@ -119,42 +119,33 @@
 F_ORGANISATION_REGISTRATION=Organisation Unit Registration
 F_PATIENT_REMOVE_EMPTY_EVENTS=Remove Empty Person Events
 F_ACCESS_PATIENT_ATTRIBUTES = View and search Person identifiers
-F_PATIENTATTRIBUTE_ADD=Add Person Attribute
-F_PATIENTATTRIBUTE_UPDATE=Update Person Attribute
+F_PATIENTATTRIBUTE_ADD=Add/Update Person Attribute
 F_PATIENTATTRIBUTE_DELETE=Delete Person Attribute
 F_PATIENTATTRIBUTEVALUE_ADD=Add Person Attribute Value
 F_RELATIONSHIP_ADD=Add Relationship
-F_PATIENT_ADD=Add Person
-F_PATIENT_UPDATE=Update Person
+F_PATIENT_ADD=Add/Update Person
 F_PATIENT_DELETE=Delete Person
-F_ADD_PROGRAM_INDICATOR = Add Program Indicator
-F_UPDATE_PROGRAM_INDICATOR = Update Program Indicator
+F_ADD_PROGRAM_INDICATOR = Add/Update Program Indicator
 F_PATIENT_CHANGE_LOCATION = Change Person Location
 F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Facilities
 F_ADD_PATIENT_REGISTRATION_FORM=Add Person Registration Form
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_INSTANCE_DELETE = Delete Program Enrollment
 F_PROGRAM_TRACKING_MANAGEMENT = Program Tracking Management
-F_PROGRAM_PUBLIC_ADD=Add Public Program
-F_PROGRAM_PRIVATE_ADD=Add Private Program
-F_PROGRAM_UPDATE=Update Program
+F_PROGRAM_PUBLIC_ADD=Add/Update Public Program
+F_PROGRAM_PRIVATE_ADD=Add/Update Private Program
 F_PROGRAM_DELETE=Delete Program
 F_PROGRAM_VALIDATION=Manage Program Validation
-F_PROGRAMSTAGE_ADD=Add Program Stage
-F_PROGRAMSTAGE_UPDATE=Update Program Stage
+F_PROGRAMSTAGE_ADD=Add/Update Program Stage
 F_PROGRAMSTAGE_DELETE=Delete Program Stage
 F_PROGRAMSTAGE_SECTION_MANAGEMENT=Program Stage Section Management
-F_PROGRAMSTAGE_SECTION_ADD=Add Program Stage Section
-F_PROGRAMSTAGE_SECTION_UPDATE=Update Program Stage Section
+F_PROGRAMSTAGE_SECTION_ADD=Add/Update Program Stage Section
 F_PROGRAMSTAGE_SECTION_DELETE=Delete Program Stage Section
-F_PATIENTIDENTIFIERTYPE_ADD=Add Person Identifier Type
+F_PATIENTIDENTIFIERTYPE_ADD=Add/Update Person Identifier Type
 F_PATIENTIDENTIFIERTYPE_DELETE=Delete Person Identifier Type
-F_PATIENTIDENTIFIERTYPE_UPDATE=Update Person Identifier Type
-F_PROGRAM_ATTRIBUTE_ADD=Add Program Attribute
+F_PROGRAM_ATTRIBUTE_ADD=Add/Update Program Attribute
 F_PROGRAM_ATTRIBUTE_DELETE=Delete Program Attribute
-F_PROGRAM_ATTRIBUTE_UPDATE=Update Program Attribute
-F_PATIENT_DATAVALUE_ADD = Add Person Data Value
-F_PATIENT_DATAVALUE_UPDATE = Update Person Data Value
+F_PATIENT_DATAVALUE_ADD = Add/Update Person Data Value
 F_PATIENT_DATAVALUE_DELETE = Delete Person Data Value
 F_PATIENT_SEARCH = Search Person
 F_PATIENT_LIST = List Person

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties	2013-07-26 03:52:08 +0000
@@ -164,27 +164,20 @@
 F_RELATIONSHIPTYPE_ADD=A\u00f1adir Tipo de Relaci\u00f3n
 F_ORGANISATION_REGISTRATION=Registro de Unidades Organizativas
 F_PATIENTATTRIBUTE_ADD=A\u00f1adir Atributo de Persona
-F_PATIENTATTRIBUTE_UPDATE=Actualizar Atributo de Persona
 F_PATIENTATTRIBUTE_DELETE=Eliminar Atributo de Persona
 F_PATIENTATTRIBUTEVALUE_ADD=A\u00f1adir Valor de Atributo de Persona
 F_PATIENT_ADD=A\u00f1adir Personas
-F_PATIENT_UPDATE=Actualizar Personas
 F_PATIENT_DELETE=Eliminar Personas
 F_F_PROGRAM_PUBLIC_ADD=A\u00f1adir Programa
-F_PROGRAM_UPDATE=Actualizar Programa
 F_PROGRAM_DELETE=Eliminar Programa
 F_PROGRAM_VALIDATION=Administrar Validaci\u00f3n de Programa
 F_PROGRAMSTAGE_ADD=A\u00f1adir Etapa
-F_PROGRAMSTAGE_UPDATE=Actualizar Etapa
 F_PROGRAMSTAGE_DELETE=Eliminar Etapa
 F_PATIENTIDENTIFIERTYPE_ADD=A\u00f1adir Tipo de Identificador de Persona
 F_PATIENTIDENTIFIERTYPE_DELETE=Eliminar Tipo de Identificador de Persona
-F_PATIENTIDENTIFIERTYPE_UPDATE=Actualizar Tipo de Identificador de Persona
 F_PROGRAM_ATTRIBUTE_ADD=A\u00f1adir Atributo de Programa
 F_PROGRAM_ATTRIBUTE_DELETE=Eliminar Atributo de Programa
-F_PROGRAM_ATTRIBUTE_UPDATE=Actualizar Atributo de Programa
 F_PATIENT_DATAVALUE_ADD=A\u00f1adir Valores de Datos de Persona
-F_PATIENT_DATAVALUE_UPDATE=Actualizar Valor de Dato de Persona
 F_PATIENT_DATAVALUE_DELETE=Eliminar Valor de Dato de Persona
 F_GENERATE_ACTIVITY_PLANS=Generar plan de actividades
 F_GENERATE_PROGRAM_SUMMARY_REPORT=Generar Reporte Resumen de Programa
@@ -267,7 +260,6 @@
 F_PROGRAM_TRACKING_MANAGEMENT=Administraci\u00f3n de Seguimiento por programas
 F_PROGRAMSTAGE_SECTION_MANAGEMENT=Administraci\u00f3n de secciones de etapa
 F_PROGRAMSTAGE_SECTION_ADD=A\u00f1adir secci\u00f3n de etapa
-F_PROGRAMSTAGE_SECTION_UPDATE=Actualizar secci\u00f3n de etapa
 F_PROGRAMSTAGE_SECTION_DELETE=Eliminar secci\u00f3n de etapa
 F_PATIENT_SEARCH=Buscar persona
 F_PATIENT_LIST=Listar personas

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties	2013-07-26 03:52:08 +0000
@@ -112,7 +112,6 @@
 F_SEND_MESSAGE=Envoyer Message
 F_DATADICTIONARY_PRIVATE_ADD=Ajouter Dictionnaire de donn\u00E9es priv\u00E9
 specify_organisationunit=Veuillez sp\u00E9cifier une unit\u00E9 d'organisation
-F_PATIENTATTRIBUTE_UPDATE=Modifier attributs du patient
 change=Changer
 F_OPTIONSET_DELETE=Supprimer le jeu d'options
 F_ORGANISATIONUNIT_MOVE=D\u00E9placer Unit\u00E9 d'Organisation
@@ -145,7 +144,6 @@
 F_ORGANISATIONUNIT_ADD=Ajouter Unit\u00E9 d'Organisation
 edit_role=Modifier r\u00F4le d'utilisateur
 F_INDICATORGROUP_PRIVATE_ADD=Ajouter Groupe d'Indicateurs Priv\u00E9
-F_PATIENTIDENTIFIERTYPE_UPDATE=Modifier type identifiant de patient
 inactive_for=Inactif depuis
 disable=D\u00E9sactiver
 F_CONSTANT_ADD=Ajouter constante
@@ -179,7 +177,6 @@
 add_user_group=Ajouter groupe d'utilisateurs
 F_PROGRAM_ENROLLMENT=Inscription au Programme
 number_of_orgunit=Nombre d'unit\u00E9s d'organisation
-F_PROGRAMSTAGE_UPDATE=Modifier Stade de Programme
 F_PATIENT_SEARCH=Rechercher Personne
 M_dhis-web-maintenance-patient=Voir module Personnes et Programmes
 disabled=D\u00E9sactiv\u00E9
@@ -196,7 +193,6 @@
 select_all_in_group=S\u00E9lectionner tout dans le groupe
 confirm_delete=Confirmer la suppression
 F_INDICATORTYPE_ADD=Ajouter type d'indicateur
-F_PATIENT_UPDATE=Modifier Personne
 F_USERROLE_ADD=Ajouter R\u00F4le d'Utilisateur
 F_VALIDATIONRULEGROUP_DELETE=Supprimer Groupe de R\u00E8gles de Validation
 specify_description=Veuillez sp\u00E9cifier une description
@@ -221,7 +217,6 @@
 self_registered_user=Utilisateur auto-enregistr\u00E9
 F_RELATIONSHIP_MANAGEMENT=Gestion de Relation de Personne
 available_roles=R\u00F4les disponibles
-F_PROGRAM_UPDATE=Modifier Programme
 confirm_delete_user=Etes-vous s\u00FBr de vouloir supprimer cet utilisateur?
 remove_all_in_group=Retirez tout dans le groupe
 F_CONCEPT_DELETE=Supprimer Concept
@@ -232,7 +227,6 @@
 M_dhis-web-reports=Voir module rapports NRHM
 M_dhis-web-exportdatamart=Voir Module Exportation Data Mart
 F_OPTIONSET_MANAGEMENT=Gestion Set Option
-F_PATIENT_DATAVALUE_UPDATE=Modifier valeur de donn\u00E9es de personne
 F_PROGRAM_STAGE_INSTANCE_REMINDER=Charger les messages de rappel d'\u00E9v\u00E8nement
 deselect_role=D\u00E9s\u00E9lectionner r\u00F4le
 group_members=Membres du groupe
@@ -252,7 +246,6 @@
 F_PROGRAM_PUBLIC_ADD=Ajouter Programme Public
 F_PATIENTATTRIBUTE_DELETE=Supprimer attribut de Patient
 F_PROGRAMSTAGE_SECTION_ADD=Ajouter Section de Stade de Programme
-F_PROGRAM_ATTRIBUTE_UPDATE=Modifier Attribut de Programme
 F_USERGROUP_PUBLIC_ADD=Ajouter Groupe d'utilisateurs Public
 user_use_group=Il ya des utilisateurs qui utilisent ce r\u00F4le
 F_DATASET_ORDER_CHANGE=Changer l'ordre dans l'ensemble de donn\u00E9es
@@ -281,7 +274,6 @@
 F_CONSTANT_MANAGEMENT=Gestion de constantes
 saving_user_failed=Enregistrement utilisateur \u00E9chou\u00E9
 user_role=R\u00F4le d'utilisateur
-F_PROGRAMSTAGE_SECTION_UPDATE=Modifier Section de Stade de Programme
 F_DATASET_PUBLIC_ADD=Ajouter ensemble de donn\u00E9es
 F_SQLVIEW_ADD=Ajouter Vue Sql
 authorities=Autorit\u00E9s

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties	2013-07-26 03:52:08 +0000
@@ -115,12 +115,10 @@
 F_ORGANISATION_REGISTRATION=Registrasi Unit Organisasi
 F_PATIENT_REMOVE_EMPTY_EVENTS=Hapus Event Orang yang kosong
 F_PATIENTATTRIBUTE_ADD=Tambahkan Atribut Orang
-F_PATIENTATTRIBUTE_UPDATE=Update Atribut Orang
 F_PATIENTATTRIBUTE_DELETE=Hapus Atribut Orang
 F_PATIENTATTRIBUTEVALUE_ADD=Tambahkan Nilai Atribut Orang
 F_RELATIONSHIP_ADD=Add Relationship
 F_PATIENT_ADD=Tambahkan Orang
-F_PATIENT_UPDATE=Update Orang
 F_PATIENT_DELETE=Hapus Orang
 F_PATIENT_CHANGE_LOCATION=Ubah lokasi Orang
 F_SEARCH_PATIENT_IN_ALL_FACILITIES=Pencarian Orang dalam semua fasilitas
@@ -130,24 +128,18 @@
 F_PROGRAM_TRACKING_MANAGEMENT=Manajemen Pelacakan Program
 F_PROGRAM_PUBLIC_ADD=Tambahkan Program Publik
 F_PROGRAM_PRIVATE_ADD=Tambahkan Program Privat
-F_PROGRAM_UPDATE=Update Program
 F_PROGRAM_DELETE=Hapus Program
 F_PROGRAM_VALIDATION=Atur Validasi Program
 F_PROGRAMSTAGE_ADD=tambah tahap program
-F_PROGRAMSTAGE_UPDATE=Update Tahapan Program
 F_PROGRAMSTAGE_DELETE=hapus tahap program
 F_PROGRAMSTAGE_SECTION_MANAGEMENT=tahap program bagian manajemen
 F_PROGRAMSTAGE_SECTION_ADD=tambahkan tahapan program
-F_PROGRAMSTAGE_SECTION_UPDATE=perbarui tahapan program
 F_PROGRAMSTAGE_SECTION_DELETE=hapus tahapan program
 F_PATIENTIDENTIFIERTYPE_ADD=tambahkan tipe pengidentifikasi
 F_PATIENTIDENTIFIERTYPE_DELETE=hapus tipe pengidentifikasi
-F_PATIENTIDENTIFIERTYPE_UPDATE=perbarui tipe pengidentifikasi
 F_PROGRAM_ATTRIBUTE_ADD=tambahkan atribut program
 F_PROGRAM_ATTRIBUTE_DELETE=hapus atribut program 
-F_PROGRAM_ATTRIBUTE_UPDATE=perbarui atribut program
 F_PATIENT_DATAVALUE_ADD=tambahkan nilai data orang
-F_PATIENT_DATAVALUE_UPDATE=perbarui nilai data orang
 F_PATIENT_DATAVALUE_DELETE=hapus nilai data orang
 F_PATIENT_SEARCH=cari orang
 F_PATIENT_LIST=daftar orang

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties	2013-07-26 03:52:08 +0000
@@ -99,28 +99,21 @@
 F_RELATIONSHIPTYPE_ADD=Relationship \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
 F_ORGANISATION_REGISTRATION=Organisation Unit Registration
 F_PATIENTATTRIBUTE_ADD=Beneficiary Attribute \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_PATIENTATTRIBUTE_UPDATE=Beneficiary Attribute \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PATIENTATTRIBUTE_DELETE=Beneficiary Attribute \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_PATIENTATTRIBUTEVALUE_ADD=Beneficiary Attribute \u1010\u1014\u103a\u1016\u102d\u102f\u1038\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_RELATIONSHIP_ADD=Add Relationship
 F_PATIENT_ADD=Beneficiary \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_PATIENT_UPDATE=Beneficiary \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b 
 F_PATIENT_DELETE=Beneficiary \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_F_PROGRAM_PUBLIC_ADD=Program \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_PROGRAM_UPDATE=Program \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PROGRAM_DELETE=Program \u1000\u102d\u102f\u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_PROGRAM_VALIDATION=Program \u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u101e\u100a\u103a\u104b
 F_PROGRAMSTAGE_ADD=Program Stage \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_PROGRAMSTAGE_UPDATE=Program Stage \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PROGRAMSTAGE_DELETE=Program Stage \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_PATIENTIDENTIFIERTYPE_ADD=Beneficiary Identifier \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_PATIENTIDENTIFIERTYPE_DELETE=Beneficiary Identifier \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_PATIENTIDENTIFIERTYPE_UPDATE=Beneficiary Identifier \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PROGRAM_ATTRIBUTE_ADD=Program Attribute \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_PROGRAM_ATTRIBUTE_DELETE=Program Attribute \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_PROGRAM_ATTRIBUTE_UPDATE=Program Attribute \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PATIENT_DATAVALUE_ADD=Beneficiary Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_PATIENT_DATAVALUE_UPDATE=Beneficiary Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PATIENT_DATAVALUE_DELETE=Beneficiary Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_GENERATE_ACTIVITY_PLANS=Generate Activity Plans
 F_GENERATE_PROGRAM_SUMMARY_REPORT=Generate Program Summary Report

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties	2013-07-26 03:52:08 +0000
@@ -117,7 +117,6 @@
 F_SEND_MESSAGE=Enviar mensagem
 F_DATADICTIONARY_PRIVATE_ADD=Adicionar Dicion\u00E1rio de Dados Privado
 specify_organisationunit=Favor especifique uma unidade organizacional
-F_PATIENTATTRIBUTE_UPDATE=Actualizar Atributo de Paciente
 change=Alterar
 F_OPTIONSET_DELETE=Eliminar Conjunto de Op\u00E7\u00E3o
 F_ORGANISATIONUNIT_MOVE=Mover Unidade Organizacional
@@ -150,7 +149,6 @@
 F_ORGANISATIONUNIT_ADD=Adicionar Unidade Organizacional
 edit_role=Actualizar Papel do Usu\u00E1rio
 F_INDICATORGROUP_PRIVATE_ADD=Adicionar um indicador privado a um grupo
-F_PATIENTIDENTIFIERTYPE_UPDATE=Actualizar Tipo de Identificador do Paciente
 inactive_for=inativo para
 disable=Incapacitado
 F_CONSTANT_ADD=Adiccionar Constante
@@ -188,7 +186,6 @@
 add_user_group=Adiccionar grupo de utilizadores
 F_PROGRAM_ENROLLMENT=Inscri\u00E7\u00E3o no programa
 number_of_orgunit=N\u00FAmero de unidades organizacionais
-F_PROGRAMSTAGE_UPDATE=Actualizar Est\u00E1gio do Programa
 F_PATIENT_SEARCH=Pesquisar benefici\u00E1rio
 M_dhis-web-maintenance-patient=Ver m\u00F3dulo do Paciente
 disabled=Inv\u00E1lido
@@ -205,7 +202,6 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_PATIENT_UPDATE=Actualizar Paciente
 F_USERROLE_ADD=Adicionar Papel do Usu\u00E1rio
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
 specify_description=Por favor, especifique uma descri\u00E7\u00E3o
@@ -230,7 +226,6 @@
 self_registered_user=Usu\u00E1rio auto registado
 F_RELATIONSHIP_MANAGEMENT=Gest\u00E3o de Relacionamento pessoal
 available_roles=Fun\u00E7\u00F5es dispon\u00EDveis
-F_PROGRAM_UPDATE=Actualizar Programa
 confirm_delete_user=Tem certeza de que deseja excluir este utilizador?
 remove_all_in_group=Remover todos no grupo
 F_CONCEPT_DELETE=Eliminar Conceito
@@ -243,7 +238,6 @@
 M_dhis-web-exportdatamart=Ver o M\u00F3dulo de exporta\u00E7\u00E3o para Data Mart
 F_OPTIONSET_MANAGEMENT=Gest\u00E3o Conjunto de Op\u00E7\u00E3o
 F_USER_GRUP_DELETE=Apagar Papel do Usu\u00E1rio
-F_PATIENT_DATAVALUE_UPDATE=Actualizar valores de dados por benefici\u00E1rio
 F_PROGRAM_STAGE_INSTANCE_REMINDER=Coloque lembretes de eventos
 deselect_role=Deseleccione fun\u00E7\u00E3o
 group_members=Membros do grupo
@@ -266,7 +260,6 @@
 F_PATIENTATTRIBUTE_DELETE=Eliminar Atributo de Paciente
 F_DATAELEMENTGROUPSET_ADD=Adicionar Grupos de Elementos de Dados
 F_PROGRAMSTAGE_SECTION_ADD=Adicionar sec\u00E7\u00E3o de est\u00E1gio programa
-F_PROGRAM_ATTRIBUTE_UPDATE=Actualizar Atributo de Programa
 F_USERGROUP_PUBLIC_ADD=Adiccionar Grupo de Usu\u00E1rios
 user_use_group=H\u00E1 utilizadores a utilizar este papel
 F_DATASET_ORDER_CHANGE=Mudar ordem no Conjunto de Dados
@@ -295,7 +288,6 @@
 F_DATASET_LOCK=Conjunto de Dados Bloqueado
 saving_user_failed=Falha na grava\u00E7\u00E3o de utilizador
 user_role=Fun\u00E7\u00E3o/Papel do Usu\u00E1rio
-F_PROGRAMSTAGE_SECTION_UPDATE=Actualizar sec\u00E7\u00E3o de est\u00E1gio programa
 F_SQLVIEW_ADD=Adiccionar Vista SQL
 F_REPORT_ADD=Adicionar Relat\u00F3rio
 F_DATASET_PUBLIC_ADD=Adicionar Conjunto de Dados

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties	2013-07-26 03:52:08 +0000
@@ -117,7 +117,6 @@
 F_SEND_MESSAGE=Enviar mensagem
 F_DATADICTIONARY_PRIVATE_ADD=Adicionar Dicion\u00E1rio de Dados Privado
 specify_organisationunit=Favor especifique uma unidade organizacional
-F_PATIENTATTRIBUTE_UPDATE=Actualizar Atributo de Paciente
 change=Alterar
 F_OPTIONSET_DELETE=Eliminar Conjunto de Op\u00E7\u00E3o
 F_ORGANISATIONUNIT_MOVE=Mover Unidade Organizacional
@@ -150,7 +149,6 @@
 F_ORGANISATIONUNIT_ADD=Adicionar Unidade Organizacional
 edit_role=Actualizar Papel do Usu\u00E1rio
 F_INDICATORGROUP_PRIVATE_ADD=Adicionar um indicador privado a um grupo
-F_PATIENTIDENTIFIERTYPE_UPDATE=Actualizar Tipo de Identificador do Paciente
 inactive_for=inativo para
 disable=Incapacitado
 F_CONSTANT_ADD=Adiccionar Constante
@@ -188,7 +186,6 @@
 add_user_group=Adiccionar grupo de utilizadores
 F_PROGRAM_ENROLLMENT=Inscri\u00E7\u00E3o no programa
 number_of_orgunit=N\u00FAmero de unidades organizacionais
-F_PROGRAMSTAGE_UPDATE=Actualizar Est\u00E1gio do Programa
 F_PATIENT_SEARCH=Pesquisar benefici\u00E1rio
 M_dhis-web-maintenance-patient=Ver m\u00F3dulo do Paciente
 disabled=Inv\u00E1lido
@@ -205,7 +202,6 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_PATIENT_UPDATE=Actualizar Paciente
 F_USERROLE_ADD=Adicionar Papel do Usu\u00E1rio
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
 specify_description=Por favor, especifique uma descri\u00E7\u00E3o
@@ -230,7 +226,6 @@
 self_registered_user=Usu\u00E1rio auto registado
 F_RELATIONSHIP_MANAGEMENT=Gest\u00E3o de Relacionamento pessoal
 available_roles=Fun\u00E7\u00F5es dispon\u00EDveis
-F_PROGRAM_UPDATE=Actualizar Programa
 confirm_delete_user=Tem certeza de que deseja excluir este utilizador?
 remove_all_in_group=Remover todos no grupo
 F_CONCEPT_DELETE=Eliminar Conceito
@@ -243,7 +238,6 @@
 M_dhis-web-exportdatamart=Ver o M\u00F3dulo de exporta\u00E7\u00E3o para Data Mart
 F_OPTIONSET_MANAGEMENT=Gest\u00E3o Conjunto de Op\u00E7\u00E3o
 F_USER_GRUP_DELETE=Apagar Papel do Usu\u00E1rio
-F_PATIENT_DATAVALUE_UPDATE=Actualizar valores de dados por benefici\u00E1rio
 F_PROGRAM_STAGE_INSTANCE_REMINDER=Coloque lembretes de eventos
 deselect_role=Deseleccione fun\u00E7\u00E3o
 group_members=Membros do grupo
@@ -266,7 +260,6 @@
 F_PATIENTATTRIBUTE_DELETE=Eliminar Atributo de Paciente
 F_DATAELEMENTGROUPSET_ADD=Adicionar Grupos de Elementos de Dados
 F_PROGRAMSTAGE_SECTION_ADD=Adicionar sec\u00E7\u00E3o de est\u00E1gio programa
-F_PROGRAM_ATTRIBUTE_UPDATE=Actualizar Atributo de Programa
 F_USERGROUP_PUBLIC_ADD=Adiccionar Grupo de Usu\u00E1rios
 user_use_group=H\u00E1 utilizadores a utilizar este papel
 F_DATASET_ORDER_CHANGE=Mudar ordem no Conjunto de Dados
@@ -295,7 +288,6 @@
 F_DATASET_LOCK=Conjunto de Dados Bloqueado
 saving_user_failed=Falha na grava\u00E7\u00E3o de utilizador
 user_role=Fun\u00E7\u00E3o/Papel do Usu\u00E1rio
-F_PROGRAMSTAGE_SECTION_UPDATE=Actualizar sec\u00E7\u00E3o de est\u00E1gio programa
 F_SQLVIEW_ADD=Adiccionar Vista SQL
 F_REPORT_ADD=Adicionar Relat\u00F3rio
 F_DATASET_PUBLIC_ADD=Adicionar Conjunto de Dados

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties	2013-07-26 03:52:08 +0000
@@ -24,7 +24,6 @@
 adding_user_failed=L\u1ed7i do th\u00eam ng\u01b0\u1eddi d\u00f9ng
 last_login=\u0110\u0103ng nh\u1eadp l\u1ea7n cu\u1ed1i
 edit_user_role=C\u1eadp nh\u1eadt ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
-F_PROGRAMSTAGE_UPDATE=C\u1eadp nh\u1eadt giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
 number_of_orgunit=S\u1ed1 l\u01b0\u1ee3ng c\u00e1c \u0111\u01a1n v\u1ecb
 username_in_use=T\u00ean t\u00e0i kho\u1ea3n n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng. Xin vui l\u00f2ng ch\u1ecdn m\u1ed9t t\u00ean t\u00e0i kho\u1ea3n kh\u00e1c
 F_DATAELEMENT_DELETE=X\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
@@ -64,7 +63,6 @@
 F_INDICATORGROUP_PUBLIC_ADD=Th\u00eam nh\u00f3m ch\u1ec9 s\u1ed1
 F_REPORTTABLE_DELETE=X\u00f3a report table
 F_PATIENTATTRIBUTEVALUE_ADD=Th\u00eam gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
-F_PATIENTATTRIBUTE_UPDATE=C\u1eadp nh\u1eadt thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
 F_PATIENTIDENTIFIERTYPE_DELETE=X\u00f3a Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
 F_PROGRAM_VALIDATION=Thao t\u00e1c ki\u1ec3m tra ch\u01b0\u01a1ng tr\u00ecnh
 M_dhis-web-light=Xem ch\u1ee9c n\u0103ng Thu G\u1ecdn
@@ -98,7 +96,6 @@
 F_CONCEPT_DELETE=X\u00f3a Concept
 M_dhis-web-mapping=Xem ch\u1ee9c n\u0103ng B\u1ea3n \u0110\u1ed3 S\u1ed1 H\u00f3a
 M_dhis-web-gis=Xem ch\u1ee9c n\u0103ng T\u00edch H\u1ee3p - Xu\u1ea5t Tr\u00edch d\u1eef li\u1ec7u
-F_PROGRAM_UPDATE=C\u1eadp nh\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
 M_dhis-web-maintenance-settings=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd C\u00e0i \u0110\u1eb7t
 roles=C\u00e1c ph\u00e2n quy\u1ec1n
 F_PROGRAM_PUBLIC_ADD=Th\u00eam ch\u01b0\u01a1ng tr\u00ecnh
@@ -123,7 +120,6 @@
 F_EXCEL_REPORT_ADMINISTRATION=Qu\u1ea3n tr\u1ecb module B\u00e1o c\u00e1o Excel
 selected_roles=C\u00e1c ph\u00e2n quy\u1ec1n \u0111\u01b0\u1ee3c ch\u1ecdn
 F_RELATIONSHIPTYPE_ADD=Th\u00eam lo\u1ea1i quan h\u1ec7
-F_PATIENT_UPDATE=C\u1eadp nh\u1eadt c\u00e1 th\u1ec3
 F_INDICATORTYPE_ADD=Th\u00eam lo\u1ea1i ch\u1ec9 s\u1ed1
 everything_is_ok=M\u1ecdi th\u1ee9 \u0111\u1ec1u \u1ed5n
 F_USERROLE_ADD=Th\u00eam quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
@@ -181,7 +177,6 @@
 M_dhis-web-excel-reporting=Xem ch\u1ee9c n\u0103ng B\u00e1o c\u00e1o Excel
 M_dhis-web-maintenance-datadictionary=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd T\u1eeb \u0110i\u1ec3n D\u1eef Li\u1ec7u
 F_USERROLE_DELETE=X\u00f3a quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
-F_PATIENTIDENTIFIERTYPE_UPDATE=C\u1eadp nh\u1eadt Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
 M_dhis-web-maintenance-dataadmin=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n Tr\u1ecb D\u1eef Li\u1ec7u
 user_group=Nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 fullname=H\u1ecd v\u00e0 t\u00ean
@@ -211,7 +206,6 @@
 specify_raw_password=Vui l\u00f2ng nh\u1eadp m\u1eadt kh\u1ea9u
 F_USERGROUP_DELETE=X\u00f3a nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 username=T\u00ean t\u00e0i kho\u1ea3n
-F_PROGRAM_ATTRIBUTE_UPDATE=C\u1eadp nh\u1eadt Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 adding_role_failed=L\u1ed7i do th\u00eam ph\u00e2n quy\u1ec1n
 F_SECTION_ADD=Th\u00eam m\u1ee5c
 filter_by_user_name=L\u1ecdc theo t\u00ean \u0111\u0103ng nh\u1eadp

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties	2013-07-25 09:37:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties	2013-07-26 03:52:08 +0000
@@ -88,7 +88,6 @@
 delete_current_user=\u5220\u9664\u5F53\u524D\u7528\u6237
 F_SEND_MESSAGE=\u53D1\u751F\u4FE1\u606F
 specify_organisationunit=\u8BF7\u6CE8\u660E\u7EC4\u7EC7\u673A\u6784>>>>>>> MERGE-SOURCE
-F_PATIENTATTRIBUTE_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\u5C5E\u6027
 change=\u4FEE\u6539
 F_OPTIONSET_DELETE=\u5220\u9664\u9009\u9879\u96C6
 F_ORGANISATIONUNIT_MOVE=\u79FB\u9664\u7EC4\u7EC7\u673A\u6784
@@ -118,7 +117,6 @@
 F_PROGRAM_VALIDATION=\u7BA1\u7406\u9879\u76EE\u9A8C\u8BC1\u89C4\u5219
 F_ORGANISATIONUNIT_ADD=\u6DFB\u52A0\u7EC4\u7EC7\u673A\u6784
 edit_role=\u7F16\u8F91\u89D2\u8272
-F_PATIENTIDENTIFIERTYPE_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\u6807\u8BC6\u7B26\u7C7B\u578B
 name=\u59D3\u540D
 inactive_for=\u5173\u95ED
 F_CONSTANT_ADD=\u6DFB\u52A0\u5E38\u6570
@@ -151,7 +149,6 @@
 add_user_group=\u6DFB\u52A0\u7528\u6237\u7EC4
 F_PROGRAM_ENROLLMENT=\u9879\u76EE\u767B\u8BB0
 number_of_orgunit=\u7EC4\u7EC7\u673A\u6784\u6570
-F_PROGRAMSTAGE_UPDATE=\u66F4\u65B0\u9879\u76EE\u9636\u6BB5
 M_dhis-web-maintenance-patient=\u67E5\u770B\u53D7\u76CA\u4EBA\uFF08\u75C5\u4EBA\uFF09\u6A21\u5757
 specify_username=\u8BF7\u6CE8\u660E\u7528\u6237
 F_PATIENTIDENTIFIERTYPE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u6807\u8BC6\u7B26\u7C7B\u578B
@@ -164,7 +161,6 @@
 select_all_in_group=\u9009\u62E9\u6240\u6709
 confirm_delete=\u4F60\u786E\u8BA4\u5220\u9664
 F_INDICATORTYPE_ADD=\u6DFB\u52A0\u6307\u6807\u7C7B\u578B
-F_PATIENT_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\uFF08\u75C5\u4EBA\uFF09
 F_USERROLE_ADD=\u6DFB\u52A0\u7528\u6237\u89D2\u8272
 F_VALIDATIONRULEGROUP_DELETE=\u5220\u9664\u9A8C\u8BC1\u89C4\u5219\u7EC4
 specify_description=\u6307\u5B9A\u63CF\u8FF0
@@ -183,7 +179,6 @@
 M_dhis-web-maintenance-mobile=\u67E5\u770B\u79FB\u52A8\u7EF4\u62A4\u6A21\u5757
 F_RELATIONSHIP_MANAGEMENT=\u53D7\u76CA\u4EBA\u5173\u7CFB\u7BA1\u7406
 available_roles=\u53EF\u7528\u7684\u89D2\u8272
-F_PROGRAM_UPDATE=\u66F4\u65B0\u9879\u76EE
 confirm_delete_user=\u60A8\u786E\u8BA4\u8981\u5220\u9664\u6B64\u7528\u6237?
 remove_all_in_group=\u5168\u90E8\u79FB\u9664
 F_PROGRAM_PUBLIC_ADD=\u6DFB\u52A0\u9879\u76EE
@@ -197,7 +192,6 @@
 clear=\u6E05\u9664
 F_OPTIONSET_MANAGEMENT=\u9009\u9879\u96C6\u7BA1\u7406
 F_USERGROUP_DELETE=\u5220\u9664\u7528\u6237\u7EC4
-F_PATIENT_DATAVALUE_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\u6570\u636E\u503C
 deselect_role=\u53D6\u6D88\u89D2\u8272\u9009\u62E9
 group_members=\u56E2\u961F\u6210\u5458
 F_PATIENTATTRIBUTEVALUE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u5C5E\u6027\u503C
@@ -215,7 +209,6 @@
 M_dhis-web-validationrule=\u9A8C\u8BC1\u89C4\u5219\u6A21\u5757
 F_PATIENTATTRIBUTE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u5C5E\u6027
 F_DATAELEMENTGROUPSET_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u5143\u7EC4\u96C6
-F_PROGRAM_ATTRIBUTE_UPDATE=\u66F4\u65B0\u9879\u76EE\u5C5E\u6027
 user_use_group=\u7528\u6237\u4F7F\u7528\u7EC4
 F_DATASET_ORDER_CHANGE=\u6539\u53D8\u6570\u636E\u96C6\u7684\u6392\u5E8F
 F_DATAADMIN_LOCK=\u6570\u636E\u7BA1\u7406\u5458\u9501\u5B9A