=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-26 04:34:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-26 13:10:43 +0000
@@ -62,10 +62,10 @@
 error_required_field=Please enter value for all data element in red color
 complete_confirm_message=Are you sure this event is completed?
 complete=Complete
-case_aggregation_form=Person aggregation form
 dataset_list=Data set list
 multiple_individual_records=Multiple Individual Records
-intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
+manual_person_aggregation=Manual Person Aggregation
+intro_manual_person_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit.
 from=From
 to=To
 value_must_number=Value must be an number
@@ -83,7 +83,7 @@
 no_value_added_or_update=No values added or updated
 date_less_incident_date=This date is less then the incident date
 deleted=Deleted
-case_aggregation=Person Aggregation
+person_aggregation=Person Aggregation
 please_specify_an_orgunit=Please specify an organisation unit
 please_select_to_date_greater_or_equals_to_from_date=Please select to-date later or equal to from-date
 violate_validation=Violating validation

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2012-10-26 09:02:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2012-10-26 13:10:43 +0000
@@ -6,7 +6,7 @@
 
 <div id='caseAggregationDiv'>
 
-	<h1> $i18n.getString( "case_aggregation_form" ) #openHelp('run_case_aggregation')</h1>
+	<h1> $i18n.getString( "manual_person_aggregation" ) #openHelp('run_case_aggregation')</h1>
 	
 	<form id="caseAggregationForm" name="caseAggregationForm" action="caseAggregationResult.action" method="post">
 		<table>
@@ -27,14 +27,14 @@
 			<tr>
 				<td>$i18n.getString( "from" )</td>
 				<td>
-					<input type='text' id="startDate" name="startDate" style="width:355px;"/>
+					<input type='text' id="startDate" name="startDate" style="width:355px;" />
 				</td>
 			</tr>
 			
 			<tr>
 				<td>$i18n.getString( "to" )</td>
 				<td>
-					<input type='text' id="endDate" name="endDate" style="width:355px;"/>
+					<input type='text' id="endDate" name="endDate" style="width:355px;" />
 					<script>
 						datePickerInRange( 'startDate','endDate' );
 					</script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationMenu.vm	2012-03-05 12:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationMenu.vm	2012-10-26 13:10:43 +0000
@@ -1,5 +1,5 @@
 
-<a href="index.action"><h2>$i18n.getString( "case_aggregation" )&nbsp;</h2></a>
+<a href="index.action"><h2>$i18n.getString( "person_aggregation" )&nbsp;</h2></a>
 <ul>
-    <li><a href="caseAggregationForm.action">$i18n.getString( "case_aggregation" )</a></li>     
+    <li><a href="caseAggregationForm.action">$i18n.getString( "manual_person_aggregation" )</a></li>     
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-10-06 05:12:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm	2012-10-26 13:10:43 +0000
@@ -28,6 +28,6 @@
 	#end
 	
 	#if( $auth.hasAccess( "dhis-web-caseentry", "caseAggregationForm" ) )
-		#introListImgItem( "caseAggregationForm.action" "case_aggregation" "caseaggregation" )
+		#introListImgItem( "caseAggregationForm.action" "manual_person_aggregation" "caseaggregation" )
 	#end
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-09-27 10:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm	2012-10-26 13:10:43 +0000
@@ -42,8 +42,8 @@
 </ul>
 
 #if( $auth.hasAccess( "dhis-web-caseentry", "caseAggregationForm" ) )	
-<h2>$i18n.getString( "case_aggregation" )&nbsp;</h2>
+<h2>$i18n.getString( "person_aggregation" )&nbsp;</h2>
 <ul>
-    <li><a href="caseAggregationForm.action">$i18n.getString( "case_aggregation" )</a></li>     
+    <li><a href="caseAggregationForm.action">$i18n.getString( "manual_person_aggregation" )</a></li>     
 </ul>
 #end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-10-25 14:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-10-26 13:10:43 +0000
@@ -64,9 +64,8 @@
 everything_is_ok=Everything is OK
 patient_attribute=Person Attribute
 program=Program
-patient_aggregation=Person Aggregation
-patient_aggregation_query_builder=Person Aggregation
-patient_aggregation_query_builder_management=Person aggregation management
+patient_aggregation_query_builder=Aggregation Query Builder
+patient_aggregation_query_builder_management=Aggregation query builder management
 dataelement_group=Data Element Group
 dataelements=Data elements
 patient_attributes=Person attributes
@@ -111,7 +110,7 @@
 intro_program=Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
 intro_person_aggregation_query_builder=Set up aggregation rules for the process of aggregating person data to statistical data.
 intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of person data.
-intro_scheduling_message=Scheduled automatic messages to be sent in order to notify persons about upcoming or overdue visits.
+intro_schedule_message=Scheduled automatic messages to be sent in order to notify persons about upcoming or overdue visits.
 intro_program_attribute=Create, modify and view program attributes. A program can have any number of attributes.
 intro_configuration=Set the Excel XML template file used for automatically importing person data.
 inheritable=Inheritable
@@ -153,12 +152,11 @@
 duplicate=Duplicate
 dataelement_group=Data Element Group
 option_combo=Option combination
-case_aggregation_condition=Person Aggregation
-case_aggregation_condition_detail=Person aggregation details
-create_new_case_aggregation_condition=Create new person aggregation
+case_aggregation_query_builder_detail=Aggregation query builder details
+create_new_aggregation_query_builder=Create new aggregation query builder
 condition=Condition
 condition_detail=Condition details
-edit_case_aggregation_condition=Edit person aggregation
+edit_aggregation_query_builder=Edit person aggregation
 program_properties=Program properties
 orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
