=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2015-03-19 12:47:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2015-03-29 20:32:18 +0000
@@ -325,14 +325,14 @@
 
                 if ( dataElement == null )
                 {
-                    return i18n.getString( "dataelement_with_id" ) + ": " + dataElementId + " " + i18n.getString( "does_not_exist" );
+                    return i18n.getString( "dataelement_with_id" ) + ": " + dataElementId + " " + i18n.getString( "does_not_exist_in_data_set" );
                 }
 
                 DataElementCategoryOptionCombo categoryOptionCombo = optionComboMap.get( optionComboId, optionComboCallabel.setUid( optionComboId ) );
 
                 if ( categoryOptionCombo == null )
                 {
-                    return i18n.getString( "category_option_combo_with_id" ) + ": " + optionComboId + " " + i18n.getString( "does_not_exist" );
+                    return i18n.getString( "category_option_combo_with_id" ) + ": " + optionComboId + " " + i18n.getString( "does_not_exist_in_data_set" );
                 }
                 
                 if ( dataSet.isDataElementDecoration() && dataElement.hasDescription() ) 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2014-11-16 10:31:19 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2015-03-29 20:32:18 +0000
@@ -105,6 +105,7 @@
 dataelement_with_id=Data element with identifier
 category_option_combo_with_id=Category option combination identifier
 does_not_exist=does not exist
+does_not_exist_in_data_set=does not exist in data set
 insert_input_fields_into_the_form=Insert input fields into the form
 select_data_element=Select data element
 all_values_for_data_element_must_be_filled=This form requires that all fields for a data element must be filled, please correct this before continuing.