=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/hibernate/HibernateOptionStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/hibernate/HibernateOptionStore.java	2014-08-04 15:15:52 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/hibernate/HibernateOptionStore.java	2014-08-29 12:04:53 +0000
@@ -78,7 +78,7 @@
     {
         String hql = 
             "select option from OptionSet as optionset " +
-            "join optionset.options as option where optionset = :optionSet and lower(option.name) = :name";
+            "join optionset.options as option where optionset = :optionSet and option.name = :name";
 
         Query query = getQuery( hql );
         query.setEntity( "optionSet", optionSet );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-08-25 19:32:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-08-29 12:04:53 +0000
@@ -185,6 +185,9 @@
 optional=Optional
 object_not_deleted_associated_by_objects=Object was not deleted because it is used by other objects:
 id=ID
+name_in_use=The name is already in use. Please choose a different name
+code_in_use=The code is already in use. Please choose a different code
+short_name_in_use=The short name is already in use. Please choose a different short name
 
 #-- PeriodTypes ----------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ValidateOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ValidateOptionAction.java	2014-07-29 07:52:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ValidateOptionAction.java	2014-08-29 12:04:53 +0000
@@ -128,7 +128,7 @@
 
             if ( match != null && (id == null || match.getId() != id) )
             {
-                message = i18n.getString( "name_in_use" );
+                message = i18n.getString( "code_in_use" );
 
                 return ERROR;
             }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-08-01 06:56:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-08-29 12:04:53 +0000
@@ -189,8 +189,6 @@
 add_new_sql_view=Add new SQL view
 update_sql_view=Update SQL view
 name_is_null=Name is not allowed to be null
-name_in_used=Name is in use
-code_in_use=Code is in use
 language_country_in_use=The language and country set is already in use
 sqlquery_is_empty=SQL statement cannot be null
 sqlquery_is_invalid=This SQL statement is invalid.
@@ -304,9 +302,6 @@
 options=Options
 option=Option 
 add_option=Add option
-option_name_already_exists=The option name already exists
-specify_option_name=Please specify a option name
-must_include_option=Please include one or more category options
 edit_option_set=Edit option set
 number_of_members=The number of members
 object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java	2014-08-29 12:04:53 +0000
@@ -111,7 +111,6 @@
     {
         if ( name != null )
         {
-
             DataElementGroup match = dataElementService.getDataElementGroupByName( name );
 
             if ( match != null && (id == null || match.getId() != id) )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2014-07-21 09:45:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2014-08-29 12:04:53 +0000
@@ -64,9 +64,6 @@
 confirm_delete_indicator_group=Are you sure you want to delete this indicator group?
 confirm_delete_indicator_type=Are you sure you want to delete this indicator type?
 confirm_delete_data_dictionary=Are you sure you want to delete this data dictionary?
-name_in_use=The name is already in use. Please choose a different name
-code_in_use=The code is already in use. Please choose a different code
-short_name_in_use=The short name is already in use. Please choose a different short name
 everything_is_ok=Everything is OK
 adding_data_element_group_failed=Adding the data element group failed with the following message
 saving_data_element_group_failed=Saving the data element group failed with the following message