@@ -275,7 +273,7 @@
 orgunit_name = Organisation unit name
 days_since_due_date = Days since due date
 scheduling = Scheduling
-scheduling_message = Scheduling Message
+schedule_message = Schedule Message
 schedule = Schedule
 start = Start
 stop = Stop
@@ -301,8 +299,8 @@
 form_details = Form details
 enrollment_details = Enrollment details
 repeatable_program_stage_details = Repeatable program stage details
-scheduling_person_aggregation = Scheduling Person Aggregation
-intro_scheduling_person_aggregation = Schedule for running person aggregate formulas automatically.
+schedule_automated_aggregation = Schedule Automated Aggregation
+intro_schedule_automated_aggregation = Schedule for running aggregate query builder formulas automatically.
 aggregation_period_types = Aggregation period types
 financial_yearly = Financial Yearly
 organisation_unit_group_set_aggregation_level = Organisation unit group set aggregation level

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-10-24 04:54:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-10-26 13:10:43 +0000
@@ -7,14 +7,14 @@
 
 <script type="text/javascript" src="javascript/addCaseAggregationForm.js"></script>
 															
-<h3>$i18n.getString( "create_new_case_aggregation_condition" )</h3>
+<h3>$i18n.getString( "create_new_aggregation_query_builder" )</h3>
 
 <form id="addCaseAggregationForm" action="addCaseAggregation.action" method="post" >
 
 <table> 
 	<thead>
       <tr>
-        <th colspan="2">$i18n.getString( "case_aggregation_condition_detail" )</th>
+        <th colspan="2">$i18n.getString( "case_aggregation_query_builder_detail" )</th>
       </tr>
     </thead>
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	2012-10-26 04:16:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregationForm.vm	2012-10-26 13:10:43 +0000
@@ -38,7 +38,7 @@
 				<td><label>$i18n.getString( "patient_attributes" )</label></td>
 				<td>
 					<label>$i18n.getString( "available_values" )</label>
-					<input type='button' title="$i18n.getString( 'insert_selected_values' )" value="&raquo;" class="small-button" onClick="insertMultiValues('caSuggestedValues');" >
+					<input type='button' title="$i18n.getString( 'insert_selected_values' )" value="&raquo;" class="small-button"  onClick="insertMultiValues('caSuggestedValues');" >
 				</td>
 			</tr>
 			<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-10-25 14:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-10-26 13:10:43 +0000
@@ -17,10 +17,10 @@
 	#introListImgItem( "validationCriteria.action" "validation_criteria" "validationrule" )
 	
 	#if( $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduleTasks" ) )
-		#introListImgItem( "viewScheduleTasks.action" "scheduling_message" "scheduling" )
+		#introListImgItem( "viewScheduleTasks.action" "schedule_message" "scheduling" )
 	#end
 	#if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
-		#introListImgItem( "viewScheduledCaseAggCondTasks.action" "scheduling_person_aggregation" "scheduling" )
+		#introListImgItem( "viewScheduledCaseAggCondTasks.action" "schedule_automated_aggregation" "scheduling" )
 	#end
 	
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-10-25 14:03:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm	2012-10-26 13:10:43 +0000
@@ -9,7 +9,7 @@
 <h2>$i18n.getString( "programs" )</h2>
 <ul>
 	<li><a href="program.action">$i18n.getString( "program" )</a></li>
-	<li><a href="caseAggregation.action">$i18n.getString( "patient_aggregation" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "patient_aggregation_query_builder" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 </ul>
 
@@ -18,10 +18,10 @@
 <h2>$i18n.getString( "scheduling" )</h2>
 <ul>
 	#if( $auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduleTasks" ) )
-		<li><a href="viewScheduleTasks.action">$i18n.getString( "message" )</a></li>
+		<li><a href="viewScheduleTasks.action">$i18n.getString( "schedule_message" )</a></li>
 	#end
 	#if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
-		<li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "patient_aggregation" )</a></li>
+		<li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "schedule_automated_aggregation" )</a></li>
 	#end
 </ul>
 #end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-22 06:34:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/scheduleSendMessage.vm	2012-10-26 13:10:43 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString('scheduling_message') #openHelp( "schedule_sending_message" )</h3>
+<h3>$i18n.getString('schedule_message') #openHelp( "schedule_sending_message" )</h3>
 <table>
 	<tbody>
 		<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-10-24 04:54:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-10-26 13:10:43 +0000
@@ -7,7 +7,7 @@
 
 <script type="text/javascript" src="javascript/updateCaseAggregationForm.js"></script>
 
-<h3>$i18n.getString( "edit_case_aggregation_condition" )</h3>
+<h3>$i18n.getString( "edit_aggregation_query_builder" )</h3>
 
 <form id="updateCaseAggregationForm" action="updateCaseAggregation.action" method="post" >
 
@@ -15,7 +15,7 @@
 <table> 
 	<thead>
       <tr>
-        <th colspan="2">$i18n.getString( "case_aggregation_condition_detail" )</th>
+        <th colspan="2">$i18n.getString( "aggregation_query_builder_detail" )</th>
       </tr>
     </thead>
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-26 03:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewScheduledCaseAggTasks.vm	2012-10-26 13:10:43 +0000
@@ -9,7 +9,7 @@
 	var i18n_execute_tasks_confirmation = '$encoder.jsEscape( $i18n.getString( "execute_tasks_confirmation" ), "'" )';
 </script>
 
-<h3>$i18n.getString( "scheduling_person_aggregation" ) #openHelp( "scheduling_aggregation_query_builder" )</h3>
+<h3>$i18n.getString( "schedule_automated_aggregation" ) #openHelp( "scheduling_aggregation_query_builder" )</h3>
 
 <input id="isRunning" type="hidden" value="${running}">