=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-08 08:21:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-12 05:05:04 +0000
@@ -494,15 +494,17 @@
 }
 
 /**
- * Sets the header message and hides it after 3 seconds.
+ * Sets the header message and hides it after 3 seconds, as default.
  */
-function setHeaderDelayMessage( message )
+function setHeaderDelayMessage( message, timing )
 {
+	if ( timing == undefined ) { timing = 3000; }
+	
 	setHeaderMessage( message );
 	
 	window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations
 	
-	headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 3000 );
+	headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", timing );
 }
 
 /**

=== 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	2010-09-29 07:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties	2010-10-12 05:05:04 +0000
@@ -151,4 +151,5 @@
 please_select_dataset_or_categorycombo                      = Please select a dataset/category combo
 confirm_save                                                = This operation will change the old orgunits assigned to these datasets.\nAre you sure to save this?
 not_change_old_but_assign_new_only                          = Do not change the old assignment but assign new only.
-datasets_different_orgunitlist                              = These selected datasets are not the same the list of organsation unit.
\ No newline at end of file
+datasets_different_orgunitlist                              = These selected datasets are not the same the list of organsation unit.
+optional                                                    = Optional expansion
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-09-29 07:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties	2010-10-12 05:05:04 +0000
@@ -84,4 +84,5 @@
 please_select_dataset_or_categorycombo = H\u00e3y ch\u1ecdn t\u1eadp d\u1eef li\u1ec7u v\u00e0 category combo t\u01b0\u01a1ng \u1ee9ng
 confirm_save                           = H\u00e0nh \u0111\u1ed9ng n\u00e0y s\u1ebd thay \u0111\u1ed5i nh\u1eefng \u0111\u01a1n v\u1ecb \u0111\u00e3 \u0111\u01b0\u1ee3c g\u00e1n tr\u01b0\u1edbc \u0111\u00f3 cho c\u00e1c t\u1eadp d\u1eef li\u1ec7u l\u1ef1a ch\u1ecdn tr\u00ean.\nB\u1ea1n c\u00f3 mu\u1ed1n ti\u1ebfp t\u1ee5c?
 not_change_old_but_assign_new_only     = Kh\u00f4ng thay \u0111\u1ed5i vi\u1ec7c g\u00e1n c\u0169 ch\u1ec9 g\u00e1n th\u00eam m\u1edbi.
-datasets_different_orgunitlist         = C\u00e1c t\u1eadp d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn tr\u00ean kh\u00e1c nhau v\u1ec1 danh s\u00e1ch c\u00e1c \u0111\u01a1n v\u1ecb g\u00e1n.
\ No newline at end of file
+datasets_different_orgunitlist         = C\u00e1c t\u1eadp d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c ch\u1ecdn tr\u00ean kh\u00e1c nhau v\u1ec1 danh s\u00e1ch c\u00e1c \u0111\u01a1n v\u1ecb g\u00e1n.
+optional                        = T\u00f9y ch\u1ecdn m\u1edf r\u1ed9ng
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-09-29 07:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-10-12 05:05:04 +0000
@@ -111,7 +111,7 @@
 				confirmStatus = 'required';
 				if ( selectedListLen != 0 )
 				{
-					setHeaderDelayMessage( i18n_datasets_different_orgunitlist );
+					setHeaderDelayMessage( i18n_datasets_different_orgunitlist, 4500 );
 				}
 			}
 			else