=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-04-17 12:09:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-05-17 12:04:42 +0000
@@ -67,7 +67,7 @@
 
     public static final String TYPE_TRUE_ONLY = "trueOnly";
 
-    public static final String TYPE_COMBO = "combo";
+    public static final String TYPE_OPTION_SET = "optionSet";
 
     public static final String TYPE_PHONE_NUMBER = "phoneNumber";
 

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2014-05-08 17:33:45 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2014-05-17 12:04:42 +0000
@@ -649,7 +649,7 @@
                 importConflicts.add( new ImportConflict( "Attribute.value", "Value is not pointing to a valid username." ) );
             }
         }
-        else if ( TrackedEntityAttribute.TYPE_COMBO.equals( teAttribute.getValueType() ) && !teAttribute.getOptionSet().getOptions().contains( attribute.getValue() ) )
+        else if ( TrackedEntityAttribute.TYPE_OPTION_SET.equals( teAttribute.getValueType() ) && !teAttribute.getOptionSet().getOptions().contains( attribute.getValue() ) )
         {
             importConflicts.add( new ImportConflict( "Attribute.value", "Value is not pointing to a valid option." ) );
         }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java	2014-05-08 17:33:45 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java	2014-05-17 12:04:42 +0000
@@ -486,7 +486,7 @@
                 importConflicts.add( new ImportConflict( "Attribute.value", "Value is not pointing to a valid username." ) );
             }
         }
-        else if ( TrackedEntityAttribute.TYPE_COMBO.equals( teAttribute.getValueType() ) && !teAttribute.getOptionSet().getOptions().contains( attribute.getValue() ) )
+        else if ( TrackedEntityAttribute.TYPE_OPTION_SET.equals( teAttribute.getValueType() ) && !teAttribute.getOptionSet().getOptions().contains( attribute.getValue() ) )
         {
             importConflicts.add( new ImportConflict( "Attribute.value", "Value is not pointing to a valid option." ) );
         }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2014-05-06 06:48:29 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2014-05-17 12:04:42 +0000
@@ -308,7 +308,7 @@
             mobileAttribute.setDisplayedInList( false );
         }
 
-        if ( pa.getValueType().equals( TrackedEntityAttribute.TYPE_COMBO ) )
+        if ( pa.getValueType().equals( TrackedEntityAttribute.TYPE_OPTION_SET ) )
         {
             OptionSet optionSet = new OptionSet();
 

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2014-05-16 07:52:42 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2014-05-17 12:04:42 +0000
@@ -325,7 +325,7 @@
 
             inputHtml += "</select>";
         }
-        else if ( attribute.getValueType().equals( TrackedEntityAttribute.TYPE_COMBO ) )
+        else if ( attribute.getValueType().equals( TrackedEntityAttribute.TYPE_OPTION_SET ) )
         {
             inputHtml = inputHtml.replaceFirst( "input", "select" ) + ">";
             inputHtml += "<option value=\"\" selected>" + i18n.getString( "no_value" ) + "</option>";

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2014-05-16 15:26:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2014-05-17 12:04:42 +0000
@@ -263,7 +263,9 @@
         executeSql( "UPDATE trackedentityattribute SET valuetype='string' WHERE valuetype='localId';" );
         executeSql( "UPDATE trackedentityattribute SET valuetype='number' WHERE valuetype='age'" );
         
-        executeSql( "DROP TABLE orgunitgroupprograms" );
+        executeSql( "DROP TABLE orgunitgroupprograms" ); 
+        
+        executeSql( "UPDATE trackedentityattribute SET valuetype='combo' WHERE valuetype='optionSet'" );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java	2014-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java	2014-05-17 12:04:42 +0000
@@ -181,7 +181,7 @@
             attribute.setOrgunitScope( orgunitScope );
             attribute.setProgramScope( programScope );
         }
-        else if ( valueType.equals( TrackedEntityAttribute.TYPE_COMBO ) )
+        else if ( valueType.equals( TrackedEntityAttribute.TYPE_OPTION_SET ) )
         {
             attribute.setOptionSet( optionService.getOptionSet( optionSetId ) );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java	2014-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java	2014-05-17 12:04:42 +0000
@@ -188,7 +188,7 @@
             attribute.setOrgunitScope( orgunitScope );
             attribute.setProgramScope( programScope );
         }
