=== 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-06-18 22:14:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2010-06-21 12:41:24 +0000 @@ -182,4 +182,8 @@ unarchive = Unarchive archiving = Archiving unarchiving = Unarchiving -done_number_of_values = done. Number of archived values is now \ No newline at end of file +done_number_of_values = done. Number of archived values is now +prune = Prune +prune_organisation_unit_confirmation = Are you sure you want to prune? +pruning = Pruning +pruning_done = Pruning done \ 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/javascript/pruneOrganisationUnit.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js 2010-04-12 16:35:57 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/pruneOrganisationUnit.js 2010-06-21 12:41:24 +0000 @@ -21,8 +21,8 @@ } } -function pruneOrganisationUnit() { - // itemId, itemName, confirmation, action +function pruneOrganisationUnit() +{ var result = window.confirm(i18n_confirmation); if (result) { === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm 2010-04-28 04:59:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm 2010-06-21 12:41:24 +0000 @@ -1,5 +1,5 @@ -

$i18n.getString( "prune_organisation_unit" ) #openHelp( "pruneOrganisationUnit" )

+

$i18n.getString( "organisation_unit_pruning" )

@@ -17,7 +17,7 @@ - $i18n.getString( "select_the_org_unit_to_be_kept" ) + $i18n.getString( "select_the_org_unit_to_keep" ) [$i18n.getString( "not_selected" )]