=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-02-27 16:14:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-03-07 20:07:23 +0000
@@ -90,7 +90,6 @@
     private static final long serialVersionUID = 5618655666320890565L;
     
     public static final String DATA_X_DIM_ID = "dx"; // IN, DE, DS
-    public static final String CATEGORYOPTIONCOMBO_DIM_ID = "coc";
     public static final String PERIOD_DIM_ID = "pe";
     public static final String ORGUNIT_DIM_ID = "ou";
     

=== 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-02-26 07:29:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-03-07 20:07:23 +0000
@@ -547,7 +547,7 @@
 			<param name="page">/dhis-web-maintenance-patient/patientRegistrationForm.vm</param>
 			<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
 			<param name="javascripts">javascript/patientRegistrationForm.js</param>
-			<param name="requiredAuthorities">F_ADD_PATIENT_REGISTATION_FORM</param>
+			<param name="requiredAuthorities">F_ADD_PATIENT_REGISTRATION_FORM</param>
 		</action>
 
 		<action name="viewPatientRegistrationForm"

=== 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-02-20 08:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-03-07 20:07:23 +0000
@@ -29,6 +29,8 @@
 M_dhis-web-mobile=See Smartphone module
 M_dhis-web-visualizer=See Data Visualizer module
 M_dhis-web-maintenance-mobile=See Mobile Maintenance module
+M_dhis-web-pivot=See Pivot Table module
+M_dhis-web-sms=See SMS module
 
 #-- User action privilegies ---------------------------------------------------#
 
@@ -148,6 +150,7 @@
 F_PATIENT_DELETE=Delete Person
 F_PATIENT_CHANGE_LOCATION = Change Person Location
 F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Facilities
+F_ADD_PATIENT_REGISTRATION_FORM=Add Person Registration Form
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_TRACKING_MANAGEMENT = Program Tracking Management
 F_PROGRAM_PUBLIC_ADD=Add Public Program