=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2013-03-01 12:56:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2013-07-25 09:37:43 +0000
@@ -56,7 +56,7 @@
     public static final String[] CRITICAL_AUTHS = { "ALL", "F_SCHEDULING_ADMIN",
         "F_PERFORM_MAINTENANCE", "F_MERGE_ORGANISATION_UNITS", "F_ELIMINATE_DUPLICATE_DATA_ELEMENTS",
         "F_ARCHIVE_DATA", "F_SQLVIEW_MANAGEMENT", "F_SYSTEM_SETTING",
-        "F_USERROLE_LIST", "F_USERROLE_DELETE", "F_USERROLE_ADD", "F_USERROLE_UPDATE" };
+        "F_USERROLE_LIST", "F_USERROLE_DELETE", "F_USERROLE_ADD" };
 
     /**
      * Required and unique.

=== 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-08 09:42:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-07-25 09:37:43 +0000
@@ -539,6 +539,35 @@
         executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_DELETE' WHERE authority='F_USER_GRUP_DELETE'" );
         executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_LIST' WHERE authority='F_USER_GRUP_LIST'" );
 
+        // remove unused authorities
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_CONCEPT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_CONSTANT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENTGROUP_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENTGROUPSET_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATADICTIONARY_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAELEMENT_MINMAX_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATASET_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_SECTION_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_DATAVALUE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_INDICATOR_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_INDICATORTYPE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_INDICATORGROUP_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_INDICATORGROUPSET_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_ORGANISATIONUNIT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_ORGUNITGROUP_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_ORGUNITGROUPSET_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_USERROLE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_USERGROUP_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_USER_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_VALIDATIONRULE_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_VALIDATIONRULEGROUP_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_REPORT_UPDATE'" );
+        executeSql( "DELETE FROM userroleauthorities WHERE authority='F_SQLVIEW_UPDATE'" );
+        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'" );
+
         // 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-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-07-23 04:16:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -470,7 +470,7 @@
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
       </result>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE,F_DATAVALUE_UPDATE</param>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
     </action>
 
     <action name="caseAggregationResultDetails"

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2013-02-19 09:57:46 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -41,19 +41,19 @@
     <action name="saveValue" class="org.hisp.dhis.de.action.SaveValueAction">
       <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveComment" class="org.hisp.dhis.de.action.SaveCommentAction">
       <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
     </action>
 
     <action name="saveMinMaxLimits" class="org.hisp.dhis.de.action.SaveMinMaxLimitsAction">
       <result name="success" type="velocity-json">/dhis-web-dataentry/status.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-      <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_ADD,F_DATAELEMENT_MINMAX_UPDATE</param>
+      <param name="requiredAuthorities">F_DATAELEMENT_MINMAX_ADD</param>
     </action>
 
     <action name="removeMinMaxLimits" class="org.hisp.dhis.de.action.RemoveMinMaxLimitsAction">

=== 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-04-15 09:36:45 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -73,7 +73,7 @@
       </result>
       <result name="error" type="velocity">/dhis-web-light/main.vm</result>
       <param name="page">/dhis-web-light/dataEntrySection.vm</param>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
     </action>
 
     <action name="markComplete"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-05-14 10:02:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -281,13 +281,13 @@
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm</param>
       <param name="javascripts">javascript/sqlView.js, javascript/updateSqlViewForm.js</param>
-      <param name="requiredAuthorities">F_SQLVIEW_UPDATE</param>
+      <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
     </action>
 
     <action name="updateSqlViewInstance" class="org.hisp.dhis.dataadmin.action.sqlview.UpdateSqlViewAction">
       <result name="success" type="redirect">showSqlViewListForm.action</result>
       <result name="error" type="redirect">index.action</result>
-      <param name="requiredAuthorities">F_SQLVIEW_UPDATE</param>
+      <param name="requiredAuthorities">F_SQLVIEW_ADD</param>
     </action>
 
     <action name="removeSqlViewObject" class="org.hisp.dhis.dataadmin.action.sqlview.RemoveSqlViewAction">
@@ -383,13 +383,13 @@
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">
         /dhis-web-maintenance-dataadmin/updateConstantForm.vm</param>
-      <param name="requiredAuthorities">F_CONSTANT_UPDATE</param>
+      <param name="requiredAuthorities">F_CONSTANT_ADD</param>
     </action>
 
     <action name="updateConstant" class="org.hisp.dhis.dataadmin.action.constant.UpdateConstantAction">
       <result name="success" type="redirect">constant.action</result>
       <result name="error" type="redirect">index.action</result>
-      <param name="requiredAuthorities">F_CONSTANT_UPDATE</param>
+      <param name="requiredAuthorities">F_CONSTANT_ADD</param>
     </action>
 
     <action name="validateConstant" class="org.hisp.dhis.dataadmin.action.constant.ValidateConstantAction">
@@ -481,7 +481,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
       <param name="page">/dhis-web-maintenance-dataadmin/updateAttributeForm.vm</param>
-      <param name="requiredAuthorities">F_ATTRIBUTE_UPDATE</param>
+      <param name="requiredAuthorities">F_ATTRIBUTE_ADD</param>
     </action>
 
     <action name="showSortAttributeForm" class="org.hisp.dhis.dataadmin.action.attribute.GetAttributeListSortOrderAction">
@@ -497,13 +497,13 @@
 
     <action name="saveAttributeSortOrder" class="org.hisp.dhis.dataadmin.action.attribute.SaveAttributeSortOrderAction">
       <result name="success" type="redirect">attribute.action</result>
-      <param name="requiredAuthorities">F_ATTRIBUTE_UPDATE</param>
+      <param name="requiredAuthorities">F_ATTRIBUTE_ADD</param>
     </action>
 
     <action name="updateAttribute" class="org.hisp.dhis.dataadmin.action.attribute.UpdateAttributeAction">
       <result name="success" type="redirect">attribute.action</result>
       <result name="error" type="redirect">index.action</result>
-      <param name="requiredAuthorities">F_ATTRIBUTE_UPDATE</param>
+      <param name="requiredAuthorities">F_ATTRIBUTE_ADD</param>
     </action>
 
     <action name="removeAttribute" class="org.hisp.dhis.dataadmin.action.attribute.RemoveAttributeAction">
@@ -578,12 +578,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataadmin/updateOptionSetForm.vm</param>
       <param name="javascripts">javascript/optionSet.js</param>
-      <param name="requiredAuthorities">F_OPTIONSET_UPDATE</param>
+      <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
     </action>
    
     <action name="updateOptionSet" class="org.hisp.dhis.dataadmin.action.option.UpdateOptionSetAction">
       <result name="success" type="redirect">optionSet.action</result>
-      <param name="requiredAuthorities">F_OPTIONSET_UPDATE</param>
+      <param name="requiredAuthorities">F_OPTIONSET_ADD</param>
     </action>
     
     <action name="removeOptionSet" class="org.hisp.dhis.dataadmin.action.option.RemoveOptionSetAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -66,12 +66,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/dataElementForm.vm</param>
       <param name="javascripts">javascript/shortName.js,javascript/dataElement.js,javascript/updateLoad.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="updateDataElement" class="org.hisp.dhis.dd.action.dataelement.UpdateDataElementAction">
       <result name="success" type="redirect">dataElement.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="validateDataElement" class="org.hisp.dhis.dd.action.dataelement.ValidateDataElementAction">
@@ -87,27 +87,27 @@
       <param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElementGroupEditorView.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="getAssignedDataElementGroups" class="org.hisp.dhis.dd.action.dataelementgroup.GetAssignedGroupsByDataElementAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroups.vm</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="asignGroupsForDataElement" class="org.hisp.dhis.dd.action.dataelementgroup.AssignGroupsForDataElementAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="addDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.AddDataElementGroupAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroup.vm</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="renameDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.RenameDEGroupNameEditorAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroup.vm</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="deleteDataElemenGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.RemoveDataElementGroupAction">
@@ -123,7 +123,7 @@
 
     <action name="updateDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.UpdateDataElementGroupAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <!-- DataElementGroup -->
@@ -162,12 +162,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm</param>
       <param name="javascripts">javascript/dataElementGroup.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="updateDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.UpdateDataElementGroupAction">
       <result name="success" type="redirect">dataElementGroup.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="validateDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.ValidateDataElementGroupAction">
@@ -207,12 +207,12 @@
       <param name="page">/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElementGroupSet.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUPSET_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUPSET_PUBLIC_ADD, F_DATAELEMENTGROUPSET_PRIVATE_ADD</param>
     </action>
 
     <action name="updateDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.UpdateDataElementGroupSetAction">
       <result name="success" type="redirect">dataElementGroupSet.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUPSET_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUPSET_PUBLIC_ADD, F_DATAELEMENTGROUPSET_PRIVATE_ADD</param>
     </action>
 
     <action name="validateDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.ValidateDataElementGroupSetAction">
@@ -281,12 +281,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm</param>
       <param name="javascripts">javascript/shortName.js,javascript/indicator.js</param>
-      <param name="requiredAuthorities">F_INDICATOR_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATOR_PUBLIC_ADD, F_INDICATOR_PRIVATE_ADD</param>
     </action>
 
     <action name="updateIndicator" class="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction">
       <result name="success" type="redirect">indicator.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_INDICATOR_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATOR_PUBLIC_ADD, F_INDICATOR_PRIVATE_ADD</param>
     </action>
 
     <action name="validateIndicator" class="org.hisp.dhis.dd.action.indicator.ValidateIndicatorAction">
@@ -306,27 +306,27 @@
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/indicatorGroupEditorView.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="getAssignedIndicatorGroups" class="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroups.vm</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="asignGroupsForIndicator" class="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="addIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.AddIndicatorGroupAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroup.vm</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="renameIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.RenameIndicatorGroupNameEditorAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroup.vm</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="deleteIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
@@ -342,7 +342,7 @@
 
     <action name="updateIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <!-- IndicatorGroup -->
@@ -381,12 +381,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm</param>
       <param name="javascripts">javascript/indicatorGroup.js</param>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="updateIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction">
       <result name="success" type="redirect">indicatorGroup.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUP_PUBLIC_ADD, F_INDICATORGROUP_PRIVATE_ADD</param>
     </action>
 
     <!-- Indicator Group Set -->
@@ -420,7 +420,7 @@
 
     <action name="updateIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.UpdateIndicatorGroupSetAction">
       <result name="success" type="redirect">indicatorGroupSet.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_INDICATORGROUPSET_UPDATE</param>
+      <param name="anyAuthorities">F_INDICATORGROUPSET_PUBLIC_ADD, F_INDICATORGROUPSET_PRIVATE_ADD</param>
     </action>
 
     <action name="deleteIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.DeleteIndicatorGroupSetAction">
@@ -470,12 +470,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm</param>
       <param name="javascripts">javascript/indicatorType.js</param>
-      <param name="requiredAuthorities">F_INDICATORTYPE_UPDATE</param>
+      <param name="requiredAuthorities">F_INDICATORTYPE_ADD</param>
     </action>
 
     <action name="updateIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.UpdateIndicatorTypeAction">
       <result name="success" type="redirect">indicatorType.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_INDICATORTYPE_UPDATE</param>
+      <param name="requiredAuthorities">F_INDICATORTYPE_ADD</param>
     </action>
 
     <action name="validateIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.ValidateIndicatorTypeAction">
@@ -525,12 +525,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm</param>
       <param name="javascripts">javascript/dataDictionary.js</param>
-      <param name="requiredAuthorities">F_DATADICTIONARY_UPDATE</param>
+      <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
     </action>
 
     <action name="updateDataDictionary" class="org.hisp.dhis.dd.action.datadictionary.UpdateDataDictionaryAction">
       <result name="success" type="redirect">dataDictionary.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_DATADICTIONARY_UPDATE</param>
+      <param name="anyAuthorities">F_DATADICTIONARY_PUBLIC_ADD, F_DATADICTIONARY_PRIVATE_ADD</param>
     </action>
 
     <!-- Category -->
@@ -566,14 +566,14 @@
 
     <action name="updateDataElementCategory" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryAction">
       <result name="success" type="redirect">category.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="showUpdateDataElementCategoryForm" class="org.hisp.dhis.dd.action.category.GetDataElementCategoryAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm</param>
       <param name="javascripts">javascript/category.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="removeDataElementCategory" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryAction">
@@ -608,12 +608,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm</param>
       <param name="javascripts">javascript/category.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="updateDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.UpdateDataElementCategoryOptionAction">
       <result name="success" type="redirect">categoryOption.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="removeDataElementCategoryOption" class="org.hisp.dhis.dd.action.category.RemoveDataElementCategoryOptionAction">
@@ -660,14 +660,14 @@
 
     <action name="updateDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.UpdateDataElementCategoryComboAction">
       <result name="success" type="redirect">categoryCombo.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="showUpdateDataElementCategoryComboForm" class="org.hisp.dhis.dd.action.categorycombo.GetDataElementCategoryComboAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm</param>
       <param name="javascripts">javascript/categoryCombo.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
+      <param name="anyAuthorities">F_DATAELEMENT_PUBLIC_ADD, F_DATAELEMENT_PRIVATE_ADD</param>
     </action>
 
     <action name="removeDataElementCategoryCombo" class="org.hisp.dhis.dd.action.categorycombo.RemoveDataElementCategoryComboAction">
@@ -723,7 +723,7 @@
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm</param>
       <param name="javascripts">javascript/concept.js</param>
-      <param name="requiredAuthorities">F_CONCEPT_UPDATE</param>
+      <param name="requiredAuthorities">F_CONCEPT_ADD</param>
     </action>
 
     <action name="validateAddUpdateConcept" class="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction">
@@ -741,7 +741,7 @@
     <action name="updateConceptInstance" class="org.hisp.dhis.dd.action.concept.UpdateConceptAction">
       <result name="success" type="redirect">concept.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">index.action</result>
-      <param name="requiredAuthorities">F_CONCEPT_UPDATE</param>
+      <param name="requiredAuthorities">F_CONCEPT_ADD</param>
     </action>
 
     <action name="removeConcept" class="org.hisp.dhis.dd.action.concept.RemoveConceptAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -63,12 +63,12 @@
       <param name="page">/dhis-web-maintenance-dataset/editSection.vm</param>
       <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
       <param name="javascripts">javascript/section.js</param>
-      <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+      <param name="requiredAuthorities">F_SECTION_ADD</param>
     </action>
 
     <action name="updateSection" class="org.hisp.dhis.dataset.action.section.UpdateSectionAction">
       <result name="success" type="redirect">section.action</result>
-      <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+      <param name="requiredAuthorities">F_SECTION_ADD</param>
     </action>
 
     <action name="removeSection" class="org.hisp.dhis.dataset.action.section.RemoveSectionAction">
@@ -81,13 +81,13 @@
       <param name="page">/dhis-web-maintenance-dataset/greySection.vm</param>
       <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
       <param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
-      <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+      <param name="requiredAuthorities">F_SECTION_ADD</param>
     </action>
 
     <action name="saveSectionGreyStatus" class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction">
       <result name="success" type="velocity">status.vm</result>
       <result name="onExceptionReturn">plainTextError</result>
-      <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+      <param name="requiredAuthorities">F_SECTION_ADD</param>
     </action>
 
     <action name="showSortSectionForm" class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction">
@@ -127,7 +127,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataset/editDataSet.vm</param>
       <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
-      <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+      <param name="anyAuthorities">F_DATASET_PUBLIC_ADD, F_DATASET_PRIVATE_ADD</param>
     </action>
 
     <!-- Validation, add, update, and delete -->
@@ -145,7 +145,7 @@
 
     <action name="updateDataSet" class="org.hisp.dhis.dataset.action.UpdateDataSetAction">
       <result name="success" type="redirect">dataSet.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
-      <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+      <param name="anyAuthorities">F_DATASET_PUBLIC_ADD, F_DATASET_PRIVATE_ADD</param>
     </action>
 
     <action name="delDataSet" class="org.hisp.dhis.dataset.action.DelDataSetAction">
@@ -160,12 +160,12 @@
     <action name="defineDataSetAssociationsForm" class="org.hisp.dhis.dataset.action.GetDataSetAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataset/dataSetAssociations.vm</param>
-      <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+      <param name="anyAuthorities">F_DATASET_PUBLIC_ADD, F_DATASET_PRIVATE_ADD</param>
     </action>
 
     <action name="defineDataSetAssociations" class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction">
       <result name="success" type="redirect">dataSet.action</result>
-      <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+      <param name="anyAuthorities">F_DATASET_PUBLIC_ADD, F_DATASET_PRIVATE_ADD</param>
     </action>
 
     <!-- DataEntryForm -->

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2012-10-24 13:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -56,12 +56,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm</param>
       <param name="javascripts">javascript/shortName.js</param>
-      <param name="requiredAuthorities">F_ORGANISATIONUNIT_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGANISATIONUNIT_ADD</param>
     </action>
 
     <action name="updateOrganisationUnit" class="org.hisp.dhis.oum.action.organisationunit.UpdateOrganisationUnitAction">
       <result name="success" type="redirect">organisationUnit.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_ORGANISATIONUNIT_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGANISATIONUNIT_ADD</param>
     </action>
 
     <action name="removeOrganisationUnit" class="org.hisp.dhis.oum.action.organisationunit.RemoveOrganisationUnitAction">
@@ -119,12 +119,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm</param>
       <param name="javascripts">javascript/organisationUnitGroup.js</param>
-      <param name="requiredAuthorities">F_ORGUNITGROUP_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGUNITGROUP_ADD</param>
     </action>
 
     <action name="updateOrganisationUnitGroup" class="org.hisp.dhis.oum.action.organisationunitgroup.UpdateOrganisationUnitGroupAction">
       <result name="success" type="redirect">organisationUnitGroup.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_ORGUNITGROUP_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGUNITGROUP_ADD</param>
     </action>
 
     <action name="removeOrganisationUnitGroup" class="org.hisp.dhis.oum.action.organisationunitgroup.RemoveOrganisationUnitGroupAction">
@@ -174,7 +174,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm</param>
       <param name="javascripts">javascript/organisationUnitGroupSet.js</param>
-      <param name="requiredAuthorities">F_ORGUNITGROUPSET_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
     </action>
 
     <action name="removeOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.RemoveGroupSetAction">
@@ -186,7 +186,7 @@
 
     <action name="updateOrganisationUnitGroupSet" class="org.hisp.dhis.oum.action.organisationunitgroupset.UpdateGroupSetAction">
       <result name="success" type="redirect">organisationUnitGroupSet.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_ORGUNITGROUPSET_UPDATE</param>
+      <param name="requiredAuthorities">F_ORGUNITGROUPSET_ADD</param>
     </action>
 
     <!-- Hierarchy -->

=== 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-10 02:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -962,7 +962,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-patient/updateValidationCriteria.vm</param>
 			<param name="javascripts">javascript/validationcriteria.js</param>
-			<param name="requiredAuthorities">F_VALIDATIONCRITERIA_UPDATE</param>
+			<param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param>
 		</action>
 
 		<action name="getValidationCriteria"
@@ -976,7 +976,7 @@
 			class="org.hisp.dhis.patient.action.validation.UpdateValidationCriteriaAction">
 			<result name="success" type="redirect">validationCriteria.action
 			</result>
-			<param name="requiredAuthorities">F_VALIDATIONCRITERIA_UPDATE</param>
+			<param name="requiredAuthorities">F_VALIDATIONCRITERIA_ADD</param>
 		</action>
 
 		<action name="removeValidationCriteria"

=== 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-06-05 08:02:59 +0000
+++ 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
@@ -35,104 +35,82 @@
 
 #-- User action privilegies ---------------------------------------------------#
 
-F_CONCEPT_ADD=Add Concept
+F_CONCEPT_ADD=Add/Update Concept
 F_CONCEPT_DELETE=Delete Concept
 F_CONCEPT_MANAGEMENT=Concept Management
-F_CONCEPT_UPDATE=Update Concept
-F_CONSTANT_ADD=Add Constant
+F_CONSTANT_ADD=Add/Update Constant
 F_CONSTANT_DELETE=Delete Constant
 F_CONSTANT_MANAGEMENT=Constant Management
-F_CONSTANT_UPDATE=Update Constant
 F_DATAADMIN_LOCK=Data Admin Locking
 F_DATAADMIN_UNLOCK=Data Admin UnLocking
-F_DATAELEMENT_PUBLIC_ADD=Add Public Data Element
-F_DATAELEMENT_PRIVATE_ADD=Add Private Data Element
+F_DATAELEMENT_PUBLIC_ADD=Add/Update Public Data Element
+F_DATAELEMENT_PRIVATE_ADD=Add/Update Private Data Element
 F_DATAELEMENT_DELETE=Delete Data Element
-F_DATAELEMENT_UPDATE=Update Data Element
-F_DATAELEMENTGROUP_PUBLIC_ADD=Add Public Data Element Groups
-F_DATAELEMENTGROUP_PRIVATE_ADD=Add Private Data Element Groups
+F_DATAELEMENTGROUP_PUBLIC_ADD=Add/Update Public Data Element Groups
+F_DATAELEMENTGROUP_PRIVATE_ADD=Add/Update Private Data Element Groups
 F_DATAELEMENTGROUP_DELETE=Delete Data Element Groups
-F_DATAELEMENTGROUP_UPDATE=Updated Data Element Groups
-F_DATAELEMENTGROUPSET_PUBLIC_ADD=Add Public Data Element Group Sets
-F_DATAELEMENTGROUPSET_PRIVATE_ADD=Add Private Data Element Group Sets
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=Add/Update Public Data Element Group Sets
+F_DATAELEMENTGROUPSET_PRIVATE_ADD=Add/Update Private Data Element Group Sets
 F_DATAELEMENTGROUPSET_DELETE=Delete Data Element Group Sets
-F_DATAELEMENTGROUPSET_UPDATE=Update Data Element Group Sets
-F_DATADICTIONARY_PUBLIC_ADD=Add Public Data Dictionary
-F_DATADICTIONARY_PRIVATE_ADD=Add Private Data Dictionary
-F_DATADICTIONARY_UPDATE=Update Data Dictionary
+F_DATADICTIONARY_PUBLIC_ADD=Add/Update Public Data Dictionary
+F_DATADICTIONARY_PRIVATE_ADD=Add/Update Private Data Dictionary
 F_DATADICTIONARY_DELETE=Delete Data Dictionary
-F_DATAELEMENT_MINMAX_ADD=Add Min/max rule
+F_DATAELEMENT_MINMAX_ADD=Add/Update Min/max rule
 F_DATAELEMENT_MINMAX_DELETE=Delete Min/max rule
-F_DATAELEMENT_MINMAX_UPDATE=Update Min/max rule
-F_DATASET_PUBLIC_ADD=Add Public Data Set
-F_DATASET_PRIVATE_ADD=Add Private Data Set
+F_DATASET_PUBLIC_ADD=Add/Update Public Data Set
+F_DATASET_PRIVATE_ADD=Add/Update Private Data Set
 F_DATASET_DELETE=Delete Data Set
 F_DATASET_ORDER_CHANGE=Change order in Data Set
-F_DATASET_UPDATE=Update Data Set
 F_DATASET_LOCK=Lock Data Set
-F_SECTION_ADD=Add Section
-F_SECTION_UPDATE=Update Section
+F_SECTION_ADD=Add/Update Section
 F_SECTION_DELETE=Delete Section
-F_DATAVALUE_ADD=Add Data Value
+F_DATAVALUE_ADD=Add/Update Data Value
 F_DATAVALUE_DELETE=Delete Data Value
-F_DATAVALUE_UPDATE=Update Data Value
-F_INDICATORGROUP_PUBLIC_ADD=Add Public Indicator Group
-F_INDICATORGROUP_PRIVATE_ADD=Add Private Indicator Group
+F_INDICATOR_PUBLIC_ADD=Add/Update Public Indicator
+F_INDICATOR_PRIVATE_ADD=Add/Update Private Indicator
+F_INDICATOR_DELETE=Delete Indicator
+F_INDICATORTYPE_ADD=Add/Update Indicator Type
+F_INDICATORTYPE_DELETE=Delete Indicator Type
+F_INDICATORGROUP_PUBLIC_ADD=Add/Update Public Indicator Group
+F_INDICATORGROUP_PRIVATE_ADD=Add/Update Private Indicator Group
 F_INDICATORGROUP_DELETE=Delete Indicator Group
-F_INDICATORGROUP_UPDATE=Update Indicator Group
-F_INDICATORTYPE_ADD=Add Indicator Type
-F_INDICATORTYPE_DELETE=Delete Indicator Type
-F_INDICATORTYPE_UPDATE=Update Indicator Type
-F_INDICATOR_PUBLIC_ADD=Add Public Indicator
-F_INDICATOR_PRIVATE_ADD=Add Private Indicator
-F_INDICATOR_DELETE=Delete Indicator
-F_INDICATOR_UPDATE=Update Indicator
-F_INDICATORGROUPSET_PUBLIC_ADD=Add Public Indicator Group Sets
-F_INDICATORGROUPSET_PRIVATE_ADD=Add Private Indicator Group Sets
+F_INDICATORGROUPSET_PUBLIC_ADD=Add/Update Public Indicator Group Sets
+F_INDICATORGROUPSET_PRIVATE_ADD=Add/Update Private Indicator Group Sets
 F_INDICATORGROUPSET_DELETE=Delete Indicator Group Sets
-F_INDICATORGROUPSET_UPDATE=Update Indicator Group Sets
-F_ORGANISATIONUNIT_ADD=Add Organisation Unit
+F_ORGANISATIONUNIT_ADD=Add/Update Organisation Unit
 F_ORGANISATIONUNIT_DELETE=Delete Organisation Unit
 F_ORGANISATIONUNIT_MOVE=Move Organisation Unit
-F_ORGANISATIONUNIT_UPDATE=Update Organisation Unit
-F_ORGUNITGROUP_ADD=Add Organisation Unit Group
+F_ORGUNITGROUP_ADD=Add/Update Organisation Unit Group
 F_ORGUNITGROUP_DELETE=Delete Organisation Unit Group
-F_ORGUNITGROUP_UPDATE=Update Organisation Unit Group
-F_ORGUNITGROUPSET_ADD=Add Organisation Unit Group Set
+F_ORGUNITGROUPSET_ADD=Add/Update Organisation Unit Group Set
 F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
-F_ORGUNITGROUPSET_UPDATE=Update Organisation Unit Group Set
 F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
-F_REPORT_UPDATE=Update Report
-F_USERROLE_ADD=Add User Role
+F_USERROLE_ADD=Add/Update User Role
 F_USERROLE_DELETE=Delete User Role
-F_USERROLE_UPDATE=Update User Role
 F_USERROLE_LIST=List User Roles
-F_USERGROUP_PUBLIC_ADD=Add Public User Group
-F_USERGROUP_PRIVATE_ADD=Add Private User Group
-F_USERGROUP_UPDATE=Update User Group
+F_USERGROUP_PUBLIC_ADD=Add/Update Public User Group
+F_USERGROUP_PRIVATE_ADD=Add/Update Private User Group
 F_USERGROUP_DELETE=Delete User Group
 F_USERGROUP_LIST=List User Groups
-F_USER_ADD=Add User
+F_USER_ADD=Add/Update User
 F_USER_DELETE=Delete User
-F_USER_UPDATE=Update User
 F_USER_VIEW=View User
-F_VALIDATIONRULE_ADD=Add Validation Rule
-F_VALIDATIONRULE_UPDATE=Update Validation Rule
+F_VALIDATIONRULE_ADD=Add/Update Validation Rule
 F_VALIDATIONRULE_DELETE=Delete Validation Rule
-F_VALIDATIONRULEGROUP_ADD=Add Validation Rule Group
-F_VALIDATIONRULEGROUP_UPDATE=Update Validation Rule Group
+F_VALIDATIONRULEGROUP_ADD=Add/Update Validation Rule Group
 F_VALIDATIONRULEGROUP_DELETE=Delete Validation Rule Group
 F_GIS_CONFIGURATION_UPDATE=Change GIS Configuration
-F_REPORT_PUBLIC_ADD=Add Public Report
-F_REPORT_PRIVATE_ADD=Add Private Report
+F_REPORT_PUBLIC_ADD=Add/Update Public Report
+F_REPORT_PRIVATE_ADD=Add/Update Private Report
 F_REPORT_DELETE=Delete Report
-F_REPORTTABLE_PUBLIC_ADD=Add Public Report Table
+F_REPORTTABLE_PUBLIC_ADD=Add/Update Public Report Table
 F_REPORTTABLE_DELETE=Delete Report Table
 F_REPORT_VIEW=View Report
-F_CHART_ADD=Add Chart
+F_CHART_PUBLIC_ADD=Add/Update Public Chart
+F_CHART_ADD=Add/Update Chart
 F_CHART_DELETE=Delete Chart
-F_DOCUMENT_PUBLIC_ADD=Add Public Document
-F_DOCUMENT_PRIVATE_ADD=Add Private Document
+F_DOCUMENT_PUBLIC_ADD=Add/Update Public Document
+F_DOCUMENT_PRIVATE_ADD=Add/Update Private Document
 F_DOCUMENT_DELETE=Delete Document
 F_DASHBOARD_DOWNLOAD_BACKUP=Create and download backup
 F_EXCEL_REPORT_ADMINISTRATION=Excel Reporting Administration
@@ -226,22 +204,18 @@
 F_MAP_PUBLIC_ADD=Add Public Map
 F_DATAMART_ADMIN=Administrate data mart
 F_SCHEDULING_ADMIN=Scheduling Administration
-F_SQLVIEW_ADD=Add Sql View
+F_SQLVIEW_ADD=Add/Update Sql View
 F_SQLVIEW_DELETE=Delete Sql View
-F_SQLVIEW_UPDATE=Update Sql View
 F_SQLVIEW_EXECUTE=Execute Sql View
 F_SQLVIEW_MANAGEMENT=Sql View Management
-F_VALIDATIONCRITERIA_ADD=Add Validation Criteria
+F_VALIDATIONCRITERIA_ADD=Add/Update Validation Criteria
 F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
-F_VALIDATIONCRITERIA_UPDATE=Update Validation Criteria
 F_SEND_MESSAGE=Send message
 F_OPTIONSET_MANAGEMENT=Option Set Management
-F_OPTIONSET_ADD=Add Option Set
-F_OPTIONSET_UPDATE=Update Option Set
+F_OPTIONSET_ADD=Add/Update Option Set
 F_OPTIONSET_DELETE=Delete Option Set
 F_DATA_MART_ADMIN=Administrate data mart
 F_DV_ADMIN=Administrate data vizualiser
-F_CHART_PUBLIC_ADD=Add Public Chart
 F_MOBILE_SENDSMS=Send SMS
 F_MOBILE_SETTINGS=Set mobile settings
 F_PERFORM_MAINTENANCE=Perform maintenance tasks
@@ -250,9 +224,8 @@
 F_ELIMINATE_DUPLICATE_DATA_ELEMENTS=Eliminate duplicate data elements
 F_GENERATE_MIN_MAX_VALUES=Generate min-max values
 F_ARCHIVE_DATA=Archive data
-F_ATTRIBUTE_ADD=Add Attribute
+F_ATTRIBUTE_ADD=Add/Update Attribute
 F_ATTRIBUTE_DELETE=Delete Attribute
-F_ATTRIBUTE_UPDATE=Update Attribute
 F_MANAGE_INTEGRATION_ROUTES=Manage integration routes
 F_IMPORT_DATA=Import data
 F_EXPORT_DATA=Export data

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -23,9 +23,7 @@
 specify_description=Especificar descripci\u00f3n
 edit=Editar
 user_role=Rol de Usuario
-F_DATASET_UPDATE=Actualizar Conjunto de Datos
 role=Rol
-F_ORGUNITGROUP_UPDATE=Actualizar Grupo de Unidad Organizativa
 remove=Quitar
 data_sets=Datasets
 M_dhis-web-validationrule=Ver m\u00f3dulo de Reglas de Validaci\u00f3n
@@ -59,17 +57,12 @@
 F_DATAELEMENT_PUBLIC_ADD=A\u00f1adir Elemento de Dato
 F_DATAELEMENT_MINMAX_ADD=A\u00f1adir regla Minimo/Maximo
 M_dhis-web-openhealth-integration=Ver m\u00f3dulo de integraci\u00f3n de Openhealth
-F_USERROLE_UPDATE=Actualizar Rol de Usuario
 F_DATASET_ORDER_CHANGE=Cambiar orden en Conjunto de Datos
 M_dhis-web-gis=Ver m\u00f3dulo SIG
-F_VALIDATIONRULE_UPDATE=Actualizar Regla de Validaci\u00f3n
-F_VALIDATIONRULEGROUP_UPDATE=Actualizar Grupo de Reglas de Validaci\u00f3n
-F_INDICATORGROUP_UPDATE=Actualizar Grupo de Indicadores
 M_dhis-web-maintenance-settings=Ver m\u00f3dulo de mantenimiento de Configuraci\u00f3n
 roles=Rol
 F_GIS_CONFIGURATION_UPDATE=Cambiar Configuraci\u00f3n del SIG
 M_dhis-web-importexport=Ver m\u00f3dulo Importar-Exportar
-F_ORGANISATIONUNIT_UPDATE=Actualizar Unidad Organizativa
 add_new=A\u00f1adir nuevo
 F_ORGUNITGROUP_ADD=A\u00f1adir Grupo de Unidad Organizativa
 F_DATASET_LOCK=Bloquear Conjunto de Datos
@@ -77,13 +70,10 @@
 password=Contrase\u00f1a
 F_DATADICTIONARY_PUBLIC_ADD=A\u00f1adir Diccionario de Datos
 select_role=Seleccionar rol
-F_DATAELEMENTGROUP_UPDATE=Actualizar Grupos de Elementos de Datos
 selected_roles=Roles seleccionados
-F_DATAVALUE_UPDATE=Actualizar Valor de Dato
 F_INDICATORTYPE_ADD=A\u00f1adir Tipo de Indicador
 everything_is_ok=Todo es aceptable
 F_USERROLE_ADD=A\u00f1adir Rol de Usuario
-F_ORGUNITGROUPSET_UPDATE=Actualizar Conjunto de Grupos de Unidad Organizativa
 unit=Unidad
 user_management=Administraci\u00f3n de usuarios
 firstName=Nombre
@@ -91,7 +81,6 @@
 change=Cambiar
 F_INDICATOR_PUBLIC_ADD=A\u00f1adir Indicador
 F_ORGUNITGROUP_DELETE=Eliminar Grupo de Unidad Organizativa
-F_REPORT_UPDATE=Actualizar Informe
 details=Detalles
 operations=Operaciones
 specify_first_name=Especificar, por favor, nombre
@@ -102,7 +91,6 @@
 specify_name=Especificar un nombre
 available=Disponible
 change_password=Cambiar contrase\u00f1a
-F_DATAELEMENT_UPDATE=Actualizar Elemento de Dato
 F_REPORT_VIEW=Ver Informe
 specify_organisationunit=Especificar, por favor, una Unidad organizativa
 F_DATASET_PUBLIC_ADD=A\u00f1adir Conjunto de Datos
@@ -110,20 +98,15 @@
 M_dhis-web-dataentry-national=Ver listado lineal de moduo de entrada de datos
 save=Guardar
 F_DOCUMENT_DELETE=Eliminar Documento
-F_INDICATOR_UPDATE=Actualizar Indicador
 user_role_management=Administraci\u00f3n de rol de usuario
 surname=Apellido
-F_DATAELEMENT_MINMAX_UPDATE=Actualizar regla Minimo/Maximo
 saving_role_failed=Fallo al guardar rol
 specify_retype_password=Confirmar, por favor, la contrase\u00f1a
 M_dhis-web-maintenance-datadictionary=Ver m\u00f3dulo de mantenimiento del Diccionario de Datos
 F_USERROLE_DELETE=Eliminar Rol de Usuario
 M_dhis-web-maintenance-dataadmin=Ver m\u00f3dulo de Administraci\u00f3n de Datos
-F_INDICATORTYPE_UPDATE=Actualizar Tipo de Indicador
-F_USER_UPDATE=Actualizar Usuario
 organisation_unit=Unidad organizativa
 F_VALIDATIONRULE_DELETE=Eliminar Regla de Validaci\u00f3n
-F_DATADICTIONARY_UPDATE=Actualizar Diccionario de Datos
 specify_username=Especificar, por favor, el nombre de usuario
 create_new_user_role=Crear nuevo rol de usuario
 F_VALIDATIONRULEGROUP_DELETE=Eliminar Grupo de Reglas de Validaci\u00f3n
@@ -159,26 +142,20 @@
 F_CONCEPT_ADD=A\u00f1adir Concepto
 F_CONCEPT_DELETE=Eliminar Concepto
 F_CONCEPT_MANAGEMENT=Administraci\u00f3n de Conceptos
-F_CONCEPT_UPDATE=Actualizar Conceptos
 F_CONSTANT_ADD=A\u00f1adir Constante
 F_CONSTANT_DELETE=Eliminar Constante
 F_CONSTANT_MANAGEMENT=Administraci\u00f3n de Constantes
-F_CONSTANT_UPDATE=Actualizar Constante
 F_DATAADMIN_LOCK=Bloqueo de Datos de Administrador
 F_DATAADMIN_UNLOCK=Desbloqueo de Datos de Administrador
 F_DATAELEMENTGROUPSET_PUBLIC_ADD=A\u00f1adir Grupos de Elementos de Datos
 F_DATAELEMENTGROUPSET_DELETE=Eliminar Grupos de Elementos de Datos
-F_DATAELEMENTGROUPSET_UPDATE=Actualizar Grupos de Elementos de Datos
 F_SECTION_ADD=A\u00f1adir Secci\u00f3n
-F_SECTION_UPDATE=Actualizar Secci\u00f3n
 F_SECTION_DELETE=Eliminar Secci\u00f3n
 F_INDICATORGROUPSET_PUBLIC_ADD=A\u00f1adir Grupo de Indicadores
 F_INDICATORGROUPSET_DELETE=Eliminar Grupo de Indicadores
-F_INDICATORGROUPSET_UPDATE=Actualizar Grupo de Indicadores
 F_ORGANISATIONUNITLEVEL_UPDATE=Actualizar Grupo de Unidad Organizativa
 F_USERROLE_LIST=Listado de Roles de Usuario
 F_USERGROUP_PUBLIC_ADD=A\u00f1adir Grupo de Usuarios
-F_USERGROUP_UPDATE=Actualizar rol de usuario
 F_USERGROUP_DELETE=Eliminar Rol de Usuario
 F_USERGROUP_LIST=Listado de Grupos de Usuarios
 F_USER_VIEW=Ver usuarios
@@ -234,16 +211,13 @@
 F_SCHEDULING_ADMIN=Administraci\u00f3n de Programaci\u00f3n
 F_SQLVIEW_ADD=A\u00f1adir Vista SQL
 F_SQLVIEW_DELETE=Eliminar Vista SQL
-F_SQLVIEW_UPDATE=Actualizar Vista SQL
 F_SQLVIEW_EXECUTE=Ejecutar Vista SQL
 F_SQLVIEW_MANAGEMENT=Administraci\u00f3n de vistas SQL
 F_VALIDATIONCRITERIA_ADD=A\u00f1adir criterio de validaci\u00f3n
 F_VALIDATIONCRITERIA_DELETE=Eliminar criterio de validaci\u00f3n
-F_VALIDATIONCRITERIA_UPDATE=Actualizar criterio de validaci\u00f3n
 F_SEND_MESSAGE=Enviar mensaje
 F_OPTIONSET_MANAGEMENT=Administraci\u00f3n de Sets de Opciones
 F_OPTIONSET_ADD=A\u00f1adir Set de Opciones
-F_OPTIONSET_UPDATE=Actualizar Set de Opciones
 F_OPTIONSET_DELETE=Eliminar Set de Opciones
 F_DATA_MART_ADMIN=Administrar data mart
 F_DV_ADMIN=Administrar visualizador de datos
@@ -257,7 +231,6 @@
 F_ARCHIVE_DATA=Archivar datos
 F_ATTRIBUTE_ADD=A\u00f1adir atributo
 F_ATTRIBUTE_DELETE=Eliminar atributo
-F_ATTRIBUTE_UPDATE=Actualizar atributo
 fullname=Nombre completo
 organisation_units=Unidades organizativas
 confirm_delete_role=\u00bfEst\u00e1 seguro de eliminar este rol de usuario?

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -9,19 +9,15 @@
 F_DOCUMENT_PRIVATE_ADD=Ajouter Document priv\u00E9
 F_PATIENT_DELETE=Supprimer Personne
 F_DATAELEMENTGROUP_PUBLIC_ADD=Ajouter groupes d'\u00E9l\u00E9ments de donn\u00E9es
-F_SECTION_UPDATE=Modifier Section
 F_PATIENT_AGGREGATION=Agr\u00E9gation de personne
 saving_role_failed=Sauvegarde r\u00F4le \u00E9chou\u00E9
 filter_by_username=Filtrer par nom d'utilisateur
-F_USER_UPDATE=Modifier Utilisateur
 F_USERROLE_LIST=Lister les R\u00F4les d'Utilisateur
 F_INDICATORGROUP_PUBLIC_ADD=Ajouter groupe d'indicateurs
 F_PATIENTIDENTIFIERTYPE_ADD=Ajouter type identifiant de patient
 F_DATAADMIN_UNLOCK=D\u00E9verrouillage des donn\u00E9es
 F_VALIDATIONRULE_DELETE=Supprimer R\u00E8gle de Validation
 M_dhis-web-maintenance-dataadmin=Voir module Administration de Donn\u00E9es
-F_DATADICTIONARY_UPDATE=Mettre \u00E0 jour Dictionnaire des donn\u00E9es
-F_INDICATOR_UPDATE=Modifier indicateur
 F_PROGRAM_INSTANCE_MANAGEMENT=Gestion d'\u00E9v\u00E8nements de Prgramme
 password_is_not_valid=Mot de passe invalide
 F_METADATA_EXPORT=Exporter M\u00E9ta-Donn\u00E9es
@@ -50,7 +46,6 @@
 M_dhis-web-reporting=Voir module Rapport
 F_ORGUNITGROUP_ADD=Ajouter groupe d'unit\u00E9s d'organisation
 M_dhis-web-validationrule-local-in=Voir module Analyse de Validation
-F_VALIDATIONRULEGROUP_UPDATE=Modifier Groupe de R\u00E8gles de Validation
 F_PROGRAM_ATTRIBUTE_ADD=Ajouter Attribut de Programme
 F_PATIENT_DATAVALUE_DELETE=Supprimer valeur de donn\u00E9es de personne
 F_CHART_DELETE=Supprimer graphique
@@ -110,13 +105,11 @@
 F_USERROLE_DELETE=Supprimer R\u00F4le d'Utilisateur
 F_NAME_BASED_DATA_ENTRY=
 F_INDICATORGROUPSET_PUBLIC_ADD=Ajouter ensemble de groupes d'indicateurs
-F_ATTRIBUTE_UPDATE=Mettre \u00E0 jour attribut
 M_dhis-web-gis=Voir module SIG
 F_SYSTEM_SETTING=Modifier param\u00E8tres du syst\u00E8me
 F_PROGRAMSTAGE_SECTION_DELETE=Supprimer Section de Stade de Programme
 delete_current_user=Supprimer l'utilisateur courant
 F_SEND_MESSAGE=Envoyer Message
-F_VALIDATIONCRITERIA_UPDATE=Modifier Crit\u00E8res de Validation
 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
@@ -134,14 +127,12 @@
 select_role=S\u00E9lectionner r\u00F4le
 filter_by_role_name=Filtrer par nom de r\u00F4le
 F_DATASET_PRIVATE_ADD=Ajouter Ensemble de donn\u00E9es priv\u00E9
-F_DATAELEMENTGROUPSET_UPDATE=Modifier ensembles de groupes d'\u00E9l\u00E9ments de donn\u00E9es
 email_is_not_valid=E-mail invalide
 F_USER_ADD=Ajouter Utilisateur
 unit=Unit\u00E9
 specify_name=Veuillez sp\u00E9cifier un nom
 edit_user_group=Modifier groupe d'utilisateurs
 F_PATIENT_REMOVE_EMPTY_EVENTS=Supprimer les \u00E9v\u00E8nement de personne vides
-F_DATAELEMENT_MINMAX_UPDATE=Modifier r\u00E8gle de mini / maxi
 F_SQLVIEW_MANAGEMENT=Gestion Vue Sql
 M_dhis-web-mapping=Voir module SIG
 filter_by_name=Filtrer par nom
@@ -166,12 +157,9 @@
 F_DOCUMENT_DELETE=Supprimer document
 M_dhis-web-importexport=Voir module Import-export
 F_PROGRAM_STAGE_INSTANCE_DELETE=Supprimer Visite de Personne
-F_DATAELEMENT_UPDATE=Modier \u00E9l\u00E9ments de donn\u00E9es
 F_CONCEPT_MANAGEMENT=Gestion de Concept
 month=mois
-F_ORGANISATIONUNIT_UPDATE=Modifier Unit\u00E9 d'Organisation
 F_CHART_PUBLIC_ADD=Ajouter grphique public
-F_ORGUNITGROUPSET_UPDATE=Modifier ensemble de groupes d'unit\u00E9s d'organisation
 intro_self_registered_user=Voir et g\u00E9rer les utilisateurs qui se sont auto-enregistr\u00E9 pour un compte dans le syst\u00E8me.
 F_SECTION_DELETE=Supprimer Section
 F_VALIDATIONCRITERIA_DELETE=Supprimer Crit\u00E8res de Validation
@@ -182,11 +170,7 @@
 F_ACTIVITY_PLAN=Chercher Plan d'activit\u00E9s
 F_USER_DELETE=Supprimer Utilisateur
 F_VALIDATIONCRITERIA_ADD=Ajouter Crit\u00E8re de Validation
-F_DATASET_UPDATE=Modifier ensemble de donn\u00E9es
-F_DATAELEMENTGROUP_UPDATE=Modifier groupes d'\u00E9l\u00E9ments de donn\u00E9es
-F_USERGROUP_UPDATE=Modifier Groupe d'Utilisateurs
 intro_user_group=Cr\u00E9er des groupes d'utilisateurs pour les fonctionnalit\u00E9s qui doivent se baser sur un groupe d'utilisateurs, comme les notifications.
-F_DATAVALUE_UPDATE=Modifier valeur de donn\u00E9es
 F_MOBILE_SENDSMS=Envoyer un SMS
 F_COPY_EXCEL_ITEM_ADMINISTRATION=Copier \u00E9l\u00E9ment Tableur
 F_DATADICTIONARY_DELETE=Supprimer Dictionnaire des donn\u00E9es
@@ -205,7 +189,6 @@
 F_CHART_ADD=Ajouter graphique
 F_PATIENT_CHANGE_LOCATION=Changer r\u00E9sidence de personne
 F_MAP_PUBLIC_ADD=Ajouter Carte Publique
-F_CONCEPT_UPDATE=Modifier Concept
 F_VALIDATIONRULE_ADD=Ajouter R\u00E8gle de Validation
 M_dhis-web-caseentry=Voir module saisie de donn\u00E9e patient
 M_dhis-web-api=Voir Module API
@@ -213,8 +196,6 @@
 select_all_in_group=S\u00E9lectionner tout dans le groupe
 confirm_delete=Confirmer la suppression
 F_INDICATORTYPE_ADD=Ajouter type d'indicateur
-F_ORGUNITGROUP_UPDATE=Modifier groupe d'unit\u00E9s d'organisation
-F_INDICATORGROUPSET_UPDATE=Modifier ensemble de groupes d'indicateurs
 F_PATIENT_UPDATE=Modifier Personne
 F_USERROLE_ADD=Ajouter R\u00F4le d'Utilisateur
 F_VALIDATIONRULEGROUP_DELETE=Supprimer Groupe de R\u00E8gles de Validation
@@ -223,14 +204,12 @@
 F_VALIDATIONRULEGROUP_ADD=Ajouter Groupe de R\u00E8gles de Validation
 intro_user_role=Cr\u00E9er, modifier, afficher et supprimer les r\u00F4les des utilisateurs. Un r\u00F4le d'utilisateur est un ensemble de droits dans le syst\u00E8me.
 user_group=Groupe d'utilisateurs
-F_REPORT_UPDATE=Modifier Rapport
 adding_user_failed=Ajout utilisateur \u00E9chou\u00E9
 F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=Supprimer mod\u00E8le Tableur
 F_USERGROUP_DELETE=Supprimer Groupe d'Utilisateurs
 F_MOBILE_SETTINGS=G\u00E9rer les param\u00E8tres mobiles
 F_SINGLE_EVENT_DATA_ENTRY=Saisie de Donn\u00E9es d'Ev\u00E8nement Unique avec Enregistrement
 F_GIS_ADMIN=Administrer SIG
-F_VALIDATIONRULE_UPDATE=Modofier R\u00E8gle de Validation
 excel_importing=Importation tableur
 F_INDICATOR_PRIVATE_ADD=Ajouter Indicateur Priv\u00E9
 F_USERGROUP_PRIVATE_ADD=Ajouter Groupe d'Utilisateurs Priv\u00E9
@@ -280,21 +259,18 @@
 F_DATAADMIN_LOCK=Verrouillage des donn\u00E9es
 F_RELATIONSHIPTYPE_UPDATE=Modifier Type de Relation
 F_DATAELEMENTGROUPSET_DELETE=Supprimer ensembles de groupes d'\u00E9l\u00E9ments de donn\u00E9es
-F_CONSTANT_UPDATE=Modifier constante
 F_PROGRAM_DELETE=Supprimer Programme
 username=Nom d'utilisateur
 F_REPORT_VIEW=Afficher Rapport
 F_DATAELEMENT_MINMAX_DELETE=Supprimer r\u00E8gle de min / max
 F_DATAELEMENTGROUPSET_PRIVATE_ADD=Ajouter Ensembles de Groupes d'El\u00E9ments de Donn\u00E9es Priv\u00E9
 F_PERFORM_MAINTENANCE=Effectuer des t\u00E2ches de maintenance
-F_INDICATORTYPE_UPDATE=Modifier type d'indicateur
 F_RELATIONSHIP_ADD=Ajouter Relation de Personne
 everything_is_ok=Tout est ok
 object_not_deleted_associated_by_objects=L'objet n'est pas supprim\u00E9, car il est associ\u00E9 par des objets de type
 F_PROGRAM_TRACKING_SEARCH=Rechercher \u00E9v\u00E8nements avec enregistrement
 F_GENERATE_STATISTICAL_PROGRAM_REPORT=G\u00E9n\u00E9rer Rapport de Statistiques de Programme
 F_ADD_PATIENT_REGISTRATION_FORM=Ajouter formulaire d'inscription de personne
-F_USERROLE_UPDATE=Modifier R\u00F4le d'Utilisateur
 specify_retype_password=Veuillez confirmer le mot de passe
 F_ARCHIVE_DATA=Archive les donn\u00E9es
 F_ORGUNITGROUPSET_ADD=Ajouter ensemble de groupes d'unit\u00E9s d'organisation
@@ -314,9 +290,7 @@
 F_ORGUNITGROUPSET_DELETE=Supprimer ensemble de groupes d'unit\u00E9s d'organisation
 F_MYDATAMART_VIEW=Acc\u00E8s \u00E0 mon data mart
 F_PATIENT_ADD=Ajouter patient
-F_OPTIONSET_UPDATE=Mise \u00E0 jour le jeu d'options
 F_PRUNE_ORGANISATION_UNITS=Couper des unit\u00E9s d'organisation
-F_INDICATORGROUP_UPDATE=Modifier groupe d'indicateurs
 intro_user=Cr\u00E9er, modifier, consulter et supprimer des utilisateurs. Un utilisateur est associ\u00E9 \u00E0 des r\u00F4les d'utilisateur et une unit\u00E9 d'organisation.
 F_DATAELEMENT_MINMAX_ADD=Ajouter r\u00E8gle de min / max
 F_DATADICTIONARY_PUBLIC_ADD=Ajouter Dictionnaire des donn\u00E9es
@@ -331,7 +305,6 @@
 F_DATAMART_ADMIN=Administrer data mart
 F_CONSTANT_DELETE=Supprimer constante
 confirm_delete_role=Etes-vous s\u00FBr de vouloir supprimer le r\u00F4le de l'utilisateur?
-F_SQLVIEW_UPDATE=Modifier Vue Sql
 F_ACTIVITY_PLAN_EXPORT=Exporter le plan d'activit\u00E9s en XLS
 F_DATA_MART_ADMIN=Administrer data mart
 F_PROGRAMSTAGE_DELETE=Supprimer stade du programme

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -35,89 +35,66 @@
 F_CONCEPT_ADD=Tambahkan Konsep
 F_CONCEPT_DELETE=Hapus Konsep
 F_CONCEPT_MANAGEMENT=Manajemen Konsep
-F_CONCEPT_UPDATE=Perbaharui Konsep
 F_CONSTANT_ADD=Tambahkan Konstan
 F_CONSTANT_DELETE=Hapus Konstan
 F_CONSTANT_MANAGEMENT=Manajemen Konstan
-F_CONSTANT_UPDATE=Perbaharui Konstan
 F_DATAADMIN_LOCK=Kunci Data Admin
 F_DATAADMIN_UNLOCK=Buka Kunci Data Admin
 F_DATAELEMENT_PUBLIC_ADD=Tambahkan Elemen Data Umum
 F_DATAELEMENT_PRIVATE_ADD=Tambahkan Elemen Data Khusus
 F_DATAELEMENT_DELETE=Hapus Elemen Data
-F_DATAELEMENT_UPDATE=Perbaharui Elemen Data
 F_DATAELEMENTGROUP_PUBLIC_ADD=Tambahkan Kelompok Elemen Data Umum
 F_DATAELEMENTGROUP_PRIVATE_ADD=Tambahkan Kelompok Elemen Data Khusus
 F_DATAELEMENTGROUP_DELETE=Hapus Kelompok Elemen Data
-F_DATAELEMENTGROUP_UPDATE=Perbaharui Kelompok Elemen Data
 F_DATAELEMENTGROUPSET_PUBLIC_ADD=Tambahkan Set Kelompok Elemen Data Umum
 F_DATAELEMENTGROUPSET_PRIVATE_ADD=Tambahkan Set Kelompok Elemen Data Khusus
 F_DATAELEMENTGROUPSET_DELETE=Hapus Set Kelompok Elemen Data
-F_DATAELEMENTGROUPSET_UPDATE=Perbaharui Set Kelompok Elemen Data
 F_DATADICTIONARY_PUBLIC_ADD=Tambahkan Kamus Data Umum
 F_DATADICTIONARY_PRIVATE_ADD=Tambahkan Kamus Data Khusus
-F_DATADICTIONARY_UPDATE=Tambahkan Kamus Data
 F_DATADICTIONARY_DELETE=Hapus Kamus Data
 F_DATAELEMENT_MINMAX_ADD=Tambahkan Perintah Minimal/Maksimal
 F_DATAELEMENT_MINMAX_DELETE=Hapus Perintah Minimal/Maksimal
-F_DATAELEMENT_MINMAX_UPDATE=Tambahkan Perintah Minimal/Maksimal
 F_DATASET_PUBLIC_ADD=Tambahkan Data Set Umum
 F_DATASET_PRIVATE_ADD=Tambahkan Data Set Khusus
 F_DATASET_DELETE=Hapus Data Set
 F_DATASET_ORDER_CHANGE=Ubah Urutan Data Set
-F_DATASET_UPDATE=Perbaharui Data Set
 F_DATASET_LOCK=Kunci Data Set
 F_SECTION_ADD=Tambahkan Bagian
-F_SECTION_UPDATE=Perbaharui Bagian
 F_SECTION_DELETE=Hapus Bagian
 F_DATAVALUE_ADD=Tambahkan Nilai Data
 F_DATAVALUE_DELETE=Hapus Nilai Data
-F_DATAVALUE_UPDATE=Perbaharui Nilai Data
 F_INDICATORGROUP_PUBLIC_ADD=Tambahkan Kelompok Indikator Umum
 F_INDICATORGROUP_PRIVATE_ADD=Tambahkan Kelompok Indikator Khusus
 F_INDICATORGROUP_DELETE=Hapus Kelompok Indikator
-F_INDICATORGROUP_UPDATE=Perbaharui Kelompok Indikator
 F_INDICATORTYPE_ADD=Tambahkan Tipe Indikator
 F_INDICATORTYPE_DELETE=Hapus Tipe Indikator
-F_INDICATORTYPE_UPDATE=Perbaharui Tipe Indikator
 F_INDICATOR_PUBLIC_ADD=Tambahkan Indikator Umum
 F_INDICATOR_PRIVATE_ADD=Tambahkan Indikator Khusus
 F_INDICATOR_DELETE=Hapus Indikator
-F_INDICATOR_UPDATE=Perbaharui Indikator
 F_INDICATORGROUPSET_PUBLIC_ADD=Tambah Set Kelompok Indikator Umum
 F_INDICATORGROUPSET_PRIVATE_ADD=Tambah Set Kelompok Indikator Khusus
 F_INDICATORGROUPSET_DELETE=Hapus Set Kelompok Indikator
-F_INDICATORGROUPSET_UPDATE=Perbaharui Set Kelompok Indikator
 F_ORGANISATIONUNIT_ADD=Tambah Unit Organisasi
 F_ORGANISATIONUNIT_DELETE=Hapus Unit Organisasi
 F_ORGANISATIONUNIT_MOVE=Pindah Unit Organisasi
-F_ORGANISATIONUNIT_UPDATE=Perbaharui Unit Organisasi
 F_ORGUNITGROUP_ADD=Tambah Kelompok Unit Organisasi
 F_ORGUNITGROUP_DELETE=Hapus Kelompok Unit Organisasi
-F_ORGUNITGROUP_UPDATE=Perbaharui Kelompok Unit Organisasi
 F_ORGUNITGROUPSET_ADD=Tambah Set Kelompok Unit Organisasi
 F_ORGUNITGROUPSET_DELETE=Hapus Set Kelompok Unit Organisasi
-F_ORGUNITGROUPSET_UPDATE=Perbaharui Set Kelompok Unit Organisasi
 F_ORGANISATIONUNITLEVEL_UPDATE=Perbaharui Tingkatan Unit Organisasi
-F_REPORT_UPDATE=Perbaharui Laporan
 F_USERROLE_ADD=Tambah Peran Pengguna
 F_USERROLE_DELETE=Hapus Peran Pengguna
-F_USERROLE_UPDATE=Perbaharui Aturan Pengguna
 F_USERROLE_LIST=Daftar Peran Pengguna
 F_USERGROUP_PUBLIC_ADD=Tambahkan Kelompok Pengguna Publik
 F_USERGROUP_PRIVATE_ADD=Tambahkan Kelompok Pengguna Privat
-F_USERGROUP_UPDATE=Tambahkan Kelompok Pengguna
 F_USERGROUP_DELETE=Hapus Kelompok Pengguna
 F_USERGROUP_LIST=Daftar Kelompok Pengguna
 F_USER_ADD=Tambahkan Pengguna
 F_USER_DELETE=Hapus Pengguna
-F_USER_UPDATE=Update Pengguna
 F_USER_VIEW=Lihat Pengguna
 F_VALIDATIONRULE_ADD=Tambahkan Aturan Validasi
-F_VALIDATIONRULE_UPDATE=Update Aturan Validasi
 F_VALIDATIONRULE_DELETE=Hapus Aturan Validasi
 F_VALIDATIONRULEGROUP_ADD=Tambahkan kelompok Aturan Validasi
-F_VALIDATIONRULEGROUP_UPDATE=Update kelompok Aturan Validasi
 F_VALIDATIONRULEGROUP_DELETE=Hapus kelompok Aturan Validasi
 F_GIS_CONFIGURATION_UPDATE=Ubah konfigurasi SIG
 F_REPORT_PUBLIC_ADD=Tambahkan Laporan Publik
@@ -216,16 +193,13 @@
 F_SCHEDULING_ADMIN=Menjadwalkan Administrasi
 F_SQLVIEW_ADD=Tambahkan tampilan Sql
 F_SQLVIEW_DELETE=Hapus Tampilan Sql
-F_SQLVIEW_UPDATE=Update tampilan Sql
 F_SQLVIEW_EXECUTE=Jalankan tampilan Sql
 F_SQLVIEW_MANAGEMENT=Manajemen tampilan Sql
 F_VALIDATIONCRITERIA_ADD=Tambahkan kriteria Validasi
 F_VALIDATIONCRITERIA_DELETE=Hapus kriteria Validasi
-F_VALIDATIONCRITERIA_UPDATE=Update Kriteria Validasi
 F_SEND_MESSAGE=Kirim pesan
 F_OPTIONSET_MANAGEMENT=Opsi Pengaturan Manajemen 
 F_OPTIONSET_ADD=Tambahkan Opsi Set
-F_OPTIONSET_UPDATE=Update Opsi Set
 F_OPTIONSET_DELETE=Hapus Opsi Set
 F_DATA_MART_ADMIN=Administrasi data mart
 F_DV_ADMIN=Administrasi data vizualiser
@@ -240,7 +214,6 @@
 F_ARCHIVE_DATA=Arsip data
 F_ATTRIBUTE_ADD=Tambahkan atribut
 F_ATTRIBUTE_DELETE=Hapus Atribut
-F_ATTRIBUTE_UPDATE=Update Atribut
 F_MANAGE_INTEGRATION_ROUTES=Atur rute integrasi
 F_IMPORT_DATA=Import data
 F_EXPORT_DATA=Eksport data

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -31,80 +31,57 @@
 F_CONCEPT_ADD=Concept \u1011\u1015\u103a\u1019\u1036\u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
 F_CONCEPT_DELETE=Concept \u1000\u102d\u102f\u1016\u103b\u1000\u103a\u1015\u102b\u104b
 F_CONCEPT_MANAGEMENT=Concept \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u1001\u103c\u1004\u103a\u1038
-F_CONCEPT_UPDATE=Concept \u1000\u102d\u102f \u1015\u103c\u102f\u1015\u103c\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_CONSTANT_ADD=\u1000\u102d\u1014\u103a\u1038\u101e\u1031\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
 F_CONSTANT_DELETE=\u1000\u102d\u1014\u103a\u1038\u101e\u1031\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
 F_CONSTANT_MANAGEMENT=\u1000\u102d\u1014\u103a\u1038\u101e\u1031\u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u1001\u103c\u1004\u103a\u1038
-F_CONSTANT_UPDATE=\u1000\u102d\u1014\u103a\u1038\u101e\u1031\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u1001\u103c\u1004\u103a\u1038
 F_DATAADMIN_LOCK=Data Admin \u1000\u102d\u102f Lock \u1001\u103b\u1011\u102c\u1038\u1015\u102b\u101e\u100a\u103a\u104b
 F_DATAADMIN_UNLOCK=Data Admin \u1000\u102d\u102f Lock \u1019\u101c\u102f\u1015\u103a\u1011\u102c\u1038\u1015\u102b\u104b
 F_DATAELEMENT_PUBLIC_ADD=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DATAELEMENT_DELETE=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1016\u103b\u1000\u103a\u1015\u102b\u104b
-F_DATAELEMENT_UPDATE=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_DATAELEMENTGROUP_PUBLIC_ADD=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1021\u102f\u1015\u103a\u1005\u102f\u1019\u103b\u102c\u1038\u101e\u102d\u102f\u1037 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DATAELEMENTGROUP_DELETE=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1021\u102f\u1015\u103a\u1005\u102f\u1019\u103b\u102c\u1038\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_DATAELEMENTGROUP_UPDATE=Data \u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038\u1021\u102f\u1015\u103a\u1005\u102f\u1019\u103b\u102c\u1038\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_DATAELEMENTGROUPSET_PUBLIC_ADD=Add Data Element Group Sets
 F_DATAELEMENTGROUPSET_DELETE=Delete Data Element Group Sets
-F_DATAELEMENTGROUPSET_UPDATE=Update Data Element Group Sets
 F_DATADICTIONARY_PUBLIC_ADD=Data \u1021\u1018\u102d\u1013\u102b\u1014\u103a\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
-F_DATADICTIONARY_UPDATE=Data \u1021\u1018\u102d\u1013\u102b\u1014\u103a\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_DATADICTIONARY_DELETE=Data \u1021\u1018\u102d\u1013\u102b\u1014\u103a\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_DATAELEMENT_MINMAX_ADD=\u1021\u1014\u100a\u103a\u1038\u1006\u102f\u1036\u1038/\u1021\u1019\u103b\u102c\u1038\u1006\u102f\u1036\u1038 \u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DATAELEMENT_MINMAX_DELETE=\u1021\u1014\u100a\u103a\u1038\u1006\u102f\u1036\u1038/\u1021\u1019\u103b\u102c\u1038\u1006\u102f\u1036\u1038 \u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_DATAELEMENT_MINMAX_UPDATE=\u1021\u1014\u100a\u103a\u1038\u1006\u102f\u1036\u1038/\u1021\u1019\u103b\u102c\u1038\u1006\u102f\u1036\u1038 \u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_DATASET_PUBLIC_ADD=Data \u1021\u1005\u102f\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DATASET_DELETE=Data \u1021\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_DATASET_ORDER_CHANGE=Change order in Data Set
-F_DATASET_UPDATE=Data \u1021\u1005\u102f\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_DATASET_LOCK=Data \u1021\u1005\u102f\u1000\u102d\u102f Lock \u1001\u103b\u1011\u102c\u1038\u101e\u100a\u103a\u104b
 F_SECTION_ADD=\u1021\u1001\u1014\u103a\u1038\u1001\u103d\u1032\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_SECTION_UPDATE=\u1021\u1001\u1014\u103a\u1038\u1001\u103d\u1032\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_SECTION_DELETE=\u1021\u1001\u1014\u103a\u1038\u1001\u103d\u1032\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_DATAVALUE_ADD=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_DATAVALUE_DELETE=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_DATAVALUE_UPDATE=Data \u1010\u1014\u103a\u1016\u102d\u102f\u1038 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_INDICATORGROUP_PUBLIC_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_INDICATORGROUP_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_INDICATORGROUP_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_INDICATORTYPE_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_INDICATORTYPE_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_INDICATORTYPE_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u1019\u103b\u102d\u102f\u1038\u1021\u1005\u102c\u1038 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_INDICATOR_PUBLIC_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038 \u1015\u1031\u102b\u1004\u103a\u1038\u101e\u100a\u103a\u104b
 F_INDICATOR_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_INDICATOR_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_INDICATORGROUPSET_PUBLIC_ADD=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_INDICATORGROUPSET_DELETE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_INDICATORGROUPSET_UPDATE=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNIT_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNIT_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNIT_MOVE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u101b\u103d\u1031\u1037\u101e\u100a\u103a\u104b
-F_ORGANISATIONUNIT_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_ORGUNITGROUP_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_ORGUNITGROUP_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_ORGUNITGROUP_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_ORGUNITGROUPSET_ADD=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f\u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_ORGUNITGROUPSET_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_ORGUNITGROUPSET_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNITLEVEL_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1006\u1004\u1037\u103a \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_REPORT_DELETE=Delete Report
-F_REPORT_UPDATE=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_USERROLE_ADD=Add User Role
 F_USERROLE_DELETE=Delete User Role
-F_USERROLE_UPDATE=Update User Role
 F_USERROLE_LIST=List User Roles
 F_USERGROUP_PUBLIC_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_USERGROUP_UPDATE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_USERGROUP_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_USERGROUP_LIST=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1005\u102c\u101b\u1004\u103a\u1038
 F_USER_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1015\u1031\u102b\u1004\u103a\u1038\u101e\u100a\u103a\u104b
 F_USER_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_USER_UPDATE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_VALIDATIONRULE_ADD=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_VALIDATIONRULE_UPDATE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_VALIDATIONRULE_DELETE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_VALIDATIONRULEGROUP_ADD=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_VALIDATIONRULEGROUP_UPDATE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_VALIDATIONRULEGROUP_DELETE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_GIS_CONFIGURATION_UPDATE=GIS \u1015\u102f\u1036\u1005\u1036 \u1015\u103c\u1031\u102c\u1004\u103a\u1038\u101e\u100a\u103a\u104b
 F_REPORT_PUBLIC_ADD=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
@@ -171,16 +148,13 @@
 F_SCHEDULING_ADMIN=Scheduling Administration
 F_SQLVIEW_ADD=Sql view \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
 F_SQLVIEW_DELETE=Sql view \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
-F_SQLVIEW_UPDATE=Sql view \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u1015\u102b\u104b
 F_SQLVIEW_EXECUTE=Sql view \u1000\u102d\u102f \u1006\u1031\u102c\u1004\u103a\u101b\u103d\u1000\u103a\u1015\u102b\u104b
 F_SQLVIEW_MANAGEMENT=Sql view \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103c\u1004\u103a\u1038
 F_VALIDATIONCRITERIA_ADD=Add Validation Criteria
 F_VALIDATIONCRITERIA_DELETE=Delete Validation Criteria
-F_VALIDATIONCRITERIA_UPDATE=Update Validation Criteria
 F_SEND_MESSAGE=messagae \u1015\u102d\u102f\u1037\u1015\u102b\u104b
 F_OPTIONSET_MANAGEMENT=Option set management
 F_OPTIONSET_ADD=Option set \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u1015\u102b\u104b
-F_OPTIONSET_UPDATE=Option set \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u1015\u102b\u104b
 F_OPTIONSET_DELETE=Option set \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u1015\u102b\u104b
 F_DATA_MART_ADMIN=data mart \u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\u1015\u102b\u104b
 F_DV_ADMIN=Administrate data vizualiser

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -9,20 +9,16 @@
 F_DOCUMENT_PRIVATE_ADD=Adicionar documento particular
 F_PATIENT_DELETE=Eliminar Paciente
 F_DATAELEMENTGROUP_PUBLIC_ADD=Adicionar Grupos de Elementos de Dados
-F_SECTION_UPDATE=Actualizar sec\u00E7\u00E3o
 F_PATIENT_AGGREGATION=Agraga\u00E7\u00E3o do benefici\u00E1rio
 saving_role_failed=Falha na grava\u00E7\u00E3o da fun\u00E7\u00E3o
 F_DATASET_ADD=Adicionar Conjunto de Dados
 filter_by_username=Filtrar por nome de utilizador
-F_USER_UPDATE=Actualizar utilizador
 F_USERROLE_LIST=Lista de fun\u00E7\u00F5es de utilizador
 F_INDICATORGROUP_PUBLIC_ADD=Adicionar Grupo Indicadores
 F_PATIENTIDENTIFIERTYPE_ADD=Adiccionar Tipo de Identificador do Paciente
 F_DATAADMIN_UNLOCK=Desbloqueio de Administrac\u00E3o de Dados
 F_VALIDATIONRULE_DELETE=Eliminar Regra de Valida\u00E7\u00E3o
 M_dhis-web-maintenance-dataadmin=Ver m\u00F3dulo de Administra\u00E7\u00E3o de Dados
-F_DATADICTIONARY_UPDATE=Actualizar Dicion\u00E1rio Dados
-F_INDICATOR_UPDATE=Actualizar Indicador
 F_PROGRAM_INSTANCE_MANAGEMENT=Gerir programa de eventos
 password_is_not_valid=Password inv\u00E1lida
 F_METADATA_EXPORT=Exportar Meta-Dados
@@ -51,7 +47,6 @@
 M_dhis-web-reporting=Ver m\u00F3dulo de Relat\u00F3rios
 F_ORGUNITGROUP_ADD=Adicionar Grupo de Unidade Organizacional
 M_dhis-web-validationrule-local-in=Ver m\u00F3dulo de An\u00E1lise de Valida\u00E7\u00E3o
-F_VALIDATIONRULEGROUP_UPDATE=Actualizar grupo de regra de valida\u00E7\u00E3o
 F_PROGRAM_ATTRIBUTE_ADD=Adiccionar Atributo de Programa
 F_PATIENT_DATAVALUE_DELETE=Eliminar valores de dados por benefici\u00E1rio
 F_CHART_DELETE=Apagar Gr\u00E1fico
@@ -115,13 +110,11 @@
 F_USERROLE_DELETE=Apagar Papel do Usu\u00E1rio
 F_NAME_BASED_DATA_ENTRY=M\u00FAltipla entrada de dados individuais 
 F_INDICATORGROUPSET_PUBLIC_ADD=Adicionar Grupo Indicadores
-F_ATTRIBUTE_UPDATE=Actualizar atributo
 M_dhis-web-gis=Ver m\u00F3dulo GIS
 F_SYSTEM_SETTING=Alterar as configura\u00E7\u00F5es do sistema
 F_PROGRAMSTAGE_SECTION_DELETE=Eliminar sec\u00E7\u00E3o de est\u00E1gio programa
 delete_current_user=Excluir utilizador corrente
 F_SEND_MESSAGE=Enviar mensagem
-F_VALIDATIONCRITERIA_UPDATE=Actualizar Crit\u00E9rios de Valida\u00E7\u00E3o
 F_DATADICTIONARY_PRIVATE_ADD=Adicionar Dicion\u00E1rio de Dados Privado
 specify_organisationunit=Favor especifique uma unidade organizacional
 F_PATIENTATTRIBUTE_UPDATE=Actualizar Atributo de Paciente
@@ -139,14 +132,12 @@
 select_role=Seleccione fun\u00E7\u00E3o
 filter_by_role_name=Filtrar por nome da fun\u00E7\u00E3o
 F_DATASET_PRIVATE_ADD=Adicionar conjunto de dados privados
-F_DATAELEMENTGROUPSET_UPDATE=Actualizar Grupos de Elementos de Dados
 email_is_not_valid=E-mail inv\u00E1lido
 F_USER_ADD=Adiccionar utilizador
 unit=Unidade
 specify_name=Por favor, especifique um nome
 edit_user_group=Editar grupo de utilizadores
 F_PATIENT_REMOVE_EMPTY_EVENTS=Remover eventos do benefici\u00E1rio vazios
-F_DATAELEMENT_MINMAX_UPDATE=Actualizar regra min/max
 F_SQLVIEW_MANAGEMENT=Gest\u00E3o de Vista SQL
 M_dhis-web-mapping=Ver m\u00F3dulo GIS
 filter_by_name=Filtrar por nome
@@ -173,12 +164,9 @@
 F_DOCUMENT_DELETE=Eliminar Documento
 M_dhis-web-importexport=Ver m\u00F3dulo de importa\u00E7\u00E3o/exporta\u00E7\u00E3o
 F_PROGRAM_STAGE_INSTANCE_DELETE=Eliminar visita da pessoa
-F_DATAELEMENT_UPDATE=Actualizar Elemento Dados
 F_CONCEPT_MANAGEMENT=Gest\u00E3o de Conceito
 month=m\u00EAs
-F_ORGANISATIONUNIT_UPDATE=Actualizar Unidade Organizacional
 F_CHART_PUBLIC_ADD=Adicionar gr\u00E1fico p\u00FAblico
-F_ORGUNITGROUPSET_UPDATE=Actualizar Set Grupo Unidade Organizacional
 intro_self_registered_user=Ver e gerenciar utilizadores que se auto registam para uma conta pessoal de utilizador no sistema.
 F_SECTION_DELETE=Eliminar sec\u00E7\u00E3o
 F_VALIDATIONCRITERIA_DELETE=Eliminar Crit\u00E9rios de Valida\u00E7\u00E3o
@@ -190,12 +178,8 @@
 F_USER_DELETE=Eliminar utilizador
 F_DOCUMENT_ADD=Adiccionar Documento
 F_VALIDATIONCRITERIA_ADD=Adiccionar Crit\u00E9rios de Valida\u00E7\u00E3o
-F_DATASET_UPDATE=Actualizar Conjunto de Dados
-F_DATAELEMENTGROUP_UPDATE=Actualizar Grupos de Elementos de Dados
-F_USERGROUP_UPDATE=Actualizar Papel do Usu\u00E1rio
 F_INDICATOR_ADD=Adicionar Indicador
 intro_user_group=Criar grupos de utilizadores para a funcionalidade que deve trabalhar em um grupo de utilizadores, como notifica\u00E7\u00F5es.
-F_DATAVALUE_UPDATE=Actualizar Valor Dados
 F_MOBILE_SENDSMS=Enviar SMS
 F_COPY_EXCEL_ITEM_ADMINISTRATION=Copiar Item Excel
 F_DATADICTIONARY_DELETE=Apagar Dicion\u00E1rio Dados
@@ -214,7 +198,6 @@
 F_CHART_ADD=Adicionar Gr\u00E1fico
 F_PATIENT_CHANGE_LOCATION=Alterar morada do benefici\u00E1rio
 F_MAP_PUBLIC_ADD=Adicionar um mapa p\u00FAblico 
-F_CONCEPT_UPDATE=Actualizar Conceito
 F_VALIDATIONRULE_ADD=Adiccionar Regra de Valida\u00E7\u00E3o
 M_dhis-web-caseentry=Ver m\u00F3dulo de Entrada de Dados Baseados em Casos
 M_dhis-web-api=Ver o M\u00F3dulo API
@@ -222,8 +205,6 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_ORGUNITGROUP_UPDATE=Actualizar Grupo Unidade Organizacional
-F_INDICATORGROUPSET_UPDATE=Actualizar Grupo Indicadores
 F_PATIENT_UPDATE=Actualizar Paciente
 F_USERROLE_ADD=Adicionar Papel do Usu\u00E1rio
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
@@ -232,14 +213,12 @@
 F_VALIDATIONRULEGROUP_ADD=Adiccionar grupo de regra de valida\u00E7\u00E3o
 intro_user_role=Criar, modificar, visualizar e excluir fun\u00E7\u00F5es de utilizador. Uma fun\u00E7\u00E3o de utilizador tem um conjunto de autoridades no sistema.
 user_group=Grupo de Usu\u00E1rios
-F_REPORT_UPDATE=Actualizar Relat\u00F3rio
 adding_user_failed=Falha na adic\u00E7\u00E3o de utilizador
 F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=Eliminar Modelo de Excel
 F_USERGROUP_DELETE=Apagar Papel do Usu\u00E1rio
 F_MOBILE_SETTINGS=Definir configura\u00E7\u00F5es de m\u00F3veis
 F_SINGLE_EVENT_DATA_ENTRY=Evento \u00DAnico Com Registro de Entrada de Dados
 F_GIS_ADMIN=Administrar GIS
-F_VALIDATIONRULE_UPDATE=Actualizar Regra de Valida\u00E7\u00E3o
 excel_importing=Importar de Excel
 F_INDICATOR_PRIVATE_ADD=Adicionar indicador privado
 F_USERGROUP_PRIVATE_ADD=Adicionar grupo privado do utilizador
@@ -294,13 +273,11 @@
 F_DATAADMIN_LOCK=Bloqueio de Administrac\u00E3o de Dados
 F_RELATIONSHIPTYPE_UPDATE=Actualizar Tipo de Rela\u00E7\u00E3o
 F_DATAELEMENTGROUPSET_DELETE=Apagar Grupos de Elementos de Dados
-F_CONSTANT_UPDATE=Actualizar Constante
 F_PROGRAM_DELETE=Eliminar Programa
 username=Nome de utilizador
 F_REPORT_VIEW=Ver Relat\u00F3rio
 F_DATAELEMENT_MINMAX_DELETE=Apagar regra min/max
 F_DATAELEMENTGROUPSET_PRIVATE_ADD=Adicionar grupo elemento privado de conjuntos de dados
-F_INDICATORTYPE_UPDATE=Actualizar Tipo Indicador
 F_PERFORM_MAINTENANCE=Executar tarefas de manuten\u00E7\u00E3o
 F_RELATIONSHIP_ADD=Adiccionar Relacionamento
 everything_is_ok=Tudo est\u00E1 nos conformes\!
@@ -308,7 +285,6 @@
 F_PROGRAM_TRACKING_SEARCH=Procurar eventos com registro
 F_GENERATE_STATISTICAL_PROGRAM_REPORT=Gerar relat\u00F3rio estatistico do Programa 
 F_ADD_PATIENT_REGISTRATION_FORM=Adicionar Formul\u00E1rio de Inscri\u00E7\u00E3o da Pessoa
-F_USERROLE_UPDATE=Actualizar Papel do Usu\u00E1rio
 F_ARCHIVE_DATA=Arquivo de dados
 specify_retype_password=Por favor, confirme a password
 F_ORGUNITGROUPSET_ADD=Adicionar Set Grupo Unidade Organizacional
@@ -328,11 +304,9 @@
 F_ORGANISATIONUNIT_DELETE=Apagar Unidade Organizacional
 F_ORGUNITGROUPSET_DELETE=Apagar Set Grupo de Unidade Organizacional
 F_MYDATAMART_VIEW=Aceder aos meus dados 
-F_OPTIONSET_UPDATE=Actualizar Conjunto de Op\u00E7\u00E3o
 F_PATIENT_ADD=Adiccionar Paciente
 F_PRUNE_ORGANISATION_UNITS=Limpar Unidades Organizacionais
 intro_user=Criar, modificar, visualizar e excluir utilizadores. Um utilizador est\u00E1 associado a fun\u00E7\u00F5es de utilizador e uma unidade organizacional.
-F_INDICATORGROUP_UPDATE=Actualizar Grupo Indicadores
 F_DATAELEMENT_MINMAX_ADD=Adicionar regra para min/max
 F_DATADICTIONARY_PUBLIC_ADD=Adicionar Dicion\u00E1rio Dados
 F_DATASET_DELETE=Apagar Conjunto de Dados
@@ -346,7 +320,6 @@
 F_CONSTANT_DELETE=Eliminar Constante
 confirm_delete_role=Tem certeza que deseja remover o papel do utilizador?
 F_ACTIVITY_PLAN_EXPORT=Exportar o plano de actividades para ficheiro xls
-F_SQLVIEW_UPDATE=Actualizar Vista SQL
 F_DATA_MART_ADMIN=Administrar data mart
 F_RELATIONSHIP_DELETE=Eliminar Rela\u00E7\u00E3o
 F_PROGRAMSTAGE_DELETE=Eliminar Est\u00E1gio do Programa

=== 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-05-01 12:55:57 +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-25 09:37:43 +0000
@@ -9,20 +9,16 @@
 F_DOCUMENT_PRIVATE_ADD=Adicionar documento particular
 F_PATIENT_DELETE=Eliminar Paciente
 F_DATAELEMENTGROUP_PUBLIC_ADD=Adicionar Grupos de Elementos de Dados
-F_SECTION_UPDATE=Actualizar sec\u00E7\u00E3o
 F_PATIENT_AGGREGATION=Agraga\u00E7\u00E3o do benefici\u00E1rio
 saving_role_failed=Falha na grava\u00E7\u00E3o da fun\u00E7\u00E3o
 F_DATASET_ADD=Adicionar Conjunto de Dados
 filter_by_username=Filtrar por nome de utilizador
-F_USER_UPDATE=Actualizar utilizador
 F_USERROLE_LIST=Lista de fun\u00E7\u00F5es de utilizador
 F_INDICATORGROUP_PUBLIC_ADD=Adicionar Grupo Indicadores
 F_PATIENTIDENTIFIERTYPE_ADD=Adiccionar Tipo de Identificador do Paciente
 F_DATAADMIN_UNLOCK=Desbloqueio de Administrac\u00E3o de Dados
 F_VALIDATIONRULE_DELETE=Eliminar Regra de Valida\u00E7\u00E3o
 M_dhis-web-maintenance-dataadmin=Ver m\u00F3dulo de Administra\u00E7\u00E3o de Dados
-F_DATADICTIONARY_UPDATE=Actualizar Dicion\u00E1rio Dados
-F_INDICATOR_UPDATE=Actualizar Indicador
 F_PROGRAM_INSTANCE_MANAGEMENT=Gerir programa de eventos
 password_is_not_valid=Password inv\u00E1lida
 F_METADATA_EXPORT=Exportar Meta-Dados
@@ -51,7 +47,6 @@
 M_dhis-web-reporting=Ver m\u00F3dulo de Relat\u00F3rios
 F_ORGUNITGROUP_ADD=Adicionar Grupo de Unidade Organizacional
 M_dhis-web-validationrule-local-in=Ver m\u00F3dulo de An\u00E1lise de Valida\u00E7\u00E3o
-F_VALIDATIONRULEGROUP_UPDATE=Actualizar grupo de regra de valida\u00E7\u00E3o
 F_PROGRAM_ATTRIBUTE_ADD=Adiccionar Atributo de Programa
 F_PATIENT_DATAVALUE_DELETE=Eliminar valores de dados por benefici\u00E1rio
 F_CHART_DELETE=Apagar Gr\u00E1fico
@@ -115,13 +110,11 @@
 F_USERROLE_DELETE=Apagar Papel do Usu\u00E1rio
 F_NAME_BASED_DATA_ENTRY=M\u00FAltipla entrada de dados individuais 
 F_INDICATORGROUPSET_PUBLIC_ADD=Adicionar Grupo Indicadores
-F_ATTRIBUTE_UPDATE=Actualizar atributo
 M_dhis-web-gis=Ver m\u00F3dulo GIS
 F_SYSTEM_SETTING=Alterar as configura\u00E7\u00F5es do sistema
 F_PROGRAMSTAGE_SECTION_DELETE=Eliminar sec\u00E7\u00E3o de est\u00E1gio programa
 delete_current_user=Excluir utilizador corrente
 F_SEND_MESSAGE=Enviar mensagem
-F_VALIDATIONCRITERIA_UPDATE=Actualizar Crit\u00E9rios de Valida\u00E7\u00E3o
 F_DATADICTIONARY_PRIVATE_ADD=Adicionar Dicion\u00E1rio de Dados Privado
 specify_organisationunit=Favor especifique uma unidade organizacional
 F_PATIENTATTRIBUTE_UPDATE=Actualizar Atributo de Paciente
@@ -139,14 +132,12 @@
 select_role=Seleccione fun\u00E7\u00E3o
 filter_by_role_name=Filtrar por nome da fun\u00E7\u00E3o
 F_DATASET_PRIVATE_ADD=Adicionar conjunto de dados privados
-F_DATAELEMENTGROUPSET_UPDATE=Actualizar Grupos de Elementos de Dados
 email_is_not_valid=E-mail inv\u00E1lido
 F_USER_ADD=Adiccionar utilizador
 unit=Unidade
 specify_name=Por favor, especifique um nome
 edit_user_group=Editar grupo de utilizadores
 F_PATIENT_REMOVE_EMPTY_EVENTS=Remover eventos do benefici\u00E1rio vazios
-F_DATAELEMENT_MINMAX_UPDATE=Actualizar regra min/max
 F_SQLVIEW_MANAGEMENT=Gest\u00E3o de Vista SQL
 M_dhis-web-mapping=Ver m\u00F3dulo GIS
 filter_by_name=Filtrar por nome
@@ -173,12 +164,9 @@
 F_DOCUMENT_DELETE=Eliminar Documento
 M_dhis-web-importexport=Ver m\u00F3dulo de importa\u00E7\u00E3o/exporta\u00E7\u00E3o
 F_PROGRAM_STAGE_INSTANCE_DELETE=Eliminar visita da pessoa
-F_DATAELEMENT_UPDATE=Actualizar Elemento Dados
 F_CONCEPT_MANAGEMENT=Gest\u00E3o de Conceito
 month=m\u00EAs
-F_ORGANISATIONUNIT_UPDATE=Actualizar Unidade Organizacional
 F_CHART_PUBLIC_ADD=Adicionar gr\u00E1fico p\u00FAblico
-F_ORGUNITGROUPSET_UPDATE=Actualizar Set Grupo Unidade Organizacional
 intro_self_registered_user=Ver e gerenciar utilizadores que se auto registam para uma conta pessoal de utilizador no sistema.
 F_SECTION_DELETE=Eliminar sec\u00E7\u00E3o
 F_VALIDATIONCRITERIA_DELETE=Eliminar Crit\u00E9rios de Valida\u00E7\u00E3o
@@ -190,12 +178,8 @@
 F_USER_DELETE=Eliminar utilizador
 F_DOCUMENT_ADD=Adiccionar Documento
 F_VALIDATIONCRITERIA_ADD=Adiccionar Crit\u00E9rios de Valida\u00E7\u00E3o
-F_DATASET_UPDATE=Actualizar Conjunto de Dados
-F_DATAELEMENTGROUP_UPDATE=Actualizar Grupos de Elementos de Dados
-F_USERGROUP_UPDATE=Actualizar Papel do Usu\u00E1rio
 F_INDICATOR_ADD=Adicionar Indicador
 intro_user_group=Criar grupos de utilizadores para a funcionalidade que deve trabalhar em um grupo de utilizadores, como notifica\u00E7\u00F5es.
-F_DATAVALUE_UPDATE=Actualizar Valor Dados
 F_MOBILE_SENDSMS=Enviar SMS
 F_COPY_EXCEL_ITEM_ADMINISTRATION=Copiar Item Excel
 F_DATADICTIONARY_DELETE=Apagar Dicion\u00E1rio Dados
@@ -214,7 +198,6 @@
 F_CHART_ADD=Adicionar Gr\u00E1fico
 F_PATIENT_CHANGE_LOCATION=Alterar morada do benefici\u00E1rio
 F_MAP_PUBLIC_ADD=Adicionar um mapa p\u00FAblico 
-F_CONCEPT_UPDATE=Actualizar Conceito
 F_VALIDATIONRULE_ADD=Adiccionar Regra de Valida\u00E7\u00E3o
 M_dhis-web-caseentry=Ver m\u00F3dulo de Entrada de Dados Baseados em Casos
 M_dhis-web-api=Ver o M\u00F3dulo API
@@ -222,8 +205,6 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_ORGUNITGROUP_UPDATE=Actualizar Grupo Unidade Organizacional
-F_INDICATORGROUPSET_UPDATE=Actualizar Grupo Indicadores
 F_PATIENT_UPDATE=Actualizar Paciente
 F_USERROLE_ADD=Adicionar Papel do Usu\u00E1rio
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
@@ -232,14 +213,12 @@
 F_VALIDATIONRULEGROUP_ADD=Adiccionar grupo de regra de valida\u00E7\u00E3o
 intro_user_role=Criar, modificar, visualizar e excluir fun\u00E7\u00F5es de utilizador. Uma fun\u00E7\u00E3o de utilizador tem um conjunto de autoridades no sistema.
 user_group=Grupo de Usu\u00E1rios
-F_REPORT_UPDATE=Actualizar Relat\u00F3rio
 adding_user_failed=Falha na adic\u00E7\u00E3o de utilizador
 F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=Eliminar Modelo de Excel
 F_USERGROUP_DELETE=Apagar Papel do Usu\u00E1rio
 F_MOBILE_SETTINGS=Definir configura\u00E7\u00F5es de m\u00F3veis
 F_SINGLE_EVENT_DATA_ENTRY=Evento \u00DAnico Com Registro de Entrada de Dados
 F_GIS_ADMIN=Administrar GIS
-F_VALIDATIONRULE_UPDATE=Actualizar Regra de Valida\u00E7\u00E3o
 excel_importing=Importar de Excel
 F_INDICATOR_PRIVATE_ADD=Adicionar indicador privado
 F_USERGROUP_PRIVATE_ADD=Adicionar grupo privado do utilizador
@@ -294,13 +273,11 @@
 F_DATAADMIN_LOCK=Bloqueio de Administrac\u00E3o de Dados
 F_RELATIONSHIPTYPE_UPDATE=Actualizar Tipo de Rela\u00E7\u00E3o
 F_DATAELEMENTGROUPSET_DELETE=Apagar Grupos de Elementos de Dados
-F_CONSTANT_UPDATE=Actualizar Constante
 F_PROGRAM_DELETE=Eliminar Programa
 username=Nome de utilizador
 F_REPORT_VIEW=Ver Relat\u00F3rio
 F_DATAELEMENT_MINMAX_DELETE=Apagar regra min/max
 F_DATAELEMENTGROUPSET_PRIVATE_ADD=Adicionar grupo elemento privado de conjuntos de dados
-F_INDICATORTYPE_UPDATE=Actualizar Tipo Indicador
 F_PERFORM_MAINTENANCE=Executar tarefas de manuten\u00E7\u00E3o
 F_RELATIONSHIP_ADD=Adiccionar Relacionamento
 everything_is_ok=Tudo est\u00E1 nos conformes\!
@@ -308,7 +285,6 @@
 F_PROGRAM_TRACKING_SEARCH=Procurar eventos com registro
 F_GENERATE_STATISTICAL_PROGRAM_REPORT=Gerar relat\u00F3rio estatistico do Programa 
 F_ADD_PATIENT_REGISTRATION_FORM=Adicionar Formul\u00E1rio de Inscri\u00E7\u00E3o da Pessoa
-F_USERROLE_UPDATE=Actualizar Papel do Usu\u00E1rio
 F_ARCHIVE_DATA=Arquivo de dados
 specify_retype_password=Por favor, confirme a password
 F_ORGUNITGROUPSET_ADD=Adicionar Set Grupo Unidade Organizacional
@@ -328,11 +304,9 @@
 F_ORGANISATIONUNIT_DELETE=Apagar Unidade Organizacional
 F_ORGUNITGROUPSET_DELETE=Apagar Set Grupo de Unidade Organizacional
 F_MYDATAMART_VIEW=Aceder aos meus dados 
-F_OPTIONSET_UPDATE=Actualizar Conjunto de Op\u00E7\u00E3o
 F_PATIENT_ADD=Adiccionar Paciente
 F_PRUNE_ORGANISATION_UNITS=Limpar Unidades Organizacionais
 intro_user=Criar, modificar, visualizar e excluir utilizadores. Um utilizador est\u00E1 associado a fun\u00E7\u00F5es de utilizador e uma unidade organizacional.
-F_INDICATORGROUP_UPDATE=Actualizar Grupo Indicadores
 F_DATAELEMENT_MINMAX_ADD=Adicionar regra para min/max
 F_DATADICTIONARY_PUBLIC_ADD=Adicionar Dicion\u00E1rio Dados
 F_DATASET_DELETE=Apagar Conjunto de Dados
@@ -346,7 +320,6 @@
 F_CONSTANT_DELETE=Eliminar Constante
 confirm_delete_role=Tem certeza que deseja remover o papel do utilizador?
 F_ACTIVITY_PLAN_EXPORT=Exportar o plano de actividades para ficheiro xls
-F_SQLVIEW_UPDATE=Actualizar Vista SQL
 F_DATA_MART_ADMIN=Administrar data mart
 F_RELATIONSHIP_DELETE=Eliminar Rela\u00E7\u00E3o
 F_PROGRAMSTAGE_DELETE=Eliminar Est\u00E1gio do Programa

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -26,7 +26,6 @@
 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
-F_INDICATORGROUPSET_UPDATE=C\u1eadp nh\u1eadt T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
 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
 available_users=Ng\u01b0\u1eddi d\u00f9ng c\u00f3 s\u1eb5n
@@ -38,11 +37,9 @@
 F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=T\u1ea3i t\u1eadp tin excel m\u1eabu
 user_role=Ph\u00e2n quy\u1ec1n
 F_CONCEPT_MANAGEMENT=Qu\u1ea3n l\u00fd Concept
-F_DATASET_UPDATE=C\u1eadp nh\u1eadt t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
 select_all_in_group=Ch\u1ecdn t\u1ea5t c\u1ea3 trong nh\u00f3m
 role=Ph\u00e2n quy\u1ec1n
 F_PROGRAM_ATTRIBUTE_ADD=Th\u00eam Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
-F_ORGUNITGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m \u0111\u01a1n v\u1ecb
 remove=X\u00f3a
 remove_all_in_group=X\u00f3a t\u1ea5t c\u1ea3 trong nh\u00f3m
 data_sets=Datasets
@@ -94,7 +91,6 @@
 F_DATAELEMENT_MINMAX_ADD=Th\u00eam gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
 M_dhis-web-openhealth-integration=Xem ch\u1ee9c n\u0103ng Open Health
 intro_user_role=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng. M\u1ed9t ph\u00e2n quy\u1ec1n c\u00f3 m\u1ed9t t\u1eadp c\u00e1c th\u1ea9m quy\u1ec1n nh\u1ea5t \u0111\u1ecbnh.
-F_USERROLE_UPDATE=C\u1eadp nh\u1eadt quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
 F_SYSTEM_SETTING=Thay \u0111\u1ed5i c\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng
 F_DATASET_ORDER_CHANGE=Thay \u0111\u1ed5i th\u1ee9 t\u1ef1 t\u1eadp h\u1ee3p d\u1eef li\u1ec7u
 F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=\u0110\u1ed5i t\u00ean t\u1eadp tin excel m\u1eabu
@@ -102,10 +98,7 @@
 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_VALIDATIONRULE_UPDATE=C\u1eadp nh\u1eadt lu\u1eadt ki\u1ec3m tra t\u00ednh h\u1ee3p l\u1ec7
 F_PROGRAM_UPDATE=C\u1eadp nh\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
-F_VALIDATIONRULEGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m quy t\u1eafc
-F_INDICATORGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ch\u1ec9 s\u1ed1
 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
@@ -113,10 +106,8 @@
 members_of_the_group=Nh\u00f3m \u0111\u01a1n v\u1ecb
 M_dhis-web-exportdatamart=Xem ch\u1ee9c n\u0103ng Xu\u1ea5t Tr\u00edch D\u1eef Li\u1ec7u
 M_dhis-web-importexport=Xem ch\u1ee9c n\u0103ng T\u00edch H\u1ee3p - Xu\u1ea5t Tr\u00edch d\u1eef li\u1ec7u
-F_ORGANISATIONUNIT_UPDATE=C\u1eadp nh\u1eadt \u0111\u01a1n v\u1ecb
 _dhis-web-dashboard=Xem ch\u1ee9c n\u0103ng b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
 F_DATAMART_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
-F_USERGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 add_new=Th\u00eam m\u1edbi
 F_ORGUNITGROUP_ADD=Th\u00eam nh\u00f3m \u0111\u01a1n v\u1ecb
 password_is_not_valid=M\u1eadt kh\u1ea9u kh\u00f4ng h\u1ee3p l\u1ec7
@@ -130,18 +121,14 @@
 F_DATADICTIONARY_PUBLIC_ADD=Th\u00eam t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
 select_role=Ch\u1ecdn ph\u00e2n quy\u1ec1n
 F_EXCEL_REPORT_ADMINISTRATION=Qu\u1ea3n tr\u1ecb module B\u00e1o c\u00e1o Excel
-F_DATAELEMENTGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 selected_roles=C\u00e1c ph\u00e2n quy\u1ec1n \u0111\u01b0\u1ee3c ch\u1ecdn
 F_RELATIONSHIPTYPE_ADD=Th\u00eam lo\u1ea1i quan h\u1ec7
-F_DATAVALUE_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u\t
 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
-F_ORGUNITGROUPSET_UPDATE=C\u1eadp nh\u1eadt t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
 rolename=T\u00ean quy\u1ec1n
 F_PROGRAMSTAGE_DELETE=X\u00f3a giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
-F_VALIDATIONCRITERIA_UPDATE=C\u1eadp nh\u1eadt Ti\u00eau chu\u1ea9n ki\u1ec3m tra
 F_INDICATORGROUPSET_DELETE=X\u00f3a T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
 F_CONSTANT_ADD=Th\u00eam H\u1eb1ng S\u1ed1
 F_VALIDATIONCRITERIA_ADD=Th\u00eam Ti\u00eau chu\u1ea9n ki\u1ec3m tra
@@ -157,13 +144,10 @@
 operations=Thao t\u00e1c
 F_INDICATORGROUPSET_PUBLIC_ADD=Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1
 details=Chi ti\u1ebft
-F_REPORT_UPDATE=C\u1eadp nh\u1eadt b\u00e1o c\u00e1o
 F_SQLVIEW_MANAGEMENT=Qu\u1ea3n l\u00fd Sql View
 F_PATIENTATTRIBUTEVALUE_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb thu\u1ed9c t\u00ednh c\u00e1 th\u1ec3
 specify_first_name=H\u00e3y x\u00e1c \u0111\u1ecbnh t\u00ean
-F_CONSTANT_UPDATE=C\u1eadp nh\u1eadt H\u1eb1ng S\u1ed1
 available_roles=C\u00e1c ph\u00e2n quy\u1ec1n c\u00f3 s\u1eb5n
-F_DATAELEMENTGROUPSET_UPDATE=C\u1eadp nh\u1eadt T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 show_details=Xem chi ti\u1ebft
 M_dhis-web-dataentry=Xem module Nh\u1eadp D\u1eef Li\u1ec7u
 F_PATIENT_ADD=Th\u00eam c\u00e1 th\u1ec3
@@ -171,7 +155,6 @@
 M_dhis-web-visualizer=Xem ch\u1ee9c n\u0103ng Hi\u1ec3n Th\u1ecb S\u1ed1 Li\u1ec7u
 authorities=Th\u1ea9m quy\u1ec1n
 change_password=\u0110\u1ed5i m\u1eadt kh\u1ea9u
-F_DATAELEMENT_UPDATE=X\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 delete_current_user=X\u00f3a ng\u01b0\u1eddi d\u00f9ng hi\u1ec7n t\u1ea1i
 month=th\u00e1ng
 F_REPORT_VIEW=Xem/In b\u00e1o c\u00e1o
@@ -187,13 +170,11 @@
 M_dhis-web-dataentry-national=Xem ch\u1ee9c n\u0103ng Nh\u1eadp D\u1eef Li\u1ec7u (theo li\u1ec7t k\u00ea)
 confirm_delete=X\u00e1c nh\u1eadn x\u00f3a
 F_DOCUMENT_DELETE=X\u00f3a t\u00e0i li\u1ec7u
-F_INDICATOR_UPDATE=C\u1eadp nh\u1eadt ch\u1ec9 s\u1ed1
 intro_user=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ng\u01b0\u1eddi d\u00f9ng. M\u1ed9t ng\u01b0\u1eddi d\u00f9ng \u0111\u01b0\u1ee3c li\u00ean k\u1ebft v\u1edbi c\u00e1c ph\u00e2n quy\u1ec1n v\u00e0 m\u1ed9t \u0111\u01a1n v\u1ecb.
 user_role_management=Qu\u1ea3n l\u00fd ph\u00e2n quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
 F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=X\u00f3a t\u1eadp tin excel m\u1eabu
 F_EXCEL_TEMPLATE_MANAGEMENT_LIST=Li\u1ec7t k\u00ea danh s\u00e1ch t\u1eadp tin excel m\u1eabu
 intro_user_by_orgunit=T\u1ea1o, ch\u1ec9nh s\u1eeda, xem v\u00e0 x\u00f3a c\u00e1c ng\u01b0\u1eddi d\u00f9ng c\u1ee7a m\u1ed9t \u0111\u01a1n v\u1ecb.
-F_DATAELEMENT_MINMAX_UPDATE=C\u1eadp nh\u1eadt gi\u00e1 tr\u1ecb l\u1edbn nh\u1ea5t/nh\u1ecf nh\u1ea5t
 saving_role_failed=L\u1ed7i do l\u01b0u ph\u00e2n quy\u1ec1n
 F_CONCEPT_ADD=Th\u00eam Concept
 specify_retype_password=Vui l\u00f2ng nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u
@@ -206,12 +187,8 @@
 fullname=H\u1ecd v\u00e0 t\u00ean
 F_DATAADMIN_UNLOCK=M\u1edf kh\u00f3a d\u1eef li\u1ec7u
 role_management=Qu\u1ea3n l\u00fd c\u00e1c quy\u1ec1n
-F_INDICATORTYPE_UPDATE=C\u1eadp nh\u1eadt lo\u1ea1i ch\u1ec9 s\u1ed1
-F_USER_UPDATE=C\u1eadp nh\u1eadt ng\u01b0\u1eddi d\u00f9ng
 F_USERROLE_LIST=Li\u1ec7t k\u00ea nh\u00f3m vai tr\u00f2
-F_SQLVIEW_UPDATE=C\u1eadp nh\u1eadt Sql View
 organisation_unit=\u0110\u01a1n v\u1ecb
-F_DATADICTIONARY_UPDATE=C\u1eadp nh\u1eadt t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
 F_VALIDATIONRULE_DELETE=X\u00f3a quy t\u1eafc
 select=Ch\u1ecdn
 F_CONSTANT_MANAGEMENT=Qu\u1ea3n tr\u1ecb H\u1eb1ng S\u1ed1
@@ -240,7 +217,6 @@
 filter_by_user_name=L\u1ecdc theo t\u00ean \u0111\u0103ng nh\u1eadp
 F_DATAELEMENTGROUP_DELETE=X\u00f3a nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 filter_by_name=L\u1ecdc theo t\u00ean
-F_CONCEPT_UPDATE=C\u1eadp nh\u1eadt Concept
 F_PROGRAM_DELETE=X\u00f3a ch\u01b0\u01a1ng tr\u00ecnh
 specify_surname=Xin vui l\u00f2ng ch\u1ec9 \u0111\u1ecbnh h\u1ecd
 F_DATAVALUE_DELETE=X\u00f3a gi\u00e1 tr\u1ecb d\u1eef li\u1ec7u
@@ -262,11 +238,9 @@
 add_user_group=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 organisation_units=C\u00e1c \u0111\u01a1n v\u1ecb
 F_REPORTTABLE_PUBLIC_ADD=Th\u00eam report table
-F_SECTION_UPDATE=C\u1eadp nh\u1eadt m\u1ee5c
 M_dhis-web-maintenance-mobile=Xem ch\u1ee9c n\u0103ng B\u1ea3o Tr\u00ec v\u1edbi Di \u0110\u1ed9ng
 F_OPTIONSET_MANAGEMENT=Qu\u1ea3n tr\u1ecb t\u1eadp t\u00f9y ch\u1ecdn
 F_OPTIONSET_ADD=Th\u00eam t\u1eadp t\u00f9y ch\u1ecdn
-F_OPTIONSET_UPDATE=C\u1eadp nh\u1eadt t\u1eadp t\u00f9y ch\u1ecdn
 F_OPTIONSET_DELETE=X\u00f3a t\u1eadp t\u00f9y ch\u1ecdn
 F_DATA_MART_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
 F_DV_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u hi\u1ec3n th\u1ecb

=== 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-02 15:58:13 +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-25 09:37:43 +0000
@@ -5,19 +5,15 @@
 F_ORGUNITGROUP_DELETE=\u5220\u9664\u7EC4\u7EC7\u673A\u6784\u7EC4
 F_INDICATORGROUPSET_DELETE=\u5220\u9664\u6307\u6807\u7EC4\u96C6
 F_PATIENT_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\uFF08\u75C5\u4EBA\uFF09
-F_SECTION_UPDATE=\u66F4\u65B0\u5206\u6BB5
 F_PATIENT_AGGREGATION=\u53D7\u76CA\u4EBA\u6C47\u603B
 saving_role_failed=\u4FDD\u5B58\u89D2\u8272\u5931\u8D25
 F_DATASET_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u96C6
 filter_by_username=\u8FC7\u6EE4\u5668\u7528\u6237
-F_USER_UPDATE=\u66F4\u65B0\u7528\u6237
 F_USERROLE_LIST=\u7528\u6237\u89D2\u8272\u5217\u8868
 F_PATIENTIDENTIFIERTYPE_ADD=\u6DFB\u52A0\u53D7\u76CA\u4EBA\u6807\u8BC6\u7B26\u7C7B\u578B
 F_DATAADMIN_UNLOCK=\u6570\u636E\u7BA1\u7406\u89E3\u9501
 F_VALIDATIONRULE_DELETE=\u5220\u9664\u9A8C\u8BC1\u89C4\u5219
 M_dhis-web-maintenance-dataadmin=\u6570\u636E\u7BA1\u7406\u7EF4\u62A4
-F_DATADICTIONARY_UPDATE=\u66F4\u65B0\u6570\u636E\u8BCD\u5178
-F_INDICATOR_UPDATE=\u66F4\u65B0\u6307\u6807
 password_is_not_valid=\u5BC6\u7801\u4E0D\u53EF\u7528
 F_OPTIONSET_ADD=\u6DFB\u52A0\u9009\u9879\u96C6
 organisation_unit=\u7EC4\u7EC7\u673A\u6784
@@ -43,7 +39,6 @@
 F_ORGUNITGROUP_ADD=\u6DFB\u52A0\u7EC4\u7EC7\u673A\u6784\u7EC4
 filter=\u7B5B\u9009
 M_dhis-web-validationrule-local-in=\u9A8C\u8BC1\u5206\u6790\u6A21\u5757
-F_VALIDATIONRULEGROUP_UPDATE=\u66F4\u65B0\u9A8C\u8BC1\u89C4\u5219\u7EC4
 F_PROGRAM_ATTRIBUTE_ADD=\u6DFB\u52A0\u9879\u76EE\u5C5E\u6027
 F_PATIENT_DATAVALUE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u6570\u636E\u503C
 F_CHART_DELETE=\u5220\u9664\u56FE\u8868
@@ -80,7 +75,6 @@
 F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=\u91CD\u547D\u540DExcel\u6A21\u677F
 F_PROGRAM_UNENROLLMENT=\u9879\u76EE\u53D6\u6D88
 F_INDICATORTYPE_DELETE=\u5220\u9664\u6307\u6807\u7C7B\u578B
-F_USERGROUP_UPDATE=\u66F4\u65B0\u7528\u6237\u7EC4
 user_role_management=\u7528\u6237\u89D2\u8272\u7BA1\u7406
 user=\u7528\u6237
 F_DATADICTIONARY_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u8BCD\u5178
@@ -89,12 +83,10 @@
 F_GENERATE_PATIENT_CHART=\u751F\u6210\u53D7\u76CA\u4EBA\u56FE\u8868
 F_USERROLE_DELETE=\u5220\u9664\u7528\u6237\u89D2\u8272
 F_NAME_BASED_DATA_ENTRY=\u57FA\u4E8E\u4E2A\u4EBA\u7684\u6570\u636E\u5F55\u5165
-F_ATTRIBUTE_UPDATE=\u66F4\u65B0\u719F\u6089
 M_dhis-web-gis=\u5730\u7406\u4FE1\u606F\u7CFB\u7EDF
 F_SYSTEM_SETTING=\u66F4\u6539\u7CFB\u7EDF\u8BBE\u7F6E
 delete_current_user=\u5220\u9664\u5F53\u524D\u7528\u6237
 F_SEND_MESSAGE=\u53D1\u751F\u4FE1\u606F
-F_VALIDATIONCRITERIA_UPDATE=\u66F4\u65B0\u9A8C\u8BC1\u6807\u51C6
 specify_organisationunit=\u8BF7\u6CE8\u660E\u7EC4\u7EC7\u673A\u6784>>>>>>> MERGE-SOURCE
 F_PATIENTATTRIBUTE_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\u5C5E\u6027
 change=\u4FEE\u6539
@@ -111,14 +103,12 @@
 edit=\u7F16\u8F91
 select_role=\u9009\u62E9\u89D2\u8272
 filter_by_role_name=\u6309\u89D2\u8272\u540D\u79F0\u7B5B\u9009
-F_DATAELEMENTGROUPSET_UPDATE=\u66F4\u65B0\u6570\u636E\u5143\u7EC4\u96C6\u5408
 email_is_not_valid=\u65E0\u6548\u7684\u90AE\u7BB1
 F_USER_ADD=\u6DFB\u52A0\u7528\u6237
 unit=\u7EC4
 specify_name=\u6307\u5B9A\u540D\u79F0
 edit_user_group=\u7F16\u8F91\u7528\u6237\u7EC4
 F_PATIENT_REMOVE_EMPTY_EVENTS=\u79FB\u9664\u7A7A\u4EBA\u5458\u7684\u4E8B\u4EF6
-F_DATAELEMENT_MINMAX_UPDATE=\u66F4\u65B0\u6700\u5C0F/\u6700\u5927\u89C4\u5219
 F_SQLVIEW_MANAGEMENT=SQL\u89C6\u56FE\u7BA1\u7406
 M_dhis-web-mapping=GIS
 filter_by_name=\u6309\u540D\u79F0\u7B5B\u9009
@@ -142,11 +132,8 @@
 F_ATTRIBUTE_DELETE=\u5220\u9664\u5C5E\u6027
 F_DOCUMENT_DELETE=\u5220\u9664\u6587\u6863
 M_dhis-web-importexport=\u5BFC\u5165\u5BFC\u51FA
-F_DATAELEMENT_UPDATE=\u66F4\u65B0\u6570\u636E\u5143
 F_CONCEPT_MANAGEMENT=\u6982\u5FF5\u7BA1\u7406
 month=\u6708
-F_ORGANISATIONUNIT_UPDATE=\u66F4\u65B0\u7EC4\u7EC7\u673A\u6784
-F_ORGUNITGROUPSET_UPDATE=\u66F4\u65B0\u7EC4\u7EC7\u673A\u6784\u7EC4\u96C6
 F_SECTION_DELETE=\u5220\u9664\u5206\u6BB5
 F_VALIDATIONCRITERIA_DELETE=\u5220\u9664\u9A8C\u8BC1\u6807\u51C6
 adding_role_failed=\u6DFB\u52A0\u89D2\u8272\u5931\u8D25
@@ -155,11 +142,8 @@
 F_USER_DELETE=\u5220\u9664\u7528\u6237
 F_DOCUMENT_PUBLIC_ADD=\u6DFB\u52A0\u6587\u6863
 F_VALIDATIONCRITERIA_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u6807\u51C6
-F_DATASET_UPDATE=\u66F4\u65B0\u6570\u636E\u96C6
-F_DATAELEMENTGROUP_UPDATE=\u66F4\u65B0\u6570\u636E\u5143\u7EC4
 F_INDICATOR_PUBLIC_ADD=\u6DFB\u52A0\u6307\u6807
 intro_user_group=\u521B\u5EFA\u7528\u6237\u7EC4\u7684\u529F\u80FD\uFF0C\u8BE5\u7EC4\u5E94\u8BE5\u5DE5\u4F5C\u5728\u4E00\u4E2A\u7528\u6237\u7EC4\uFF0C\u4F8B\u5982\u901A\u77E5\u5355
-F_DATAVALUE_UPDATE=\u66F4\u65B0\u6570\u636E\u503C
 F_MOBILE_SENDSMS=\u53D1\u9001\u77ED\u4FE1
 F_COPY_EXCEL_ITEM_ADMINISTRATION=\u590D\u5236Excel\u6761\u76EE
 F_DATADICTIONARY_DELETE=\u5220\u9664\u6570\u636E\u8BCD\u5178
@@ -173,7 +157,6 @@
 F_PATIENTIDENTIFIERTYPE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u6807\u8BC6\u7B26\u7C7B\u578B
 role=\u89D2\u8272
 F_CHART_ADD=\u589E\u52A0\u56FE\u8868
-F_CONCEPT_UPDATE=\u66F4\u65B0\u6982\u5FF5
 F_VALIDATIONRULE_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u89C4\u5219
 M_dhis-web-caseentry=\u67E5\u770B\u57FA\u4E8E\u75C5\u4F8B\u7684\u6570\u636E\u8F93\u5165\u6A21\u5757
 M_dhis-web-api=\u67E5\u770B\u624B\u673A\u6A21\u5757
@@ -181,8 +164,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_ORGUNITGROUP_UPDATE=\u66F4\u65B0\u7EC4\u7EC7\u673A\u6784\u7EC4
-F_INDICATORGROUPSET_UPDATE=\u66F4\u65B0\u6307\u6807\u7EC4\u96C6
 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
@@ -191,12 +172,10 @@
 F_VALIDATIONRULEGROUP_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u89C4\u5219\u7EC4
 intro_user_role=\u521B\u5EFA\u3001\u4FEE\u6539\u3001\u67E5\u770B\u548C\u5220\u9664\u7528\u6237\u89D2\u8272\uFF0C\u5728\u8FD9\u4E2A\u7CFB\u7EDF\u4E2D\u4E00\u4E2A\u7528\u6237\u89D2\u8272\u6709\u4E00\u7CFB\u5217\u7684\u6743\u9650\u3002
 user_group=\u7528\u6237\u7EC4
-F_REPORT_UPDATE=\u66F4\u65B0\u62A5\u8868
 adding_user_failed=\u6DFB\u52A0\u7528\u6237\u5931\u8D25
 F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=\u5220\u9664Excel\u6A21\u677F
 F_MOBILE_SETTINGS=\u79FB\u52A8\u8BBE\u7F6E
 F_GIS_ADMIN=\u7BA1\u7406GIS
-F_VALIDATIONRULE_UPDATE=\u66F4\u65B0\u9A8C\u8BC1\u89C4\u5219
 excel_importing=excel\u5BFC\u5165
 job_title=\u804C\u79F0
 create_new_user_role=\u521B\u5EFA\u65B0\u7684\u7528\u6237\u89D2\u8272
@@ -242,20 +221,17 @@
 F_DATAADMIN_LOCK=\u6570\u636E\u7BA1\u7406\u5458\u9501\u5B9A
 F_RELATIONSHIPTYPE_UPDATE=\u66F4\u65B0\u5173\u7CFB\u7C7B\u578B
 F_DATAELEMENTGROUPSET_DELETE=\u5220\u9664\u6570\u636E\u5143\u7EC4\u96C6
-F_CONSTANT_UPDATE=\u5E38\u6570\u66F4\u65B0
 F_PROGRAM_DELETE=\u5220\u9664\u9879\u76EE
 username=\u7528\u6237
 F_REPORT_VIEW=\u6D4F\u89C8\u62A5\u8868
 M_dhis-web-openhealth-integration=\u7EFC\u5408\u6237\u5916\u5065\u5EB7
 F_DATAELEMENT_MINMAX_DELETE=\u5220\u9664\u6700\u5C0F/\u6700\u5927\u89C4\u5219
 none=
-F_INDICATORTYPE_UPDATE=\u66F4\u65B0\u6307\u6807\u7C7B\u578B
 F_PERFORM_MAINTENANCE=\u6267\u884C\u7EF4\u62A4\u4EFB\u52A1
 F_RELATIONSHIP_ADD=\u6DFB\u52A0\u5173\u7CFB
 save=\u4FDD\u5B58
 everything_is_ok=\u4E07\u4E8B
 object_not_deleted_associated_by_objects=\u5BF9\u8C61\u5173\u8054\u5230\u5BF9\u8C61\u7C7B\u578B\u4E0D\u80FD\u5220\u9664
-F_USERROLE_UPDATE=\u66F4\u65B0\u7528\u6237\u89D2\u8272
 F_ARCHIVE_DATA=\u5F52\u6863\u6570\u636E
 specify_retype_password=\u8BF7\u786E\u8BA4\u5BC6\u7801
 F_ORGUNITGROUPSET_ADD=\u6DFB\u52A0\u7EC4\u7EC7\u673A\u6784\u7EC4\u96C6
@@ -271,13 +247,11 @@
 edit_user_role=\u7F16\u8F91\u7528\u6237\u89D2\u8272
 F_ORGANISATIONUNIT_DELETE=\u5220\u9664\u7EC4\u7EC7\u673A\u6784
 F_ORGUNITGROUPSET_DELETE=\u5220\u9664\u7EC4\u7EC7\u673A\u6784\u7EC4\u96C6
-F_OPTIONSET_UPDATE=\u66F4\u65B0\u9009\u9879\u96C6
 F_PATIENT_ADD=\u6DFB\u52A0\u53D7\u76CA\u4EBA\uFF08\u75C5\u4EBA\uFF09
 operations=\u4F5C\u4E1A
 delete=\u5220\u9664
 F_PRUNE_ORGANISATION_UNITS=\u88C1\u526A\u7EC4\u7EC7\u673A\u6784
 intro_user=\u521B\u5EFA\u3001\u66F4\u6539\u3001\u67E5\u770B\u548C\u5220\u9664\u7528\u6237\uFF0C\u4E00\u4E2A\u7528\u6237\u4E0E\u7528\u6237\u89D2\u8272\u548C\u4E00\u4E2A\u7EC4\u7EC7\u673A\u6784\u76F8\u5173\u8054
-F_INDICATORGROUP_UPDATE=\u66F4\u65B0\u6307\u6807\u7EC4
 F_DATAELEMENT_MINMAX_ADD=\u6DFB\u52A0\u6700\u5C0F/\u6700\u5927\u89C4\u5219
 F_DATASET_DELETE=\u5220\u9664\u6570\u636E\u96C6
 intro_change_password=\u66F4\u6539\u7528\u6237\u5BC6\u7801
@@ -288,7 +262,6 @@
 F_DATAMART_ADMIN=\u7BA1\u7406\u6570\u636E\u96C6\u5E02
 F_CONSTANT_DELETE=\u5220\u9664\u5E38\u6570
 confirm_delete_role=\u4F60\u786E\u8BA4\u8981\u5220\u9664\u8FD9\u4E2A\u7528\u6237\u89D2\u8272\u5417\uFF1F
-F_SQLVIEW_UPDATE=\u66F4\u65B0SQL\u89C6\u56FE
 F_DATA_MART_ADMIN=\u7BA1\u7406\u6570\u636E\u96C6\u5E02
 F_RELATIONSHIP_DELETE=\u5220\u9664\u5173\u7CFB
 F_PROGRAMSTAGE_DELETE=\u5220\u9664\u9879\u76EE\u9636\u6BB5

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2013-07-19 08:23:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -62,13 +62,13 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/updateUserForm.vm</param>
       <param name="javascripts">javascript/user.js</param>
-      <param name="requiredAuthorities">F_USER_UPDATE</param>
+      <param name="requiredAuthorities">F_USER_ADD</param>
     </action>
 
     <action name="updateUser" class="org.hisp.dhis.user.action.UpdateUserAction">
       <result name="success" type="redirect">user.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">showUpdateUserForm.action</result>
-      <param name="requiredAuthorities">F_USER_UPDATE</param>
+      <param name="requiredAuthorities">F_USER_ADD</param>
     </action>
 
     <action name="validateUser" class="org.hisp.dhis.user.action.ValidateUserAction">
@@ -135,13 +135,13 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/updateRoleForm.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/role.js</param>
-      <param name="requiredAuthorities">F_USERROLE_UPDATE</param>
+      <param name="requiredAuthorities">F_USERROLE_ADD</param>
     </action>
 
     <action name="updateRole" class="org.hisp.dhis.user.action.UpdateRoleAction">
       <result name="success" type="redirect">allRole.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">showUpdateRoleForm.action</result>
-      <param name="requiredAuthorities">F_USERROLE_UPDATE</param>
+      <param name="requiredAuthorities">F_USERROLE_ADD</param>
     </action>
 
     <action name="validateRole" class="org.hisp.dhis.user.action.ValidateRoleAction">

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2013-07-25 05:37:29 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2013-07-25 09:37:43 +0000
@@ -66,12 +66,12 @@
       <param name="javascripts">javascript/general.js,javascript/expression.js,
         javascript/expressionBuilder.js,javascript/updateValidationRuleForm.js
       </param>
-      <param name="requiredAuthorities">F_VALIDATIONRULE_UPDATE</param>
+      <param name="requiredAuthorities">F_VALIDATIONRULE_ADD</param>
     </action>
 
     <action name="updateValidationRule" class="org.hisp.dhis.validationrule.action.UpdateValidationRuleAction">
       <result name="success" type="redirect">validationRule.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_VALIDATIONRULE_UPDATE</param>
+      <param name="requiredAuthorities">F_VALIDATIONRULE_ADD</param>
     </action>
 
     <action name="getFilteredDataElements" class="org.hisp.dhis.validationrule.action.GetFilteredDataElementsAction">
@@ -118,13 +118,13 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/updateValidationRuleGroupForm.vm</param>
       <param name="javascripts">javascript/validationRuleGroup.js, javascript/updateValidationRuleGroupForm.js</param>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_UPDATE</param>
+      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
     </action>
 
     <action name="updateValidationRuleGroup"
       class="org.hisp.dhis.validationrule.action.validationrulegroup.UpdateValidationRuleGroupAction">
       <result name="success" type="redirect">showValidationRuleGroupForm.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_UPDATE</param>
+      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
     </action>
 
     <action name="validateValidationRuleGroup"
@@ -198,7 +198,7 @@
 
     <action name="editDataValue" class="org.hisp.dhis.validationrule.action.dataanalysis.EditDataValueAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
+      <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_DELETE</param>
     </action>
 
     <action name="markForFollowup" class="org.hisp.dhis.validationrule.action.dataanalysis.MarkForFollowupAction">