=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-01-22 12:09:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-01-22 13:37:45 +0000
@@ -28,6 +28,8 @@
  */
 
 import org.hisp.dhis.datadictionary.DataDictionary;
+import org.hisp.dhis.dataelement.DataElementGroup;
+import org.hisp.dhis.dataelement.DataElementGroupSet;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.document.Document;
 import org.hisp.dhis.report.Report;
@@ -74,6 +76,14 @@
         SUPPORTED_TYPES.put( "dataDictionary", DataDictionary.class );
         PUBLIC_AUTHORITIES.put( DataDictionary.class, "F_DATADICTIONARY_PUBLIC_ADD" );
         PRIVATE_AUTHORITIES.put( DataDictionary.class, "F_DATADICTIONARY_PRIVATE_ADD" );
+
+        SUPPORTED_TYPES.put( "dataElementGroup", DataElementGroup.class );
+        PUBLIC_AUTHORITIES.put( DataElementGroup.class, "F_DATAELEMENTGROUP_PUBLIC_ADD" );
+        PRIVATE_AUTHORITIES.put( DataElementGroup.class, "F_DATAELEMENTGROUP_PRIVATE_ADD" );
+
+        SUPPORTED_TYPES.put( "dataElementGroupSet", DataElementGroupSet.class );
+        PUBLIC_AUTHORITIES.put( DataElementGroupSet.class, "F_DATAELEMENTGROUPSET_PUBLIC_ADD" );
+        PRIVATE_AUTHORITIES.put( DataElementGroupSet.class, "F_DATAELEMENTGROUPSET_PRIVATE_ADD" );
     }
 
     public static boolean isSupported( String type )

=== 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-01-22 12:09:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-01-22 13:37:45 +0000
@@ -485,6 +485,8 @@
         executeSql( "UPDATE userroleauthorities SET authority='F_REPORTTABLE_PUBLIC_ADD' WHERE authority='F_REPORTTABLE_ADD'" );
         executeSql( "UPDATE userroleauthorities SET authority='F_DATASET_PUBLIC_ADD' WHERE authority='F_DATASET_ADD'" );
         executeSql( "UPDATE userroleauthorities SET authority='F_DATADICTIONARY_PUBLIC_ADD' WHERE authority='F_DATADICTIONARY_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUP_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUP_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_DATAELEMENTGROUPSET_PUBLIC_ADD' WHERE authority='F_DATAELEMENTGROUPSET_ADD'" );
 
         log.info( "Tables updated" );
     }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml	2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml	2013-01-22 13:37:45 +0000
