=== 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-09-21 12:42:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-09-30 07:31:04 +0000
@@ -303,4 +303,8 @@
 no_hits                                                             = Hit(s)
 earliest_date_used_if_no_date_selected                              = Earliest date will be used if no date is selected
 latest_date_used_if_no_date_selected                                = Latest date will be used if no date is selected
-generate_values_success 											= Generate values successfully
\ No newline at end of file
+generate_values_success 											= Generate values successfully
+lock_all_at_level =	Lock all at level
+unlock_all_at_level =	Unlock all at level
+lock_all_in_group =	Lock all in group
+unlock_all_in_group =	Unlock all in group
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm	2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm	2010-09-30 07:31:04 +0000
@@ -40,13 +40,13 @@
 					<tr><th>$i18n.getString('organisation_unit')</th></tr>
 					<tr>
 						<td>
-							<input type="submit" value="$i18n.getString( 'select_all_at_level' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
+							<input type="submit" value="$i18n.getString( 'lock_all_at_level' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
 							<select id="levelId" name="levelId" style="width:12em" >
                                 #foreach ( $orgUnitLevel in $orgUnitLevels )
                                    <option value="$orgUnitLevel.level" >$orgUnitLevel.name</option>
                                 #end
                             </select>
-							<input type="submit" value="$i18n.getString( 'unselect_all_at_level' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
+							<input type="submit" value="$i18n.getString( 'unlock_all_at_level' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
 							 <select id="selectionValue" name="selectionValue" onlclick="" enabled="true">
                                         <option value="selected" selected>Selected</option>
                                         <option value="Childtree">Child Tree</option>
@@ -55,13 +55,13 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="submit" value="$i18n.getString( 'select_all_in_group' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
+							<input type="submit" value="$i18n.getString( 'lock_all_in_group' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
 							<select id="orgGroup" name="orgGroup" style="width:12em" >
 								 #foreach ( $orgUnitGroup in $orgUnitGroups )
 									 <option value="$orgUnitGroup.id">$orgUnitGroup.name</option>
 								 #end
 							</select>
-							<input type="submit" value="$i18n.getString( 'unselect_all_in_group' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
+							<input type="submit" value="$i18n.getString( 'unlock_all_in_group' )" onclick="setClickedButtonElementValue(this)" style="width:12em"/>
 						</td>
 		
 					</tr>