=== 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-10-01 09:05:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-10-05 05:20:45 +0000
@@ -310,4 +310,5 @@
 unlock_all_in_group                                                 = Unlock all in group
 process_started                                                     = Checking...
 sqlview_process_canceled_interrupted                                = WARNING: This query could retrieve a large amount of data from database.\n\nDo you want to save it...? =======
-generate_values_success                                             = Generate values successfully
\ No newline at end of file
+generate_values_success                                             = Generate values successfully
+organisation_not_selected                                           = WARNING: There is no organisation unit selected
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-10-01 09:05:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-10-05 05:20:45 +0000
@@ -284,4 +284,5 @@
 lock_all_in_group                                                   = Kh\u00f3a to\u00e0n b\u1ed9 theo nh\u00f3m
 unlock_all_in_group                                                 = M\u1edf kh\u00f3a to\u00e0n b\u1ed9 theo nh\u00f3m
 process_started                                                     = \u0110ang ki\u1ec3m tra...
-sqlview_process_canceled_interrupted                                = C\u1ea2NH B\u00c1O: C\u00e2u truy v\u1ea5n n\u00e0y c\u00f3 th\u1ec3 s\u1ebd l\u1ea5y ra m\u1ed9t l\u01b0\u1ee3ng d\u1eef li\u1ec7u kh\u00e1 l\u1edbn trong CSDL.\n\nB\u1ea1n c\u00f3 mu\u1ed1n ti\u1ebfp t\u1ee5c...?
\ No newline at end of file
+sqlview_process_canceled_interrupted                                = C\u1ea2NH B\u00c1O: C\u00e2u truy v\u1ea5n n\u00e0y c\u00f3 th\u1ec3 s\u1ebd l\u1ea5y ra m\u1ed9t l\u01b0\u1ee3ng d\u1eef li\u1ec7u kh\u00e1 l\u1edbn trong CSDL.\n\nB\u1ea1n c\u00f3 mu\u1ed1n ti\u1ebfp t\u1ee5c...?
+organisation_not_selected                                           = C\u1ea2NH B\u00c1O: Kh\u00f4ng c\u00f3 \u0111\u01a1n v\u1ecb n\u00e0o \u0111\u01b0\u1ee3c ch\u1ecdn
\ 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-10-05 03:21:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm	2010-10-05 05:20:45 +0000
@@ -10,7 +10,7 @@
 					<tr>
 						<td>
 							<select id="periodTypeId" name="periodTypeId" style="min-width:325px" onchange="getPeriods()">
-								<option value="null">[ $i18n.getString( "select_period_type_all" ) ]</option>
+								<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
 								#foreach ( $periodType in $periodTypes )
 								  <option value="$periodType.name"#if( $currentPeriodTypeId == $type.name ) selected="selected"#end>$periodType.name</option>
 								#end