=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-11-06 13:35:48 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-11-20 15:34:17 +0000 @@ -185,7 +185,6 @@ class="org.hisp.dhis.caseentry.action.report.GenerateTabularReportAction"> /content.vm /dhis-web-caseentry/programStageInstancesList.vm - F_PROGRAM_STAGE_INSTANCE_SEARCH /dhis-web-commons/ajax/jsonResponseSuccess.vm - F_PROGRAM_STAGE_INSTANCE_DELETE === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-11-13 15:21:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-11-20 15:34:17 +0000 @@ -270,7 +270,7 @@ intro_user_role=Create, modify, view and delete user roles. A user role has a set of authorities in the system. intro_self_registered_user=View and manage users who have self-registered for a personal user account in the system. intro_change_password=Change the password for users. -user_use_group=There are users used this role +user_use_group=There are user associated with this user role. can_not_remove_last_super_user=Can not remove the last super user. can_not_remove_last_super_user_role=Can not remove the last super user role. delete_current_user=Delete Current User