=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-07-21 10:31:21 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-07-31 10:27:45 +0000
@@ -19,7 +19,7 @@
     <input type="button" id="calculateCDEs" value="$i18n.getString( "save_calculated" )" name="calculateCDEs" onclick="calculateAndSaveCDEs();" style="width:150px" #if( !$selectedPeriodIndex ) disabled="disabled" #end><br>
 
     <br>
-	<input type="radio" id="displayMode" name="displayMode" value="customform"
+	<input type="radio" id="displayModeCustom" name="displayMode" value="customform"
        #if( $displayMode == "customform" ) 
            checked="checked" 
        #end
@@ -27,9 +27,9 @@
            disabled="disabled" 
        #end         
        onclick="document.getElementById( 'selectForm' ).submit();">    
-    <label>$i18n.getString( "use_custom_form" )</label><br>
+    <label for="displayModeCustom">$i18n.getString( "use_custom_form" )</label><br>
 
-	<input type="radio" id="displayMode" name="displayMode" value="sectionform"
+	<input type="radio" id="displayModeSection" name="displayMode" value="sectionform"
 	   #if( $displayMode == "sectionform" ) 
 	       checked="checked" 
 	   #end  
@@ -37,14 +37,14 @@
 	       disabled="disabled" 
 	   #end 
 	   onclick="document.getElementById( 'selectForm' ).submit();">
-	<label>$i18n.getString( "use_section_form" )</label><br>
+	<label for="displayModeSection">$i18n.getString( "use_section_form" )</label><br>
 
-	<input type="radio" id="displayMode" name="displayMode" value="defaultform"
+	<input type="radio" id="displayModeDefault" name="displayMode" value="defaultform"
        #if( $displayMode == "defaultform" ) 
            checked="checked" 
        #end       
        onclick="document.getElementById( 'selectForm' ).submit();">    
-    <label>$i18n.getString( "use_default_form" )</label><br>
+    <label for="displayModeDefault">$i18n.getString( "use_default_form" )</label><br>
 
 </div>
 

=== 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	2010-07-30 21:02:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-07-31 10:27:45 +0000
@@ -255,4 +255,8 @@
 indicators_violating_exclusive_group_sets							= Indicators violating exclusive group sets
 view_data_for                                                       = View data for
 failed_to_create_view_table_for                                     = Failed to create view table for
-update 																= Update
\ No newline at end of file
+update 																= Update
+available_datasets													= Available data sets
+type_of_selection													= Selection type
+selected_orgunits													= Selected organisation units
+locking_mode														= Locking mode

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2010-07-07 10:22:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm	2010-07-31 10:27:45 +0000
@@ -70,8 +70,7 @@
 			<div id="detailsArea" style="display:none">
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
-				</div>				
-				<p><label>$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+				</div>
 				<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label>$i18n.getString( "frequency" ):</label><br><span id="frequencyField"></span></p>
 				<p><label>$i18n.getString( "number_of_data_elements" ):</label><br><span id="dataElementCountField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-07-24 15:40:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2010-07-31 10:27:45 +0000
@@ -12,13 +12,9 @@
 
 function dataSetRecieved( dataSetElement )
 {
-  setFieldValue( 'idField', getElementValue( dataSetElement, 'id' ) );
   setFieldValue( 'nameField', getElementValue( dataSetElement, 'name' ) );
-
   setFieldValue( 'frequencyField', getElementValue( dataSetElement, 'frequency' ) );
-
   setFieldValue( 'dataElementCountField', getElementValue( dataSetElement, 'dataElementCount' ) );
-
   setFieldValue( 'dataEntryFormField', getElementValue( dataSetElement, 'dataentryform' ) );
 
   showDetails();