dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8711
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-25 21:03:06 +0700
message:
  Translation.
modified:
  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/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/menu.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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-24 07:40:38 +0000
+++ 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
@@ -65,8 +65,8 @@
 patient_attribute=Person Attribute
 program=Program
 patient_aggregation=Person Aggregation
-patient_aggregation_query_builder=Person Aggregation Query Builder
-patient_aggregation_query_builder_management=Person aggregation query builder management
+patient_aggregation_query_builder=Person Aggregation
+patient_aggregation_query_builder_management=Person aggregation management
 dataelement_group=Data Element Group
 dataelements=Data elements
 patient_attributes=Person attributes
@@ -153,12 +153,12 @@
 duplicate=Duplicate
 dataelement_group=Data Element Group
 option_combo=Option combination
-case_aggregation_condition=Person Aggregation Query Builder
-case_aggregation_condition_detail=Person aggregation query builder details
-create_new_case_aggregation_condition=Create new person aggregation query builder
+case_aggregation_condition=Person Aggregation
+case_aggregation_condition_detail=Person aggregation details
+create_new_case_aggregation_condition=Create new person aggregation
 condition=Condition
 condition_detail=Condition details
-edit_case_aggregation_condition=Edit person aggregation query builder
+edit_case_aggregation_condition=Edit person aggregation
 program_properties=Program properties
 orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
@@ -223,7 +223,6 @@
 available_values=Available values
 insert_selected_values=Insert selected values
 display_provided_other_facility_column=Display provided other facility column
-aggregation_query_builder=Aggregation Query Builder
 patient_org_unit_registration=Person Org Unit Registration
 dataset=Data set
 filter_by_data_set=Filter by data set
@@ -302,8 +301,8 @@
 form_details = Form details
 enrollment_details = Enrollment details
 repeatable_program_stage_details = Repeatable program stage details
-scheduling_aggregation_query_builder = Scheduling Aggregation Query Builder
-intro_scheduling_aggregation_query_builder = Schedule for running aggregate builder formulas automatically.
+scheduling_person_aggregation = Scheduling Person Aggregation
+intro_scheduling_person_aggregation = Schedule for running person aggregate 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/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm	2012-10-15 04:35:32 +0000
+++ 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
@@ -20,7 +20,7 @@
 		#introListImgItem( "viewScheduleTasks.action" "scheduling_message" "scheduling" )
 	#end
 	#if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
-		#introListImgItem( "viewScheduledCaseAggCondTasks.action" "scheduling_aggregation_query_builder" "scheduling" )
+		#introListImgItem( "viewScheduledCaseAggCondTasks.action" "scheduling_person_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-15 04:35:32 +0000
+++ 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
@@ -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( "aggregation_query_builder" )</a></li>
+	<li><a href="caseAggregation.action">$i18n.getString( "patient_aggregation" )</a></li>
 	<li><a href="validationCriteria.action">$i18n.getString( "validation_criteria" )</a></li>
 </ul>
 
@@ -21,7 +21,7 @@
 		<li><a href="viewScheduleTasks.action">$i18n.getString( "message" )</a></li>
 	#end
 	#if($auth.hasAccess( "dhis-web-maintenance-patient", "viewScheduledCaseAggCondTasks" ) )
-		<li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "aggregation_query_builder" )</a></li>
+		<li><a href="viewScheduledCaseAggCondTasks.action">$i18n.getString( "patient_aggregation" )</a></li>
 	#end
 </ul>
 #end