=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2013-09-20 15:13:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2013-10-08 11:54:18 +0000
@@ -85,15 +85,15 @@
     public static final String VALUE_TYPE_INT = "int";
     public static final String VALUE_TYPE_NUMBER = "number";    
     public static final String VALUE_TYPE_USER_NAME = "username";
+    public static final String VALUE_TYPE_TEXT = "text";
+    public static final String VALUE_TYPE_BOOL = "bool";
+    public static final String VALUE_TYPE_TRUE_ONLY = "trueOnly";
+    public static final String VALUE_TYPE_DATE = "date";
 
     public static final String VALUE_TYPE_ZERO_OR_POSITIVE_INT = "zeroPositiveInt";
     public static final String VALUE_TYPE_POSITIVE_INT = "positiveNumber";
     public static final String VALUE_TYPE_NEGATIVE_INT = "negativeNumber";
-    public static final String VALUE_TYPE_TRUE_ONLY = "trueOnly";
-    public static final String VALUE_TYPE_TEXT = "text";
     public static final String VALUE_TYPE_LONG_TEXT = "longText";
-    public static final String VALUE_TYPE_BOOL = "bool";
-    public static final String VALUE_TYPE_DATE = "date";
 
     public static final String DOMAIN_TYPE_AGGREGATE = "aggregate";
     public static final String DOMAIN_TYPE_PATIENT = "patient";
@@ -135,7 +135,7 @@
     private String numberType;
 
     /**
-     * The number type. Is relevant when type is TEXT.
+     * The text type. Is relevant when type is TEXT.
      */
     private String textType;
 

=== 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-10-01 16:44:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-10-08 11:54:18 +0000
@@ -10,6 +10,7 @@
 M_dhis-web-maintenance-user=See User Maintenance module
 M_dhis-web-maintenance-dataadmin=See Data Administration module
 M_dhis-web-maintenance-settings=See Settings Maintenance module
+M_dhis-web-maintenance-appmanager=See Apps Maintenance module
 M_dhis-web-dataentry=See Data Entry module
 M_dhis-web-importexport=See Import-Export module
 M_dhis-web-datamart=See Data Mart module
@@ -31,7 +32,6 @@
 M_dhis-web-maintenance-mobile=See Mobile Maintenance module
 M_dhis-web-pivot=See Pivot Table module
 M_dhis-web-sms=See SMS module
-M_dhis-web-appmanager=See Apps module
 
 #-- User action privilegies ---------------------------------------------------#
 
@@ -232,6 +232,8 @@
 F_MYDATAMART_VIEW=Access my data mart
 F_METADATA_EXPORT=Export Meta-Data
 F_METADATA_IMPORT=Import Meta-Data
+F_LOCALE_ADD=Add Locale
+F_LOCALE_DELETE=Delete Locale
 
 #-- FRED API module -----------------------------------------------------------#