-        else if ( valueType.equals( TrackedEntityAttribute.TYPE_COMBO ) )
+        else if ( valueType.equals( TrackedEntityAttribute.TYPE_OPTION_SET ) )
         {
             attribute.setOptionSet( optionService.getOptionSet( optionSetId ) );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-04-30 13:42:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-05-17 12:04:42 +0000
@@ -91,7 +91,6 @@
 warning_delete_tracked_entity_attribute_option=This option has relationship with tracked entity attribute values
 success_delete_tracked_entity_attribute_option=Deleted tracked entity attribute option successfully
 error_delete_tracked_entity_attribute_option=Can not find tracked entity attribute option to delete
-attribute_combo_type=Option set type
 at_least_2_option=Please add at least two attribute options
 combo=Predefined value
 related=Related

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm	2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm	2014-05-17 12:04:42 +0000
@@ -73,7 +73,7 @@
                 <option value="phoneNumber">$i18n.getString( "phone_number" )</option>
                 <option value="trackerAssociate">$i18n.getString( "tracker_associate" )</option>
                 <option value="users">$i18n.getString( "users" )</option>
-                <option value="combo">$i18n.getString( "attribute_combo_type" )</option>
+                <option value="optionSet">$i18n.getString( "option_set" )</option>
             </select>
         </td>
         <td></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm	2014-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm	2014-05-17 12:04:42 +0000
@@ -76,7 +76,7 @@
     var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
     var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
     var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+    var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
 	var i18n_all = '$encoder.jsEscape( $i18n.getString( "all" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm	2014-02-10 10:37:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm	2014-05-17 12:04:42 +0000
@@ -66,7 +66,7 @@
         <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
         <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
         <p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>
-				<p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
+		<p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
         <p><label class="bold">$i18n.getString( "data_element_for_sum_avg_min_max" ):</label><br><span id="deSumField"></span></p>
         <p><label class="bold">$i18n.getString( "aggregation_expression" ):</label><br><span id="aggregationExpressionField"></span></p>
 			</div>
@@ -83,7 +83,7 @@
     var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
     var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
     var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+    var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js	2014-04-18 10:54:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js	2014-05-17 12:04:42 +0000
@@ -62,7 +62,7 @@
 	typeMap['date'] = i18n_date;
 	typeMap['phoneNumber'] = i18n_phone_number;
 	typeMap['trackerAssociate'] = i18n_tracker_associate;
-	typeMap['combo'] = i18n_attribute_combo_type;
+	typeMap['optionSet'] = i18n_option_set;
 	return typeMap;
 }
 
@@ -78,7 +78,7 @@
 
 function typeOnChange() {
 	var type = getFieldValue('valueType');
-	if( type=="combo"){
+	if( type=="optionSet"){
 		showById("optionSetRow");
 		enable("optionSetId");
 	}
@@ -103,7 +103,7 @@
 		jQuery('#valueType [value=date]').hide();
 		jQuery('#valueType [value=trackerAssociate]').hide();
 		jQuery('#valueType [value=users]').hide();
-		jQuery('#valueType [value=combo]').hide();
+		jQuery('#valueType [value=optionSet]').hide();
 	}
 	else {
 		jQuery('[name=uniqueTR]').hide();
@@ -112,7 +112,7 @@
 		jQuery('#valueType [value=date]').show();
 		jQuery('#valueType [value=trackerAssociate]').show();
 		jQuery('#valueType [value=users]').show();
-		jQuery('#valueType [value=combo]').show();
+		jQuery('#valueType [value=optionSet]').show();
 	}
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-04-04 12:59:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-05-17 12:04:42 +0000
@@ -70,7 +70,7 @@
     var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
     var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
     var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+    var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
 	var i18n_all = '$encoder.jsEscape( $i18n.getString( "all" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2014-03-24 09:02:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2014-05-17 12:04:42 +0000
@@ -69,7 +69,7 @@
     var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
     var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
     var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-    var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+    var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
 	var i18n_all = '$encoder.jsEscape( $i18n.getString( "all" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm	2014-05-17 12:04:42 +0000
@@ -68,13 +68,13 @@
 <script type="text/javascript">
 	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_tracked_entity_attribute" ) , "'" )';
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';	
-  var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
-  var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
-  var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
-  var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
-  var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
-  var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
-  var i18n_combo = '$encoder.jsEscape( $i18n.getString( "combo" ) , "'")';
+	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
+	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';
+	var i18n_number = '$encoder.jsEscape( $i18n.getString( "number" ) , "'")';
+	var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
+	var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
+	var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';
+	var i18n_option_set = '$encoder.jsEscape( $i18n.getString( "option_set" ) , "'")';
 	var i18n_processing = '$encoder.jsEscape( $i18n.getString( "processing" ) , "'")';
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ) , "'")';
 	var i18n_left_side = '$encoder.jsEscape( $i18n.getString( "left_side" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm	2014-05-04 11:48:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm	2014-05-17 12:04:42 +0000
@@ -70,7 +70,7 @@
                 <option value="phoneNumber" #if( $attribute.valueType == 'phoneNumber' ) selected="selected" #end>$i18n.getString( "phone_number" )</option>
 				<option value="trackerAssociate" #if( $attribute.unique=='true' ) style='display:none' #end #if( $attribute.valueType == 'trackerAssociate' ) selected="selected" #end>$i18n.getString( "tracker_associate" )</option>
 				<option value="users" #if( $attribute.unique=='true' ) style='display:none' #end #if( $attribute.valueType == 'users' ) selected="selected" #end>$i18n.getString( "users" )</option>
-				<option value="combo" #if( $attribute.unique=='true' ) style='display:none' #end #if( $attribute.valueType == 'combo' ) selected="selected" #end>$i18n.getString( "attribute_combo_type" )</option>
+				<option value="optionSet" #if( $attribute.unique=='true' ) style='display:none' #end #if( $attribute.valueType == 'optionSet' ) selected="selected" #end>$i18n.getString( "option_set" )</option>
             </select>
         </td>
     </tr>