=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2011-10-17 17:43:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2011-10-23 18:51:10 +0000
@@ -8,7 +8,9 @@
 enable														= Enable
 nr															= Nr
 section_layout												= Section Layout	
-data_element												= DataElement
+data_element												= Data element
+data_elements												= Data elements
+indicators													= Indicators
 category_combo												= Category Combo      
 select_categorycombo										= Select Category Combo
 title														= Title
@@ -51,7 +53,7 @@
 dataentryform_duplicate_names 								= A data entry form with this name already exists
 dataentryform_confirm_delete 								= Are you sure you want to delete this data entry form?
 unable_delete 												= Unable to delete data entry form
-selectdataelement_insert 									= Insert
+insert					 									= Insert
 dataelement_count_mismatch 									= Some of the data elements in the dataset are missing from the custom data entry form, do you want to proceed anyway?
 view_as 													= View as
 no_more_elements_to_select 									= All data elements have been placed in the form. Deleting data element fields from the form will make them reappear in this popup. Please click Cancel to return to the form.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-06-10 11:09:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-10-23 18:51:10 +0000
@@ -165,9 +165,9 @@
 
 			<tr>
 				<td>
-					<button type="button" id="dataElementsButton">Data Elements</button>
-					<button type="button" id="indicatorsButton">Indicators</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
-					<button type="button" id="insertButton">Insert</button>
+					<button type="button" id="dataElementsButton">$i18n.getString( "data_elements" )</button>
+					<button type="button" id="indicatorsButton">$i18n.getString( "indicators" )</button>&nbsp;&nbsp;<span style="color:#606060">|</span>&nbsp;
+					<button type="button" id="insertButton">$i18n.getString( "insert" )</button>
 				</td>
 				<td style="width: 190px;">
 					<span id="message_"></span>