@@ -3,7 +3,7 @@
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
   "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
   [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
->
+  >
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.dataelement.DataElementGroup" table="dataelementgroup">
@@ -14,7 +14,7 @@
       <generator class="native" />
     </id>
     &identifiableProperties;
-    
+
     <set name="members" table="dataelementgroupmembers">
       <cache usage="read-write" />
       <key column="dataelementgroupid" foreign-key="fk_dataelementgroupmembers_dataelementgroupid" />
@@ -22,6 +22,17 @@
         foreign-key="fk_dataelementgroup_dataelementid" />
     </set>
 
+    <!-- Access properties -->
+    <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_dataelementgroup_userid" />
+
+    <property name="publicAccess" length="8" />
+
+    <set name="userGroupAccesses" table="dataelementgroupusergroupaccesses">
+      <cache usage="read-write" />
+      <key column="dataelementgroupid" />
+      <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
+    </set>
+
     <!-- Dynamic attribute values -->
 
     <set name="attributeValues" table="dataelementgroupattributevalues">

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml	2012-04-20 18:31:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml	2013-01-22 13:37:45 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
-    [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-    >
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.dataelement.DataElementGroupSet" table="dataelementgroupset">
@@ -24,8 +24,19 @@
       <key column="dataelementgroupsetid" foreign-key="fk_dataelementgroupsetmembers_dataelementgroupsetid" />
       <list-index column="sort_order" base="1" />
       <many-to-many class="org.hisp.dhis.dataelement.DataElementGroup" column="dataelementgroupid" unique="true"
-          foreign-key="fk_dataelementgroupset_dataelementgroupid" />
+        foreign-key="fk_dataelementgroupset_dataelementgroupid" />
     </list>
 
+    <!-- Access properties -->
+    <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_dataelementgroupset_userid" />
+
+    <property name="publicAccess" length="8" />
+
+    <set name="userGroupAccesses" table="dataelementgroupsetusergroupaccesses">
+      <cache usage="read-write" />
+      <key column="dataelementgroupsetid" />
+      <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
+    </set>
+
   </class>
 </hibernate-mapping>

=== 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-01-22 12:09:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2013-01-22 13:37:45 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd">
+  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+  "http://struts.apache.org/dtds/struts-2.0.dtd">
 <struts>
 
   <include file="dhis-web-commons.xml" />
@@ -150,12 +150,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm</param>
       <param name="javascripts">javascript/dataElementGroup.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_ADD</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="addDataElementGroup" class="org.hisp.dhis.dd.action.dataelementgroup.AddDataElementGroupAction">
       <result name="success" type="redirect">dataElementGroup.action</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUP_ADD</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUP_PUBLIC_ADD, F_DATAELEMENTGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="showUpdateDataElementGroupForm" class="org.hisp.dhis.dd.action.dataelementgroup.ShowUpdateDataElementGroupFormAction">
@@ -194,12 +194,12 @@
       <param name="page">/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="javascripts">javascript/dataElementGroupSet.js</param>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUPSET_ADD</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUPSET_PUBLIC_ADD, F_DATAELEMENTGROUPSET_PRIVATE_ADD</param>
     </action>
 
     <action name="addDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.AddDataElementGroupSetAction">
       <result name="success" type="redirect">dataElementGroupSet.action</result>
-      <param name="requiredAuthorities">F_DATAELEMENTGROUPSET_ADD</param>
+      <param name="anyAuthorities">F_DATAELEMENTGROUPSET_PUBLIC_ADD, F_DATAELEMENTGROUPSET_PRIVATE_ADD</param>
     </action>
 
     <action name="openUpdateDataElementGroupSet" class="org.hisp.dhis.dd.action.dataelementgroupset.OpenUpdateDataElementGroupSetAction">
@@ -352,7 +352,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorGroup.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-	  <param name="javascripts">javascript/indicatorGroup.js</param>
+      <param name="javascripts">javascript/indicatorGroup.js</param>
     </action>
 
     <action name="removeIndicatorGroup" class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
@@ -369,7 +369,7 @@
     <action name="showAddIndicatorGroupForm" class="org.hisp.dhis.dd.action.indicatorgroup.ShowAddIndicatorGroupForm">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm</param>
-	  <param name="javascripts">javascript/indicatorGroup.js</param>
+      <param name="javascripts">javascript/indicatorGroup.js</param>
       <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
     </action>
 
@@ -381,7 +381,7 @@
     <action name="showUpdateIndicatorGroupForm" class="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction">
       <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="javascripts">javascript/indicatorGroup.js</param>
       <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
     </action>
 
@@ -402,14 +402,14 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-	  <param name="javascripts">javascript/indicatorGroupSet.js</param>
+      <param name="javascripts">javascript/indicatorGroupSet.js</param>
     </action>
 
     <action name="openAddIndicatorGroupSet" class="org.hisp.dhis.dd.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-	  <param name="javascripts">javascript/indicatorGroupSet.js</param>
+      <param name="javascripts">javascript/indicatorGroupSet.js</param>
       <param name="requiredAuthorities">F_INDICATORGROUP_ADD</param>
     </action>
 
@@ -422,7 +422,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm</param>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
-	  <param name="javascripts">javascript/indicatorGroupSet.js</param>
+      <param name="javascripts">javascript/indicatorGroupSet.js</param>
     </action>
 
     <action name="updateIndicatorGroupSet" class="org.hisp.dhis.dd.action.indicatorgroupset.UpdateIndicatorGroupSetAction">
@@ -461,7 +461,7 @@
       </result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
-	
+
     <action name="removeIndicatorType" class="org.hisp.dhis.dd.action.indicatortype.RemoveIndicatorTypeAction">
       <result name="success" type="velocity-json">
         /dhis-web-commons/ajax/jsonResponseSuccess.vm
@@ -569,7 +569,7 @@
     <action name="showAddDataElementCategoryForm" class="org.hisp.dhis.dd.action.concept.GetConceptListAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm</param>
-	  <param name="javascripts">javascript/category.js</param>
+      <param name="javascripts">javascript/category.js</param>
       <param name="requiredAuthorities">F_DATAELEMENT_ADD</param>
     </action>
 
@@ -608,8 +608,8 @@
 
     <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="page">/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm</param>
+      <param name="javascripts">javascript/category.js</param>
       <param name="requiredAuthorities">F_DATAELEMENT_UPDATE</param>
     </action>
 
@@ -743,7 +743,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-datadictionary/multidimensional/concept.vm</param>
+        /dhis-web-maintenance-datadictionary/multidimensional/concept.vm
+      </param>
       <param name="javascripts">javascript/concept.js</param>
       <param name="requiredAuthorities">F_CONCEPT_MANAGEMENT</param>
     </action>
@@ -752,7 +753,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm</param>
+        /dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm
+      </param>
       <param name="javascripts">javascript/concept.js</param>
       <param name="requiredAuthorities">F_CONCEPT_ADD</param>
     </action>
@@ -761,7 +763,8 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
       <param name="page">
-        /dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm</param>
+        /dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm
+      </param>
       <param name="javascripts">javascript/concept.js</param>
       <param name="requiredAuthorities">F_CONCEPT_UPDATE</param>
     </action>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm	2013-01-22 13:37:45 +0000
@@ -1,5 +1,8 @@
+
+#sharingDialog()
+
 <script type="text/javascript">
-	jQuery(document).ready(function(){	
+	jQuery(document).ready(function(){
 		tableSorter( 'dataElementGroupList' );	
 	});
 
@@ -22,7 +25,7 @@
 			<div id="content">
 			<table class="listTable" id="dataElementGroupList">			
 				<col/>
-				<col width="120px"/>
+				<col width="145px"/>
 				<thead>					
 					<tr>
 						<th>$i18n.getString( "name" )</th>
@@ -34,10 +37,33 @@
 				<tr id="tr${dataElementGroup.id}">
 					<td onclick="showDataElementGroupDetails( $dataElementGroup.id )">$encoder.htmlEncode( $dataElementGroup.displayName )</td>
 					<td style="text-align:right">
-						<a href="showUpdateDataElementGroupForm.action?id=$dataElementGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-						<a href="javascript:translate( 'DataElementGroup', '$dataElementGroup.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
-						<a href="javascript:removeDataElementGroup( $dataElementGroup.id, '$encoder.jsEncode( $dataElementGroup.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+
+                        #if ( $security.canManage( $document ) )
+                        <a href="javascript:showSharingDialog('dataElementGroup', '$dataElementGroup.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+                        #else
+                        <img src="../images/relationship-denied.png">
+                        #end
+
+                        #if( $security.canUpdate( $dataElementGroup ) )
+                        <a href="showUpdateDataElementGroupForm.action?id=$dataElementGroup.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+                        #else
+                        <img src="../images/edit-denied.png">
+                        #end
+
+                        #if( $security.canUpdate( $dataElementGroup ) )
+                        <a href="javascript:translate( 'DataElementGroup', '$dataElementGroup.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+                        #else
+                        <img src="../images/i18n-denied.png">
+                        #end
+
+                        #if( $security.canDelete( $dataElementGroup ) )
+                        <a href="javascript:removeDataElementGroup( $dataElementGroup.id, '$encoder.jsEncode( $dataElementGroup.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+                        #else
+                        <img src="../images/delete-denied.png">
+                        #end
+
 						<a href="javascript:showDataElementGroupDetails( $dataElementGroup.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+
 					</td>
 				</tr>
 				#end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm	2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm	2013-01-22 13:37:45 +0000
@@ -1,5 +1,8 @@
+
+#sharingDialog()
+
 <script type="text/javascript">
-	jQuery(document).ready(function(){	
+	jQuery(document).ready(function(){
 		tableSorter( 'groupSetList' );	
 	});
 
@@ -22,7 +25,7 @@
 			</table>
 			<table class="listTable" id="groupSetList">
                 <col/>              
-                <col width="120"/>
+                <col width="145"/>
                 <thead>  
 					<tr>
 						<th>$i18n.getString( "name" )</th>
@@ -34,10 +37,33 @@
 					<tr id="tr${dataElementGroupSet.id}">
 						<td onclick="showDataElementGroupSetDetails( $dataElementGroupSet.id )">$encoder.htmlEncode( $dataElementGroupSet.displayName )</td>
 						<td style="text-align:right">
-							<a href="openUpdateDataElementGroupSet.action?id=$dataElementGroupSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-							<a href="javascript:translate( 'DataElementGroupSet', '$dataElementGroupSet.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
-							<a href="javascript:deleteDataElementGroupSet( $dataElementGroupSet.id, '$encoder.jsEncode( $dataElementGroupSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+
+                            #if ( $security.canManage( $dataElementGroupSet ) )
+                            <a href="javascript:showSharingDialog('dataElementGroupSet', '$dataElementGroupSet.uid');"><img src="../images/relationship.png" alt="$i18n.getString( 'sharing_settings' )"></a>
+                            #else
+                            <img src="../images/relationship-denied.png">
+                            #end
+
+                            #if( $security.canUpdate( $dataElementGroupSet ) )
+                            <a href="openUpdateDataElementGroupSet.action?id=$dataElementGroupSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+                            #else
+                            <img src="../images/edit-denied.png">
+                            #end
+
+                            #if( $security.canUpdate( $dataElementGroupSet ) )
+                            <a href="javascript:translate( 'DataElementGroupSet', '$dataElementGroupSet.id' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+                            #else
+                            <img src="../images/i18n-denied.png">
+                            #end
+
+                            #if( $security.canDelete( $dataElementGroupSet ) )
+                            <a href="javascript:deleteDataElementGroupSet( $dataElementGroupSet.id, '$encoder.jsEncode( $dataElementGroupSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+                            #else
+                            <img src="../images/delete-denied.png">
+                            #end
+
 							<a href="javascript:showDataElementGroupSetDetails( $dataElementGroupSet.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+
 						</td>
 					</tr>
 					#end

=== 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-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-01-22 13:37:45 +0000
@@ -45,10 +45,10 @@
 F_DATAELEMENT_ADD=Add Data Element
 F_DATAELEMENT_DELETE=Delete Data Element
 F_DATAELEMENT_UPDATE=Update Data Element
-F_DATAELEMENTGROUP_ADD=Add Data Element Groups
+F_DATAELEMENTGROUP_PUBLIC_ADD=Add Public Data Element Groups
 F_DATAELEMENTGROUP_DELETE=Delete Data Element Groups
 F_DATAELEMENTGROUP_UPDATE=Updated Data Element Groups
-F_DATAELEMENTGROUPSET_ADD=Add Data Element Group Sets
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=Add Public 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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties	2013-01-22 13:37:45 +0000
@@ -128,7 +128,7 @@
 create_new_user_role=Crear nuevo rol de usuario
 F_VALIDATIONRULEGROUP_DELETE=Eliminar Grupo de Reglas de Validaci\u00f3n
 F_INDICATORGROUP_DELETE=Eliminar Grupo de Indicadores
-F_DATAELEMENTGROUP_ADD=A\u00f1adir Grupos de Elementos de Datos
+F_DATAELEMENTGROUP_PUBLIC_ADD=A\u00f1adir Grupos de Elementos de Datos
 F_ORGANISATIONUNIT_DELETE=Eliminar Unidad Organizativa
 M_dhis-web-dashboard-integration=Ver m\u00f3dulo de integraci\u00f3n del Tablero
 edit_role=Actualizar rol de usuario
@@ -166,7 +166,7 @@
 F_CONSTANT_UPDATE=Actualizar Constante
 F_DATAADMIN_LOCK=Bloqueo de Datos de Administrador
 F_DATAADMIN_UNLOCK=Desbloqueo de Datos de Administrador
-F_DATAELEMENTGROUPSET_ADD=A\u00f1adir Grupos de Elementos de Datos
+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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties	2013-01-22 13:37:45 +0000
@@ -41,10 +41,10 @@
 F_DATAELEMENT_ADD=Ajouter \u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENT_DELETE=Supprimer \u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENT_UPDATE=Modier \u00e9l\u00e9ments de donn\u00e9es
-F_DATAELEMENTGROUP_ADD=Ajouter groupes d'\u00e9l\u00e9ments de donn\u00e9es
+F_DATAELEMENTGROUP_PUBLIC_ADD=Ajouter groupes d'\u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENTGROUP_DELETE=Supprimer groupes d'\u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENTGROUP_UPDATE=Modifier groupes d'\u00e9l\u00e9ments de donn\u00e9es
-F_DATAELEMENTGROUPSET_ADD=Ajouter ensembles de groupes d'\u00e9l\u00e9ments de donn\u00e9es
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=Ajouter ensembles de groupes d'\u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENTGROUPSET_DELETE=Supprimer ensembles de groupes d'\u00e9l\u00e9ments de donn\u00e9es
 F_DATAELEMENTGROUPSET_UPDATE=Modifier ensembles de groupes d'\u00e9l\u00e9ments de donn\u00e9es
 F_DATADICTIONARY_PUBLIC_ADD=Ajouter Dictionnaire des donn\u00e9es

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties	2013-01-22 13:37:45 +0000
@@ -41,10 +41,10 @@
 F_DATAELEMENT_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_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_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_ADD=Add Data Element Group Sets
+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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties	2013-01-22 13:37:45 +0000
@@ -41,10 +41,10 @@
 F_DATAELEMENT_ADD=Adicionar Elemento de Dados
 F_DATAELEMENT_DELETE=Apagar Elemento de Dados
 F_DATAELEMENT_UPDATE=Actualizar Elemento Dados
-F_DATAELEMENTGROUP_ADD=Adicionar Grupos de Elementos de Dados
+F_DATAELEMENTGROUP_PUBLIC_ADD=Adicionar Grupos de Elementos de Dados
 F_DATAELEMENTGROUP_DELETE=Apagar Grupos de Elementos de Dados
 F_DATAELEMENTGROUP_UPDATE=Actualizar Grupos de Elementos de Dados
-F_DATAELEMENTGROUPSET_ADD=Adicionar Grupos de Elementos de Dados
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=Adicionar Grupos de Elementos de Dados
 F_DATAELEMENTGROUPSET_DELETE=Apagar Grupos de Elementos de Dados
 F_DATAELEMENTGROUPSET_UPDATE=Actualizar Grupos de Elementos de Dados
 F_DATADICTIONARY_PUBLIC_ADD=Adicionar Dicion\u00e1rio Dados

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2013-01-22 13:37:45 +0000
@@ -176,7 +176,7 @@
 month=th\u00e1ng
 F_REPORT_VIEW=Xem/In b\u00e1o c\u00e1o
 intro_user_group=T\u1ea1o m\u1edbi nh\u00f3m ch\u1ee9c n\u0103ng cho nh\u00f3m ng\u01b0\u1eddi d\u00f9ng, nh\u01b0 l\u00e0 c\u00e1c th\u00f4ng b\u00e1o.
-F_DATAELEMENTGROUPSET_ADD=Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=Th\u00eam T\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 F_GIS_ADMIN=Qu\u1ea3n tr\u1ecb b\u1ea3n \u0111\u1ed3 s\u1ed1 h\u00f3a
 specify_organisationunit=Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb
 F_COPY_EXCEL_ITEM_ADMINISTRATION=Sao ch\u00e9p ph\u1ea7n t\u1eed Excel
@@ -222,7 +222,7 @@
 F_INDICATORGROUP_DELETE=X\u00f3a nh\u00f3m ch\u1ec9 s\u1ed1
 changepassword=Thay \u0111\u1ed5i m\u1eadt kh\u1ea9u
 months=th\u00e1ng
-F_DATAELEMENTGROUP_ADD=Th\u00eam m\u1edbi nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+F_DATAELEMENTGROUP_PUBLIC_ADD=Th\u00eam m\u1edbi nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 F_ORGANISATIONUNIT_DELETE=X\u00f3a \u0111\u01a1n v\u1ecb
 inactive_for=\u0110\u00f3ng k\u00edch ho\u1ea1t cho
 M_dhis-web-dashboard-integration=Xem ch\u1ee9c n\u0103ng T\u1ed5ng H\u1ee3p v\u1edbi B\u0110K

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties	2013-01-22 12:18:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties	2013-01-22 13:37:45 +0000
@@ -54,7 +54,7 @@
 reports=\u62A5\u8868
 \u00EF\u00BB\u00BF\#Resource=generated by I18n Resource Editor
 M_dhis-web-maintenance-organisationunit=\u67E5\u770B\u7EC4\u7EC7\u673A\u6784\u7EF4\u62A4
-F_DATAELEMENTGROUP_ADD=\u6DFB\u52A0\u6570\u636E\u5143\u7EC4
+F_DATAELEMENTGROUP_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u5143\u7EC4
 F_PATIENTATTRIBUTE_ADD=\u6DFB\u52A0\u53D7\u76CA\u4EBA\u5C5E\u6027
 no_of_Users=\u7528\u6237\u6570
 F_CONCEPT_ADD=\u6DFB\u52A0\u6982\u5FF5
@@ -235,7 +235,7 @@
 F_ORGANISATIONUNITLEVEL_UPDATE=\u66F4\u65B0\u7EC4\u7EC7\u673A\u6784\u7B49\u7EA7
 M_dhis-web-validationrule=\u9A8C\u8BC1\u89C4\u5219\u6A21\u5757
 F_PATIENTATTRIBUTE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u5C5E\u6027
-F_DATAELEMENTGROUPSET_ADD=\u6DFB\u52A0\u6570\u636E\u5143\u7EC4\u96C6
+F_DATAELEMENTGROUPSET_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u5143\u7EC4\u96C6
 F_PROGRAM_ATTRIBUTE_UPDATE=\u66F4\u65B0\u9879\u76EE\u5C5E\u6027
 user_use_group=\u7528\u6237\u4F7F\u7528\u7EC4
 F_DATASET_ORDER_CHANGE=\u6539\u53D8\u6570\u636E\u96C6\u7684\u6392\u5E8F