=== 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	2012-02-15 13:19:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2012-02-16 13:44:24 +0000
@@ -106,8 +106,7 @@
 aggregated_indicator_values=Aggregated indicator values
 organisation_unit_pruning=Organisation Unit Pruning
 min_max_value_generation=Min-Max Value Generation
-intro_data_locking=Deny data to be entered or imported for data sets for certain combinations of organisation unit and period.
-intro_lock_exception=Add or remove exceptions to the auto-locking feature of datasets
+intro_lock_exception=Add or remove exceptions to the the standard rules for locking of data entry forms.
 intro_data_browser=Browse the database and get an overview of where data exists. View and export counts of data elements as well as raw data.
 intro_data_integrity=Run data integrity checks and unveil anomalies and problems in the meta data setup.
 intro_data_archive=Archive data which is not currently relevant to your system in order to improve performance. Data can also be unarchived.
@@ -122,9 +121,9 @@
 intro_zero_storage_management=Define which data elements for which zero values should be stored or ignored. Useful for reducing database size.
 intro_duplicate_data_elimination=Eliminate data registered for duplicate data elements. Useful when data has been entered for identical data elements.
 intro_sql_view=Create SQL database views. These views will typically use the resource tables to provide convenient views for third-party tools.
-intro_constant=Create the Constant which would be included in expression of indicator/validation rule.
-intro_attribute=Create and update dynamic attributes.
-intro_attribute_option=Create and update dynamic attribute options.
+intro_constant=Create constants which can be included in expressions of indicator and validation rules.
+intro_attribute=Create and update dynamic attributes. Attributes can be used for data elements, indicators, organisation units and users.
+intro_option_set = Create option sets which can be included in data elements and produce drop-down lists in data entry forms.
 expression_is_empty=Expression is empty
 dataelement_id_not_numeric=Data element identifier must be a number
 category_option_combo_id_not_numeric=Category option combo identifier must be a number
@@ -383,7 +382,6 @@
 no_aggregation=No aggregation
 data_elements_in_data_set_not_in_form = Data elements in data set but not in form or sections
 option_set = Option set
-intro_option_set = Create the option values which would be included in data elements.
 option_set_management = Option set management
 add_option_set = Add option set
 options = Options

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2012-02-08 13:38:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2012-02-16 13:44:24 +0000
@@ -18,7 +18,6 @@
     #introListImgItem( "displayOrganisationUnitMergeForm.action" "organisation_unit_merge" "organisationunitmerge" )
     #introListImgItem( "displayDuplicateDataEliminationForm.action" "duplicate_data_elimination" "duplicatedataelimination" )
     #introListImgItem( "viewStatistics.action" "data_statistics" "datastatistics" )
-    #introListImgItem( "displayLockingForm.action" "data_locking" "datalocking" )
     #introListImgItem( "lockException.action" "lock_exception" "datalocking" )
     #introListImgItem( "zeroValueStorageManagement.action" "zero_storage_management" "zerovaluestorage" )
     #introListImgItem( "displayPruneOrganisationUnitForm.action" "organisation_unit_pruning" "organisationunitpruning" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm	2012-02-08 12:04:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm	2012-02-16 13:44:24 +0000
@@ -12,7 +12,6 @@
 	<li><a href="displayOrganisationUnitMergeForm.action">$i18n.getString( "organisation_unit_merge" )&nbsp;</a></li>
     <li><a href="displayDuplicateDataEliminationForm.action">$i18n.getString( "duplicate_data_elimination" )&nbsp;</a></li>
 	<li><a href="viewStatistics.action">$i18n.getString( "data_statistics" )&nbsp;</a></li>
-    <li><a href="displayLockingForm.action">$i18n.getString( "data_locking" )&nbsp;</a></li>
     <li><a href="lockException.action">$i18n.getString( "lock_exception" )&nbsp;</a></li>
 	<li><a href="zeroValueStorageManagement.action">$i18n.getString( "zero_storage_management" )&nbsp;</a></li>
 	<li><a href="displayPruneOrganisationUnitForm.action">$i18n.getString( "organisation_unit_pruning" )&nbsp;</a></li>