=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-05-12 08:49:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-06-02 10:07:13 +0000
@@ -160,7 +160,7 @@
 create_new_program_validation_rule=Create new program validation rule
 add_multi_program_validation_rule=Add multi-program validation rule
 program_validation_rule_details=Program validation rule details
-view_validation_rule=View validation rule
+view_validation_rules=View validation rules
 tracked_entity_attribute_group_sort_order=Tracked entity attribute group sort order
 scheduled_days_from_start=Scheduled days from start
 success_delete_program_attribute_option=Deleted program attribute option successfully
@@ -371,7 +371,7 @@
 incident_date = Incident date
 date_to_compare = Date to compare
 program_indicator_management = Program Indicator Management
-view_program_indicator = View program indicator
+view_program_indicators = View program indicators
 confirm_delete_prorgam_indicator=Are you sure you want to delete this program indicator?
 program_indicator_details = Program indicator details
 date_for_calculating = Date for calculating
@@ -382,7 +382,7 @@
 combine = Combine
 completed = Completed
 events = Events
-allow_enrollment_at_all_orgunits = Allow enrollment at all orgunits
+allow_enrollment_at_all_orgunits = Allow enrollment at all org units
 other_program_stages = Other program stages
 minus = Minus
 and_operator = AND

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties	2014-10-17 08:19:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties	2015-06-02 10:07:13 +0000
@@ -73,7 +73,7 @@
 program_attribute_details=Program attribute details
 create_new_program_validation_rule=Create new program validation rule
 program_validation_rule_details=Program validation rule details
-view_validation_rule=View validation rule
+view_validation_rules=View validation rules
 scheduled_days_from_start=Scheduled days from start
 aggregation_data_element=Aggregation data element
 delete_program_data_entry_confirm=Are you sure you want to delete this program data entry form?
@@ -467,7 +467,7 @@
 required_fields_valivation=Required fields validation
 validate_success=The registration form passed validation successfully
 incident_date=Incident date
-view_program_indicator=View program indicator
+view_program_indicators=View program indicators
 date_for_calculating=Date for calculating
 minus_with_dateOfIncident=Incident Date Diff
 minus_with_enrollmentDate=Enrollment Date Diff

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2015-04-11 13:18:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2015-06-02 10:07:13 +0000
@@ -11,8 +11,8 @@
     <li data-enabled="canManageTemplateMessage"><a data-target-fn="programReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_message" )</a></li> 
 	<li data-enabled="canManageProgramRule"><a data-target-fn="programRule"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_rule" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="validationCriteria"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_criteria" )</a></li>
-    <li data-enabled="canUpdate"><a data-target-fn="programValidationManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_rule" )</a></li>
-    <li data-enabled="canUpdate"><a data-target-fn="programIndicatorManagementForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_indicator" )</a></li>
+    <li data-enabled="canUpdate"><a data-target-fn="programValidationManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_rules" )</a></li>
+    <li data-enabled="canUpdate"><a data-target-fn="programIndicatorManagementForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_indicators" )</a></li>
     <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
     <li data-enabled="canDelete"><a data-target-fn="removeProgram"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>