dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5687: R 5638 to 5644 ( 2.6 released ).

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 11 Jan 2012 03:47:16 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 5687
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-01-11 10:37:02 +0700
message:
  R 5638 to 5644 ( 2.6 released ).
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageDataElementSortOrderComparator.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java
  dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java
  dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
  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_fr_FR.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml
  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_fr_FR.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_pt_PT.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties
  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/addProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm
  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/updateProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.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-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeComparator.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.comparator;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupComparator.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.comparator;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/comparator/PatientAttributeGroupSortOrderComparator.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.comparator;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageDataElementSortOrderComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageDataElementSortOrderComparator.java	2012-01-10 19:34:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageDataElementSortOrderComparator.java	2012-01-11 03:37:02 +0000
@@ -34,14 +34,25 @@
 public class ProgramStageDataElementSortOrderComparator
     implements Comparator<ProgramStageDataElement>
 {
+
     @Override
-    public int compare( ProgramStageDataElement object0, ProgramStageDataElement object1 )
+    public int compare( ProgramStageDataElement programStageDataElement0,
+        ProgramStageDataElement programStageDataElement1 )
     {
-        if ( object0.getDataElement().getSortOrder() == null ) 
-        {
-            return object1.getDataElement().getSortOrder() != null ? -1 : 0;
-        }
-        
-        return object0.getDataElement().getSortOrder().compareTo( object1.getDataElement().getSortOrder() );
+        if ( programStageDataElement0.getDataElement().getSortOrder() == null
+            || programStageDataElement0.getDataElement().getSortOrder() == 0 )
+        {
+            return programStageDataElement0.getDataElement().getName()
+                .compareTo( programStageDataElement1.getDataElement().getName() );
+        }
+        if ( programStageDataElement1.getDataElement().getSortOrder() == null
+            || programStageDataElement1.getDataElement().getSortOrder() == 0 )
+        {
+            return programStageDataElement0.getDataElement().getName()
+                .compareTo( programStageDataElement1.getDataElement().getName() );
+        }
+        return programStageDataElement0.getDataElement().getSortOrder()
+            - programStageDataElement1.getDataElement().getSortOrder();
     }
+
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValue.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml	2012-01-11 03:37:02 +0000
@@ -2519,7 +2519,7 @@
 		<title>Beneficiary registration </title>
         <para>Beneficiary registration section provides a mechanism for managing facilities which allow to registry new beneficiaries  or not.</para> 
 		<para>To access the beneficiary registration maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Registration.</para>
-		<para>There are two process for registering facilities. The first one is where the administrator will say which facility can register. The second is when end user logs in and then select a facility, system will display a waring message if the selected facility cannot register beneficiaries; else, the system will display the functions to register beneficiaries.</para>
+		<para>There are two processes for registering facilities. The first one is where the administrator will say which patients can register here. The second is where provides services ( Child Health program, Mother Care program, ...) for registered patients.</para>
 	</section>
 	<section id="program">
 		<title>Program</title>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.activityplan;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2011-12-28 05:10:42 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -204,7 +204,7 @@
         Period period )
     {
         String sql = convertCondition( aggregationCondition, orgunit, period );
-  
+        
         Collection<Integer> patientIds = aggregationConditionStore.executeSQL( sql );
 
         if ( patientIds == null )
@@ -798,11 +798,11 @@
             sql = "SELECT pi.patientid ";
         }
 
-        return sql + "FROM programinstance as pgi "
-                   + "INNER JOIN patient as pi ON pi.patientid = pgi.patientid  " 
-                   + "WHERE pgi.programid=" + programId + " "
-                       + "AND pi.organisationunitid = " + orgunitId + " " + "AND pgi.enrollmentdate >= '" + startDate
-                       + "' AND pgi.enrollmentdate <= '" + endDate + "' ";
+        return sql + "FROM programstageinstance as psi "
+            + "INNER JOIN programinstance as pgi ON psi.programinstanceid = pgi.programinstanceid "
+            + "INNER JOIN patient as pi ON pi.patientid = pgi.patientid " + "WHERE pgi.programid=" + programId + " "
+            + "AND pi.organisationunitid = " + orgunitId + " " + "AND pgi.enrollmentdate >= '" + startDate
+            + "' AND pgi.enrollmentdate <= '" + endDate + "' ";
     }
 
     private String getSQL( List<String> conditions, List<String> operators )

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.hibernate;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/ProgramAttributePopulator.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patientdatavalue.aggregation;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/PatientDataValueAggregationEngine.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patientdatavalue.aggregation;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeOptionService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramAttributeService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-01-06 04:56:54 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2012-01-11 03:37:02 +0000
@@ -169,13 +169,13 @@
     {
         return programStageInstanceStore.getProgramStageInstances( patient, completed );
     }
-
+    
     public List<ProgramStageInstance> getProgramStageInstances( ProgramInstance programInstance, Date executionDate, int min, int max )
     {
         return programStageInstanceStore.getProgramStageInstances( programInstance, executionDate, min, max );
     }
 
-    public int countProgramStageInstances( ProgramInstance programInstance, Date executionDate )
+    public int countProgramStageInstances( ProgramInstance programInstance, Date executionDate)
     {
         return programStageInstanceStore.countProgramStageInstances( programInstance, executionDate );
     }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.program;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeOptionStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramAttributeStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java	2012-01-04 04:55:19 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/DefaultProgramAttributeValueService.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/ProgramAttributeValueDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2012-01-11 03:37:02 +0000
@@ -3,8 +3,8 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xmlns:aop="http://www.springframework.org/schema/aop";
   xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";>
 
 	<!-- Store definitions -->
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java	2012-01-06 04:56:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetEventsByProgramAction.java	2012-01-11 03:37:02 +0000
@@ -113,13 +113,13 @@
         ProgramInstance programInstance = programInstanceService.getProgramInstance( programInstanceId );
 
         Date dateValue = format.parseDate( executionDate );
-
+        
         total = programStageInstanceService.countProgramStageInstances( programInstance, dateValue );
 
         this.paging = createPaging( total );
 
-        programStageInstances = programStageInstanceService.getProgramStageInstances( programInstance, dateValue,
-            paging.getStartPos(), paging.getPageSize() );
+        programStageInstances = programStageInstanceService.getProgramStageInstances( programInstance, dateValue, paging
+            .getStartPos(), paging.getPageSize() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java	2012-01-04 04:55:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java	2012-01-11 03:37:02 +0000
@@ -259,7 +259,7 @@
         {
             patientIdentifier = patientIdentifierService.getPatientIdentifier( patient );
         }
-
+        
         selectedStateManager.setSelectedProgramStageInstance( programStageInstance );
 
         selectedStateManager.setSelectedProgramStageInstance( programStageInstance );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java	2011-12-14 11:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java	2012-01-11 03:37:02 +0000
@@ -132,84 +132,46 @@
 
         if ( criteria != null )
         {
-            message = i18n.getString( "can_not_enroll_into_the_program_because" ) + " " + criteria.getName();
-            return INPUT;
-        }
-
-        if ( enrollmentDate == null )
-        {
-            message = i18n.getString( "can_not_enrol_into_the_program_because" );
-
-            return INPUT;
-        }
-
-        else
-        {
-            enrollmentDate = enrollmentDate.trim();
-
-            if ( enrollmentDate.length() == 0 )
-            {
-                message = i18n.getString( "please_specify_enrollment_date" );
-
-                return INPUT;
-            }
-
-            if ( enrollmentDate.length() != 0 )
-            {
-                Date DateOfEnrollment = format.parseDate( enrollmentDate );
-
-                if ( DateOfEnrollment == null )
-                {
-                    message = i18n.getString( "please_specify_a_valid_enrollment_date" );
-
-                    return INPUT;
-                }
-            }
-        }
-
-        if ( dateOfIncident == null )
-        {
-            message = i18n.getString( "please_specify_date_of_incident" );
-
-            return INPUT;
-        }
-
-        else
-        {
-            dateOfIncident = dateOfIncident.trim();
-
-            if ( dateOfIncident.length() == 0 )
-            {
-                message = i18n.getString( "please_specify_date_of_incident" );
-
-                return INPUT;
-            }
-
-            if ( dateOfIncident.length() != 0 )
-            {
-                Date DateOfIncident = format.parseDate( dateOfIncident );
-
-                if ( DateOfIncident == null )
-                {
-                    message = i18n.getString( "please_specify_a_valid_date_of_incident" );
-
-                    return INPUT;
-                }
-
-                Date DateOfEnrollment = format.parseDate( enrollmentDate );
-
-                if ( DateOfEnrollment.before( DateOfIncident ) )
-                {
-                    message = i18n.getString( "date_of_incident_invalid" );
-
-                    return INPUT;
-                }
-            }
-        }
-
-        // ---------------------------------------------------------------------
-        // Validation success
-        // ---------------------------------------------------------------------
+            message = i18n.getString("violate_validation_criteria") + ": " + i18n.getString( criteria.getProperty() );
+
+            switch ( criteria.getOperator() )
+            {
+
+            case ValidationCriteria.OPERATOR_EQUAL_TO:
+                message += " = ";
+                break;
+            case ValidationCriteria.OPERATOR_GREATER_THAN:
+                message += " > ";
+                break;
+            default:
+                message += " < ";
+                break;
+            }
+
+            if ( criteria.getProperty() == "birthDate" )
+            {
+                message += " " + format.formatValue( criteria.getValue() );
+            }
+            else
+            {
+                message += " " + criteria.getValue().toString();
+            }
+
+            return INPUT;
+        }
+
+        Date DateOfEnrollment = format.parseDate( enrollmentDate );
+
+        Date DateOfIncident = format.parseDate( dateOfIncident );
+
+        if ( DateOfEnrollment.before( DateOfIncident ) )
+        {
+            message = program.getDateOfEnrollmentDescription() + " "
+                + i18n.getString( "have_to_be_greater_or_equals_to" ) + " " + program.getDateOfIncidentDescription();
+
+            return INPUT;
+
+        }
 
         message = i18n.getString( "everything_is_ok" );
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2012-01-11 03:37:02 +0000
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans";
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 	xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
 
 	<!-- Selection -->
 
@@ -397,15 +397,15 @@
 		<property name="programStageInstanceService"
 			ref="org.hisp.dhis.program.ProgramStageInstanceService" />
 	</bean>
-
+	
 	<bean id="org.hisp.dhis.caseentry.action.caseentry.GetEventsByProgramAction"
-    	class="org.hisp.dhis.caseentry.action.caseentry.GetEventsByProgramAction" scope="prototype">
-    	<property name="programInstanceService"
-        	ref="org.hisp.dhis.program.ProgramInstanceService" />
-        <property name="programStageInstanceService"
- 	       	ref="org.hisp.dhis.program.ProgramStageInstanceService" />
+		class="org.hisp.dhis.caseentry.action.caseentry.GetEventsByProgramAction" scope="prototype">
+		<property name="programInstanceService"
+			ref="org.hisp.dhis.program.ProgramInstanceService" />
+		<property name="programStageInstanceService"
+			ref="org.hisp.dhis.program.ProgramStageInstanceService" />
 	</bean>
- 
+
 	<!--  Patient chart -->
 
 	<bean

=== 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-01-04 04:55:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-01-11 03:37:02 +0000
@@ -345,9 +345,6 @@
 enroll=Enroll
 update_enrollment_date=Update Enrollment Date
 please_specify_enrollment_date=Please specify program enrollment date
-please_specify_a_valid_enrollment_date=Please specify a valid program enrollment date
-please_specify_date_of_incident=Please specify date of incident
-please_specify_a_valid_date_of_incident=Please specify a valid date of incident
 date_of_incident=Date of Incident
 date_of_enrollment=Date of Enrollment
 update_enrollment=Update Enrollment
@@ -398,7 +395,7 @@
 month=Month
 year=Year
 please_verify_birthday=Please verify the birthday
-date_of_incident_invalid=Date of Enrollment should be greater and equals to Date of incident
+have_to_be_greater_or_equals_to=have to be greater and equals to
 no_patients_found=No Patients Found
 please_enter_a_valid_full_name=Please enter a valid full name
 program_unenrollment=Program UnEnrollment
@@ -456,4 +453,6 @@
 registered_by_orgunit = Registered by facility
 show_events = Show events
 event_information = Event information
-history_events = History events 
\ No newline at end of file
+history_events = History events 
+integerValueOfAge = Age(years)
+reason = Reason
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr_FR.properties	2012-01-06 12:18:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr_FR.properties	2012-01-11 03:37:02 +0000
@@ -135,7 +135,7 @@
 urine_test_albumin=Urine Test-albumine
 tt1_date=TT 1 Date
 tt2_date=TT 2 Date
-tt_booster=DTC Booster
+tt_booster=TT Booster
 ifa_tablets=Comprim\u00e9s FAF
 pregnant_women_under_gone_ultrasound_checkup=Femmes enceintes ayant subies un control d'\u00e9chographie.
 referral=R\u00e9ference
@@ -163,7 +163,7 @@
 discharge_date_from_institution=Date de sortie de l'Institution
 jsy=JSY
 jsy_benefit_paid_to_pregnant_amount_in_rs=Benefice JSY vers\u00e9 aux femmes enceintes (Montant en Rs)
-date_of_jsy_payment=Date de paiement JSY
+date_of_jsy_payment=Date Of JSY payment
 jsy_motivator=Motivateur JSY
 post_natal_care=Soins postnatal
 date_of_pnc_examination=Date de consultation postnatale
@@ -195,7 +195,7 @@
 opv=VPO
 dpt=DTC
 hepatitis_b=L'h\u00e9patite B
-weight=Poids
+weight=Weight
 child_hospitalized_due_to=Enfant hospitalis\u00e9 pour
 adverse_event_following_immunisation=Effets ind\u00e9sirables apres la vaccination
 nine_to_twelve_months_after_birth=9-12 mois apr\u00e8s la naissance
@@ -209,15 +209,15 @@
 vitamina_dose3=La vitamine A (dose 3)
 mmr_vaccine=Vaccin ROR
 two_years_above=2 ans et surtout
-vitamina_dose4=La vitamine A (dose 1)
-vitamina_dose7=La vitamine A (dose 1)
+vitamina_dose4=Vitamin A ( Dose 4)
+vitamina_dose7=Vitamin A ( Dose 7)
 typhoid_vaccine=Vaccin contre la typho\u00efde
-vitamina_dose5=La vitamine A (dose 1)
+vitamina_dose5=Vitamin A ( Dose 5)
 vitamina_dose8=Vitamine A ( Dose 8)
 tetanus_toxoid_tt10=L'anatoxine t\u00e9tanique (TT) 10
 deworming=D\u00e9parasitage
-vitamina_dose6=La vitamine A (dose 1)
-vitamina_dose9=La vitamine A (dose 1)
+vitamina_dose6=Vitamin A ( Dose 6)
+vitamina_dose9=Vitamin A ( Dose 9)
 tetanus_toxoid_tt16=L'anatoxine t\u00e9tanique (TT) 16
 anemia=L'an\u00e9mie
 blood_vdrl_test=Test de VDRL
@@ -235,9 +235,9 @@
 date_of_giving_madilu_kit=Date de remise de Kit Madilu
 madilu_kit=Kit Madilu
 prasuthi_araike1_amount_in_rs=Prasuthi Araike1 Montant en Rs.
-date_of_payment_of_prasuthi_araike1=Date de paiement de Prasuthi Araike1
+date_of_payment_of_prasuthi_araike1=Date Of Payment Of Prasuthi Araike1
 prasuthi_araike2_amount_in_rs=Prasuthi Araike2 Montant En Rs
-date_of_payment_of_prasuthi_araike2=Date de paiement de Prasuthi Araike2
+date_of_payment_of_prasuthi_araike2=Date Of Payment Of Prasuthi Araike2
 fifth_visit=Cinquieme visite
 sixth_visit=Sixi\u00e8me visite
 seventh_visit=Septi\u00e8me visite
@@ -248,8 +248,8 @@
 ifa_tablets_given=Comprim\u00e9s FAF donn\u00e9s
 anemia_hb_level=Niveau de l' anemie HB
 complication=Complication
-date_on_which_jsy_benefits_paid_to_mother=Date \u00e0 laquelle prestations JSY pay\u00e9es \u00e0 la m\u00e8re
-date_on_which_jsy_benefits_paid_to_asha=Date \u00e0 laquelle prestations JSY pay\u00e9es \u00e0 la Asha
+date_on_which_jsy_benefits_paid_to_mother=Date On Which JSY Benefits Paid To Mother
+date_on_which_jsy_benefits_paid_to_asha=Date On Which JSY Benefits Paid To Asha
 pnc_check_up=Examen postnatal
 dataentryform_management_for_program_stage=Gestion des formulaires de saisie de stade de programme
 other_attributes=Autres attributs
@@ -286,7 +286,7 @@
 status=Statut
 no_value_added_or_update=Aucune valeur ajout\u00e9e ou mise \u00e0 jour.
 date_less_incident_date=Cette date est anterieure \u00e0 la date de l'incident
-deleted=Supprim\u00e9e
+deleted=Deleted
 old_value=Ancienne valeur
 case_aggregation=Agr\u00e9gation de b\u00e9n\u00e9ficiaires
 please_specify_an_orgunit=S'il vous pla\u00eet sp\u00e9cifier une unit\u00e9 d'organisation
@@ -452,8 +452,5 @@
 delete_current_event=Deleted current event
 delete_current_event_success=Deleted \u00e9v\u00e9nement en cours avec succ\u00e8s
 please_enter_report_date=S'il vous pla\u00eet entrez la date du rapport
-comfirm_delete_current_event=Etes-vous s\u00fbr de vouloir supprimer le b\u00e9n\u00e9ficiaire?
+comfirm_delete_current_event=Are you sure you want to delete the current event ?
 registered_by_orgunit=Enregistr\u00e9 par \u00e9tablissement
-show_events=Voir les \u00e9v\u00e9nements
-event_information=Information sur l'\u00e9v\u00e9nement
-history_events=Historique des \u00e9v\u00e9nements

=== 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-01-04 04:55:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-01-11 03:37:02 +0000
@@ -147,8 +147,8 @@
 			class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
-			<param name="javascripts">javascript/customcheckbox/prettyCheckboxes.js</param>
-			<param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css
+			<param name="javascripts"></param>
+			<param name="stylesheets">style/patient.css
 				,../dhis-web-commons/paging/paging.css</param>
 		</action>
 
@@ -156,7 +156,9 @@
 			class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
-			<param name="javascripts">javascript/form.js,javascript/entry.js,../dhis-web-commons/javascripts/date.js</param>
+			<param name="javascripts">javascript/form.js,javascript/entry.js
+				,javascript/customcheckbox/prettyCheckboxes.js,../dhis-web-commons/javascripts/date.js</param>
+			<param name="stylesheets">javascript/customcheckbox/prettyCheckboxes.css</param>
 		</action>
 
 		<action name="loadProgramStageRecords"
@@ -456,22 +458,22 @@
 				/dhis-web-commons/ajax/jsonResponseError.vm</result>
 		</action>
 		
-		 <action name="getEventsByProgram"
+		<action name="getEventsByProgram"
 			class="org.hisp.dhis.caseentry.action.caseentry.GetEventsByProgramAction">
 			<result name="success" type="velocity">/content.vm</result>
 			<param name="page">/dhis-web-caseentry/historyAnonymousEvents.vm</param>
 			<param name="javascripts">javascript/anonymousRegistration.js</param>
 			<param name="stylesheets">
-                 ../dhis-web-caseentry/style/patient.css,
-                 ../dhis-web-commons/paging/paging.css</param>
-		</action>
-        
-        <action name="viewAnonymousEvents"
-                class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
-                <result name="success" type="velocity">/content.vm</result>
-                <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
-        </action>
- 
+				../dhis-web-caseentry/style/patient.css,
+				../dhis-web-commons/paging/paging.css</param>
+		</action>
+		
+		<action name="viewAnonymousEvents"
+			class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
+			<result name="success" type="velocity">/content.vm</result>
+			<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
+		</action>
+		
 		<!-- Patient-Program Enrollment -->
 
 		<action name="showProgramEnrollmentForm"

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-01-06 06:26:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-01-11 03:37:02 +0000
@@ -50,16 +50,12 @@
 				<col id="noCol">
 				<col id="deCol">    
 				<col id="entryCol">
-				#if( $programStageInstance.programInstance.program.anonymous == 'false' )
 				<col id="facilityCol">       
-				#end
 				<tr>
 					<th>$i18n.getString( "nr" )</th>
 					<th>$i18n.getString( "data_element" )</th>                   
 					<th>$i18n.getString( "entry" )</th>
-					#if( $programStageInstance.programInstance.program.anonymous == 'false' )
-						<th>$i18n.getString( "provided_elsewhere" )</th>             
-					#end
+					<th>$i18n.getString( "provided_elsewhere" )</th>             
 				</tr>
 			#set( $dataElementRowCount = 0 )
 			#set( $mark = 0 )
@@ -117,10 +113,7 @@
 								<input name="entryfield" data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id, $optionCombo.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"  style="text-align:center;">
 							#end
 						#end
-					</td>  
-					
-					#if($programStageInstance.programInstance.program.anonymous == 'false') 					
-					
+					</td>   
 					##providedByAnotherFacility                
 					<td>   
 						#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
@@ -135,9 +128,7 @@
 						 #else
 							<input name="providedByAnotherFacility" id="$id" type="checkbox" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
 						 #end                         
-					</td>
-					
-					#end					
+					</td>    
 				</tr>
 				#set( $tabIndex = $tabIndex + 1 )
 			#end

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2011-12-28 06:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2012-01-11 03:37:02 +0000
@@ -1,31 +1,35 @@
-   	
+<form id='dataRecordingSelectForm' name='dataRecordingSelectForm'>
+
 <table class="mainPageTable" id='patientInfoDiv'> 
 	<tr>
-		<td>
-	<table>
-		<tr>            
-			<td class="bold">$i18n.getString( "full_name" ):</td>
-			<td>$encoder.htmlEncode( $patient.getFullName() )<td>
-		</tr>
-		<tr>
-			<td class="bold">$i18n.getString( "gender" ):</td>
-			<td>$i18n.getString( $patient.gender )</td>
-		</tr>
-		<tr>
-			<td class="bold">$i18n.getString( "date_of_birth" ):</td>
-			<td>$format.formatDate( $patient.birthDate )<td>
-		</tr>
-		<tr>
-			<td class="bold">$i18n.getString( "age" ):</td>
-			<td>$encoder.htmlEncode( $patient.getAge() )</td>
-		</tr>
-		</table>
-		<td style="vertical-align:top" rowspan='4'>
+		<td valign="top">
+			<table>
+				<tr>            
+					<td class="bold">$i18n.getString( "full_name" ):</td>
+					<td>$encoder.htmlEncode( $patient.getFullName() )<td>
+				</tr>
+				<tr>
+					<td class="bold">$i18n.getString( "gender" ):</td>
+					<td>$i18n.getString( $patient.gender )</td>
+				</tr>
+				<tr>
+					<td class="bold">$i18n.getString( "date_of_birth" ):</td>
+					<td>$format.formatDate( $patient.birthDate )<td>
+				</tr>
+				<tr>
+					<td class="bold">$i18n.getString( "age" ):</td>
+					<td>$encoder.htmlEncode( $patient.getAge() )</td>
+				</tr>
+			</table>
+		</td>
+		
+		<td style="vertical-align:top">
 			<div id="currentSelection" style="float:right"></div>
 		</td>
 	</tr>
+
 	<tr>
-		<td colspan='2'><hr style="clear:both"></td>
+		<td colspan='2'><hr style="clear:both"/></td>
 	</tr>
 </table>
 
@@ -95,3 +99,16 @@
 		</td>
 	</tr>
 </table>
+
+</form>
+
+<script>
+	jQuery('#dataRecordingSelectForm').ready(function(){ 
+		var programs = byId('programId');
+		if( programs.options.length == 2 )
+		{
+			byId('programId').selectedIndex = 1;
+			loadProgramStages();
+		}
+	});
+</script>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2011-12-22 04:59:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2012-01-11 03:37:02 +0000
@@ -35,13 +35,17 @@
 			setInnerHTML( 'currentSelection', '' ); 
 			var history = '<h4>' + i18n_program_stages_history_plan + '</h4>';
 			history += '<table>';
+			history += '<tr>';
+			history += '<td class="bold row">' + i18n_program_stage + '</td>';
+			history += '<td class="bold row">' + i18n_scheduled_for + '</td>';
+			history += '</tr>';
 			for ( i in json.programStageInstances ) 
 			{
-				history += '<tr>';
+				history += '<tr bgcolor=' + json.programStageInstances[i].colorMap + '>';
                 history += '<td>';
-                history += '<span class="bold">' + json.programStageInstances[i].name + '</span>';
+                history += '<span>' + json.programStageInstances[i].name + '</span>';
 				history += '</td>';
-                history += '<td style="text-align:center" bgcolor=' + json.programStageInstances[i].colorMap + '>';
+                history += '<td style="text-align:center">';
                 history += json.programStageInstances[i].infor;
                 history += '</td>';
                 history += '</tr>';
@@ -833,4 +837,4 @@
 		{   
 			loadDataEntry();
 		});
-}
\ No newline at end of file
+}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2011-12-13 03:28:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-01-11 03:37:02 +0000
@@ -480,6 +480,7 @@
 		
 		hideById('programEnrollmentDiv');
 		
+		hideEnrolmentField();
 		return;
 	}
 		
@@ -491,6 +492,7 @@
 		}, function()
 		{
 			showById('programEnrollmentDiv');
+			showEnrolmentField();
 			
 			var singleEvent = jQuery('#programId option:selected').attr('singleevent');
 			if(singleEvent=='true')
@@ -521,6 +523,9 @@
 		url: 'validatePatientProgramEnrollment.action',
 		data: getParamsForDiv('programEnrollmentSelectDiv'),
 		success: function(json) {
+			
+			hideById('message');
+			
 			var type = json.response;
 			if ( type == 'success' )
 			{
@@ -528,11 +533,11 @@
 			}
 			else if ( type == 'error' )
 			{
-				showErrorMessage( i18n_program_enrollment_failed + ':' + '\n' + message );
+				setMessage( i18n_program_enrollment_failed + ':' + '\n' + message );
 			}
 			else if ( type == 'input' )
 			{
-				showWarningMessage( json.message );
+				setMessage( json.message );
 			}
       }
     });
@@ -894,3 +899,17 @@
 			height: 300
 		});
 }
+
+function hideEnrolmentField( )
+{
+	hideById('enrollmentDateTR');
+	hideById('dateOfIncidentTR');
+	hideById('enrollBtn');
+}
+
+function showEnrolmentField( )
+{
+	showById('enrollmentDateTR');
+	showById('dateOfIncidentTR');
+	showById('enrollBtn');
+}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2011-10-06 04:38:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-01-11 03:37:02 +0000
@@ -1,6 +1,6 @@
 <input type='hidden' id='registerEvent' name='registerEvent' value='$registerEvent'>
 
-#if( $programStageInstances )
+#if( $programStageInstances.size() > 0 )
 	<table width=100%>
 		<col id="noCol">
 		<col id="stageCol">    

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2011-12-14 07:33:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-01-11 03:37:02 +0000
@@ -1,6 +1,6 @@
 <h3>$i18n.getString( "patient_registered" )</h3>
 
-<div id='programEnrollmentSelectDiv'>
+<form id='programEnrollmentSelectDiv' method='POST'>
 
     <input type="hidden" id="patientId" name="patientId" value="$patient.id">    
 
@@ -55,26 +55,28 @@
 					<td></td>
 					</td></td>
 				</tr>   
-				<tr>
-					<td><label for="enrollmentDate"><span id='enrollmentDateDescription'></span><em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-					<td colspan='2' align='left'><input type="text" id="enrollmentDate" name="enrollmentDate" style='width:30em' disabled="disabled" ></td>
+				<tr id='enrollmentDateTR' style='display:none;'>
+					<td><label for="enrollmentDate"><span id='enrollmentDateDescription'></span><em title="$i18n.getString( "required" )" class="required"> * </em></label></td>
+					<td colspan='2' align='left'><input type="text" id="enrollmentDate" name="enrollmentDate" style='width:30em' disabled="disabled" class="{validate:{required:true}}"></td>
 				</tr>
-				<tr>
-					<td><label for="dateOfIncident"><span id='dateOfIncidentDescription'></span><em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-					<td colspan='2'><input type="text" id="dateOfIncident" name="dateOfIncident" style='width:30em' disabled="disabled" ></td>
+				<tr id='dateOfIncidentTR' style='display:none;'>
+					<td><label for="dateOfIncident"><span id='dateOfIncidentDescription'></span><em title="$i18n.getString( "required" )" class="required"> * </em></label></td>
+					<td colspan='2'><input type="text" id="dateOfIncident" name="dateOfIncident" style='width:30em' disabled="disabled" class="{validate:{required:true}}"></td>
 				</tr>
 				<tr>
 					<td></td>
 					<td></td>   
 					<td></td>                             
 				</tr>
-				
 				<tr>
 					<td style="width:180px"></td>
 					<td colspan='2'>
-						<input type="button" id='enrollBtn' name='enrollBtn' value="$i18n.getString( 'enroll_to_program' )" style='width:10em' onclick="validateProgramEnrollment();" disabled='disabled'/>
+						<input type="submit" id='enrollBtn' name='enrollBtn' value="$i18n.getString( 'enroll_to_program' )" style='width:12em; display:none;' disabled='disabled'/>
 					</td>
 				</tr>
+				<tr>
+					<td colspan='3'><span id='message'></span></td>
+				</tr>
 			</table>
 			
 			<div id='programEnrollmentDiv' style='display:none;'></div>
@@ -86,13 +88,17 @@
 			<div id='dataEntryFormDiv'  style='display:none;'></div>
 
 		</div>
-</div>
+</form>
 
 <script>
 	var i18n_enroll_to_program = '$encoder.jsEscape( $i18n.getString( "enroll_to_program" ) , "'")';
 	
 	jQuery('#programEnrollmentSelectDiv').ready(function()
 		{
+			validation( 'programEnrollmentSelectDiv', function(form){
+				validateProgramEnrollment();
+			});
+			
 			jQuery("#tabs").tabs();
 			datePickerValid( 'enrollmentDate' );
 			datePickerValid( 'dateOfIncident' );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2011-12-29 05:42:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm	2012-01-11 03:37:02 +0000
@@ -85,7 +85,6 @@
 </div>
 
 <script type="text/javascript">
-    initCustomCheckboxes();
 	
 	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
 	var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2011-10-05 15:59:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramStages.vm	2012-01-11 03:37:02 +0000
@@ -15,9 +15,9 @@
 		"name": "$programStageInstance.programStage.name",
 		"colorMap": "$colorMap.get( $programStageInstance.id )",
 		"infor": #if( $programStageInstance.completed )
-					"$i18n.getString( 'completed_on' )$format.formatDate( $programStageInstance.executionDate )"
+					"$format.formatDate( $programStageInstance.executionDate )"
 				#else
-					"$i18n.getString( 'scheduled_for' )$format.formatDate( $programStageInstance.dueDate )"
+					"$format.formatDate( $programStageInstance.dueDate )"
 				#end
 	  }#if( $velocityCount < $programInstance.programStageInstances.size() ),#end
 	#end]

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2011-12-28 06:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm	2012-01-11 03:37:02 +0000
@@ -71,5 +71,6 @@
 	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
 	var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
 	
-	var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
+	var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
+	var i18n_scheduled_for = '$encoder.jsEscape( $i18n.getString( "scheduled_for" ) , "'")';
 </script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2011-12-21 10:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css	2012-01-11 03:37:02 +0000
@@ -64,3 +64,7 @@
   text-align: right;
 }
 
+td.row
+{
+border-bottom-style:dotted;
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/AddCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggConditionDescriptionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.caseaggregation;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggPSDataElementsAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAllCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java	2011-12-30 04:59:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetPSDataElementsAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119,6 +119,17 @@
             {
                 DataElement de = deIterator.next();
 
+                if ( de.getType().equals( DataElement.VALUE_TYPE_STRING ) && de.isMultiDimensional() )
+                {
+                    optionComboIds.add( "[DE:" + psId + "." + de.getId() + ".0]" );
+
+                    optionComboNames.add( de.getName() );
+
+                    optionComboType.add( "1:" + de.getType() );
+
+                    continue;
+                }
+
                 DataElementCategoryCombo dataElementCategoryCombo = de.getCategoryCombo();
 
                 List<DataElementCategoryOptionCombo> optionCombos = new ArrayList<DataElementCategoryOptionCombo>(

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetProgramStagesAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/RemoveCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/UpdateCaseAggregationConditionAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelDataEntryFormAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetSelectedDataElementsAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDataEntryFormAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectDataElementAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SelectProgramStageDataElementAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ValidateDataEntryFormAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.dataentryform;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/DefinePatientOrgnunitRegistrationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/orgunitregistration/GetPatientOrgnunitRegistrationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/GetPatientAttributesWithoutGroupAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientchart/ValidatePatientChartAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ImportPatientAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/ValidateUploadExcelFileAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientimport/XMLItem.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAttributeAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramAssociationsAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.program;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/GetProgramAttributeListAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/RemoveProgramAttributeAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAttributeAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddProgramValidationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramValidationListAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/RemoveProgramValidationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateProgramValidationAction.java	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/ValidateValidationCriteriaAction.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.action.validation;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.state;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java	2012-01-11 03:37:02 +0000
@@ -1,7 +1,7 @@
 package org.hisp.dhis.patient.state;
 
 /*
- * Copyright (c) 2004-2012, University of Oslo
+ * Copyright (c) 2004-2010, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-01-05 20:39:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2012-01-11 03:37:02 +0000
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans";
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 	xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
 
 	<bean id="org.hisp.dhis.patient.state.SelectedStateManager" class="org.hisp.dhis.patient.state.DefaultSelectedStateManager">
 		<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />

=== 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	2011-12-26 11:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-01-11 03:37:02 +0000
@@ -33,6 +33,7 @@
 please_select=Please Select
 patients_and_programs=Beneficiaries and Programs
 is=is
+'s='s
 please_select_relationship_type=Please select relationship type
 confirm_delete_relationship_type=Are you sure you want to delete relationship type?
 relationship_type=Relationship Type
@@ -83,8 +84,8 @@
 unselect_all_in_group=Unselect all in group
 unselect_all_at_level=Unselect all at level
 select_all_at_level=Select all at level
-define_associations=Define Association
-define_program_associations=Define Program Associations
+assign_program_to_orgunits=Assign program to organisation units
+assign_program_to_orgunits_for_registering=Assign program to organisation units for registering
 programs=Programs
 selected_programs=Selected Programs
 available_programs=Available Programs
@@ -385,4 +386,8 @@
 irregular_encounter=Irregular encounter
 date_of_birth=Date of Birth
 anonymous=Anonymous
-edit_program_validation = Edit program validation 
\ No newline at end of file
+edit_program_validation = Edit program validation 
+age = Age
+birthDate = Birthdate
+violate_validation_criteria = Violate validation criteria
+assign_validation_for_programs = Assign validation for programs
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_fr_FR.properties	2012-01-06 12:18:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_fr_FR.properties	2012-01-11 03:37:02 +0000
@@ -1,388 +1,673 @@
-available_patient_attributes=Attributs b\u00e9n\u00e9ficiaire Disponible
-selected_patient_attributes=Attributs b\u00e9n\u00e9ficiaires s\u00e9lectionn\u00e9s
-groupBy=Groupe par
+add_new_field=Ajouter un nouveau champ
+add_new_sql_view=Ajouter une nouvelle vue SQL
+alias=Alias
+all=Selectionner tous
+allow_show_zero=afficher Zero
+append=Ajouter
+apply_lock_on_all=Appliquer des verrous sur toutes
+archive=Archives
+archiving=Archivage
+ascending=Croissant
+assigned_to=Attribue
+attribute=Aspect
+attribute_management=Aspect gestion
+attribute_option=Aspect option
+attribute_option_management=Aspect gestion de l' option
+attribute_sort_order=Aspect tri et ordonner
+available_attribute_options=Options des attributs disponibles
+available_dataset=Ensembles de donn\u00e9es disponibles
+browse=Parcourir
+browse_by=Parcourir par
+browse_data_at_descendant_levels=Parcourir les donnees au niveau ascendant
+browse_data_at_this_level=Parcourir les donnees a ce niveau
+browser=Explorateur de donn\u00e9es
+cache_statistics=Statistique de caches
+cannot_remove_any_more=Impossible de supprimer plus
+category_option_combo_does_not_exist=L'identifiant ne reference pas une combinaison d'option
+category_option_combo_id_not_numeric=L'identifiant de la combinaison d'option de cat\u00e9gorie doit \u00eatre un nombre
+category_structure=Structure de cat\u00e9gorie
+child_tree=Arbre des enfants
+clear_cache=Vider le cache
+clear_data_mart=Vider data mart
+clear_data_mart_aggregated_datavalues=Vider data mart (valeurs de donn\u00e9es agr\u00e9g\u00e9es)
+clear_data_mart_aggregated_indicatorvalues=Vider data mart (valeurs d'indicateurs agr\u00e9g\u00e9es)
+clear_dataset_completeness=Effacer les donn\u00e9es de compl\u00e9tude des ensembles de donn\u00e9es
+clear_hierarchy_history=Effacer l'historique de la hierarchie
+clear_zero_values=Effacer les valeurs zero
+click_on_this_orgunit=Cliquer sur cette unit\u00e9 d'oranisation
+confirm_delete_attribute=Voulez-vous supprimer cet attribut?
+confirm_delete_attribute_option=Voulez-vous supprimer cette option d'attribut?
+confirm_delete_constant=Voulez-vous supprimer cette constante?
+confirm_delete_sqlview=Voulez-vous supprimer cet objet de vue sql?
+constant=Constante
+constant_management=Gestion de constantes
+counts_of_aggregated_values=Total de donn\u00e9es saisies
+create_new_attribute=Ajouter un attribut
+create_new_attribute_option=Ajouter une option d'attribut
+create_new_constant=Ajouter constant
+criteria_and=Crit\u00e8re ET
+criteria_or=Crit\u00e8re OU
+data_administration=Administration des Donn\u00e9es
+data_archive=Archive de donn\u00e9es
+data_browser=Explorateur de donn\u00e9es
+data_element_category_option_combo_name=Nom de l'option de combinaison de cat\u00e9gorie
+data_element_does_not_exist=L'identifiant ne reference pas un \u00e9l\u00e9ment de donn\u00e9e
+data_element_group_list=Liste de groupes d'\u00e9l\u00e9ments donn\u00e9es
+data_element_group_set_structure=Structure d'ensemble de grouipes d'\u00e9l\u00e9ments de donn\u00e9e
+data_element_structure=Structure d'\u00e9l\u00e9ment de donn\u00e9e
+data_elements_assigned_to_period_types_with_different_period_types=El\u00e9ments de donn\u00e9e assign\u00e9s aux ensembles de donn\u00e9es ayant des types de p\u00e9riode diff\u00e9rents
+data_elements_violating_compulsory_group_sets=El\u00e9ments de donn\u00e9e violant les ensembles de groupes obligatoires
+data_elements_violating_exclusive_group_sets=El\u00e9ments de donn\u00e9e violant les ensembles de groupes mutuellement exclusifs
+data_elements_without_data_set=El\u00e9ments de donn\u00e9es n'appartenant \u00e0 aucun ensemble de donn\u00e9es
+data_elements_without_groups=El\u00e9ments de donn\u00e9es n'appartenant \u00e0 aucun groupe
+data_integrity=Int\u00e9grit\u00e9 des donn\u00e9es
+data_integrity_checks_performed=Controles d'int\u00e9grit\u00e9 de donn\u00e9es effectu\u00e9s
+data_locking=Verrouillage des donn\u00e9es
+data_locking_form=Formulaire de verrouillage des donn\u00e9es
+data_set_list=Liste des ensembles de donn\u00e9es
+data_sets_not_assigned_to_organisation_units=Les ensembles de donn\u00e9es non assign\u00e9s \u00e0 des unit\u00e9s d'organisation
+data_statistics=Statistique des donn\u00e9es
+dataelement_id_not_numeric=L'identifiant de l'\u00e9l\u00e9ment de donn\u00e9e doit \u00eatre un nombre
+dataset_not_selected=Selectionner les ensembles de donn\u00e9es disponibles
+descending=D\u00e9croissant
+disk_count=Compte de disque
+done_number_of_values=fait.Nombre de valeurs archiv\u00e9es est maintenant
+drill_down_real_values=Les donn\u00e9es saisies
+drilldown_choose_period_type=Veuillez choisir une p\u00e9riode
+drilldown_data_element=El\u00e9ment de donn\u00e9es
+drilldown_data_element_group=Groupe des \u00e9l\u00e9ments de donn\u00e9es
+drilldown_data_set=Ensemble de donn\u00e9es
+drilldown_enddate_invalid=Veuillez saisir une date de fin valide
+drilldown_export=Exporter
+drilldown_formdate_invalid=Veuillez saisir saisir une date de fin valide
+drilldown_fromdate_is_later_than_todate=La date de debut est posterieure \u00e0 la date de fin
+drilldown_orgunit=Unit\u00e9 d'organisation
+drilldown_orgunit_group=Groupe d'unit\u00e9s d'organisation
+drilldown_select_browse_mode=Veuillez selectionner le mode de l'explorateur
+drilldown_select_org_unit=S'il vous pla\u00eet choisissez une unit\u00e9 d'organisation
+duplicate_data_elimination=Elimination des donn\u00e9es dupliqu\u00e9es
+dynamic_attributes=Attributs dynamiques
+earliest=Le plus t\u00f4t
+earliest_date_used_if_no_date_selected=La date la plus ancienne sera utilis\u00e9e si aucune date n'est s\u00e9lectionn\u00e9e
+edit_attribute=Modifier un attribut
+edit_attribute_option=Modifier option d'attribut
+edit_constant=Modifier Constante
+eliminate=\u00c9liminer
+eliminate_from_archive=\u00c9liminer les doublons de la source d'archive
+eliminate_from_regular=\u00c9liminer les doublons de source r\u00e9guli\u00e8re
+eliminate_oldest=\u00c9liminer les plus anciens doublons
+eliminating=Elimination
+elimination_done=Elimination accomplie
+exec_avg_time=Temps moyen d'exec
+exec_count=Compte d'exec
+exec_max_time=Temps max d'exec
+exec_min_time=Temps min d'exec
+exec_row_count=Compte de lignes d'exec
+export_pdf=Export PDF
+export_results_for=Exporter les r\u00e9sultats pour
+export_to=Exporter vers
+expression_is_empty=Expression est vide
+expression_not_well_formed=Expression n'est pas bien formul\u00e9e
+failed_to_create_view_table_for=Echec de creation de table de vue pour
+field=Champs
+file_name=Nom de fichier
+filter=Filtre
+font_size=Taille de la police
+found=Trouv\u00e9
+from_date=Date de d\u00e9but
+generate_query=G\u00e9n\u00e9rer la requ\u00eate
+generate_resource_tables=G\u00e9n\u00e9rer des tables
+generate_values_success=Valeurs g\u00e9n\u00e9r\u00e9es avec succ\u00e8s
+generating_resource_tables=G\u00e9n\u00e9ration des tables de ressources
+get_report_as_csv=T\u00e9l\u00e9charger en CSV
+get_report_as_pdf=T\u00e9l\u00e9charger en PDF
+get_report_as_xls=T\u00e9l\u00e9charger en Excel
+group_by=Group\u00e9 par
+group_set_structure=Structure d'ensemble de groupes d'unit\u00e9s d'organisations normalis\u00e9e
+header_field=Champ n \u00b0
+hide_advance=Cacher l'outil de conception
+hide_warning=Cacher avertissement
+hit_count=Nombre de sollicitation
+ignore_zero_data_values=Ignorer les valeurs de donn\u00e9es zero
+indicator_group_set_structure=Structure de l'ensemble de groupes d'indicateurs
+indicator_types=Types d'indicateur
+indicators_violating_compulsory_group_sets=Indicateurs violant les ensembles de groupes obligatoires
+indicators_violating_exclusive_group_sets=Indicateurs violant les ensembles de groupes mutuellement exclusifs
+indicators_with_blank_formulas=Indicateurs avec formules vides
+indicators_with_identical_formulas=Indicateurs avec formules identiques
+indicators_without_groups=Indicateurs n'appartenant \u00e0 aucun groupe
+information_successfully_locked=Donn\u00e9es verrouill\u00e9es avec succ\u00e8s
+information_successfully_unlocked=Donn\u00e9es d\u00e9verrouill\u00e9es avec succ\u00e8s
+integer=Entier
+intro__patient_data_archive=Archiver les donn\u00e9es de b\u00e9n\u00e9ficiaires qui ne sont pas actuellement pertinentes au syst\u00e8me afin d'am\u00e9liorer ses performances. Ces donn\u00e9es peuvent \u00eatre aussi d\u00e9sarchiv\u00e9es
+intro_attribute=Cr\u00e9er et mettre \u00e0 jour les attributs dynamiques.
+intro_attribute_option=Cr\u00e9er et mettre \u00e0 jour les options d'attributs dynamiques.
+intro_cache_statistics=Surveiller et effacer le cache de la base de donn\u00e9es du syst\u00e8me. Fournit les informations sur les caches d'objets et de requ\u00eates
+intro_constant=Cr\u00e9er la constante qui serait incluse dans l'expression de l'indicateur / r\u00e8gle de validation.
+intro_data_archive=Archiver les donn\u00e9es qui ne sont pas actuellement pertinentes au syst\u00e8me afin d'am\u00e9liorer ses performances. Ces donn\u00e9es peuvent \u00eatre aussi d\u00e9sarchiv\u00e9es
+intro_data_browser=Parcourir la base de donn\u00e9es et obtenir un apercu sur o\u00f9 il y a des donn\u00e9es. Voir et exporter le nombre d'\u00e9l\u00e9ments de donn\u00e9es ainsi que des donn\u00e9es brutes
+intro_data_integrity=Ex\u00e9cutez des v\u00e9rifications d'int\u00e9grit\u00e9 des donn\u00e9es et de d\u00e9voiler les anomalies et les probl\u00e8mes dans la configuration des m\u00e9ta donn\u00e9es
+intro_data_locking=Refuser que les donn\u00e9es soient saisies ou import\u00e9es pour des ensembles de donn\u00e9es de certaines combinaisons d'unit\u00e9s d'organisation et de p\u00e9riodes
+intro_data_statistics=parcourir les nombres d'objets dans la base de donn\u00e9es tels que les \u00e9l\u00e9ments de donn\u00e9es, indicateurs, ensembles de donn\u00e9es et valeurs de donn\u00e9es
+intro_duplicate_data_elimination=Elimer les donn\u00e9es enr\u00e9gistr\u00e9es pour les \u00e9l\u00e9ments de donn\u00e9es dupliqu\u00e9s. Utile lorsque les donn\u00e9es ont \u00e9t\u00e9 saisies pour des \u00e9l\u00e9ments de donn\u00e9es identiques
+intro_maintenance=Effectuer les t\u00e2ches d'entretien telles que l'\u00e9lagage des valeurs de donn\u00e9es et les p\u00e9riodes et le nettoyage des tables ressource de la bases de donn\u00e9es.
+intro_min_max_value_generation=G\u00e9n\u00e9rer les valeurs min-max qui peuvent \u00eatre utilis\u00e9es pour la validation des donn\u00e9es pendant les processus de saisie des donn\u00e9es et de validation.
+intro_organisation_unit_merge=Fusionner deux unit\u00e9s d'organisation et leurs valeurs de donn\u00e9es.Les donn\u00e9es sont fusionn\u00e9es en fonction de l'existence et la date de derni\u00e8re modification.
+intro_organisation_unit_pruning=Retirer un sous-arbre de l'arbre d'unit\u00e9s d'organisation.Utiles lors de la cr\u00e9ation et le d\u00e9ploiement de bases de donn\u00e9es locales.
+intro_patient_data_archive=Archiver les donn\u00e9es de b\u00e9n\u00e9ficiaires qui ne sont pas actuellement pertinentes pour le syst\u00e8me. Ces donn\u00e9es peuvent \u00eatre aussi d\u00e9sarchiv\u00e9es
+intro_resource_table=G\u00e9n\u00e9rer des tables ressources de la base de donn\u00e9es pour la hi\u00e9rarchie des unit\u00e9s d'organisation et la structure d'ensembles de groupes entre autres.
+intro_sql_view=Cr\u00e9er des vues SQL de bases de donn\u00e9es.Ces vues utiliseront g\u00e9n\u00e9ralement les tables ressources pour fournir des vues commodes pour des tierces parties.
+intro_zero_storage_management=D\u00e9finir les \u00e9l\u00e9ments de donn\u00e9es pour lesquels les valeurs z\u00e9ro doivent \u00eatre stock\u00e9es ou ignor\u00e9es.Utile pour r\u00e9duire la taille des bases.
+invalid_indicator_denominators=D\u00e9nominateurs invalide
+invalid_indicator_numerators=Num\u00e9rateurs invalide
+invalid_validation_rule_left_side_expressions=Expression de gauche de r\u00e8gle de validation invalide
+invalid_validation_rule_right_side_expressions=Expression de droite de r\u00e8gle de validation invalide
+is_created=est cr\u00e9\u00e9
+landscape=Paysage
+last_30_days=Les 30 derniers jours
+last_7_days=Les 7 derniers jours
+latest=La derni\u00e8re
+latest_date_used_if_no_date_selected=La Derni\u00e8re date sera utilis\u00e9e si aucune date n'est s\u00e9lectionn\u00e9e
+level_must_be_int=Le Niveau doit \u00eatre un nombre
+loading=Chargement, attendre SVP
+lock=Verrouillage
+lock_all_at_level=Verrouillez \u00e0 tous les niveaux
+lock_all_in_group=Verrouillez tout dans le groupe
+locked=Verrouill\u00e9
+locked_datasets=Verrouill\u00e9es les ensembles de donn\u00e9es
+locking_mode=Mode de verrouillage
+maintenance_performed=Maintenance effectu\u00e9e
+mandatory=Obligatoire
+mem_count=Nombre de memoire
+mem_size=Taille de memoire
+merge=Fusionner
+merging=Fusion
+merging_done=La fusionest est faite
+min_max_value_generation=Generation de valeur Min-Max
+miss_count=Compte manquant
+name_is_null=Le Nom ne peut \u00eatre nul
+navigation=Navigation
+negative_integer=Entier n\u00e9gatif
+no_data_found=Aucune donn\u00e9e trouv\u00e9e
+no_hits=
+no_values=Pas de valeurs trouv\u00e9es
+no_violations=Aucune violation
+noaction=Veuillez selectionner qu'une unit\u00e9 d'organisation assign\u00e9e ou verouill\u00e9e
+not_choose_dataset=Veuillez selectionner un ensemble de donn\u00e9es
+not_choose_organisation=Veuillez selectionner une unit\u00e9 d'organisation
+number_of_objects=Nombre d'objets
+number_of_queries_executed=Nombre de requ\u00eates ex\u00e9cut\u00e9es
+number_of_results=Nombre de r\u00e9sultats
+object_type=Type d'objet
+organisation_not_selected=Il n'ya pas d'unit\u00e9 d'organisation choisie
+organisation_unit_group_set_structure=Structure d'ensemble de groupes d'unit\u00e9s d'organisation
+organisation_unit_groups=Groupes d'unit\u00e9s d'organisation
+organisation_unit_groups_without_group_sets=Groupes d'unit\u00e9s d'organisation n'appartenant \u00e0 aucun ensemble de groupes
+organisation_unit_merge=Fusion d'unit\u00e9s d'Organisation
+organisation_unit_not_selected=S'il vous pla\u00eet choisissez une unit\u00e9 d'organisation
+organisation_unit_pruning=Elagage Unit\u00e9 d'Organisation
+organisation_unit_structure=Structure des unit\u00e9s d'Organisation
+organisation_units_lock=Unit\u00e9s Organisation [ Noir
+organisation_units_violating_compulsory_group_sets=Unit\u00e9s d'Organisation violant les ensembles de groupes obligatoires
+organisation_units_violation_exclusive_group_sets=Unit\u00e9s d'Organisation violant les ensembles de groupes mutuellement exclusifs
+organisation_units_with_cyclic_references=Unit\u00e9s Organisation avec des r\u00e9f\u00e9rences cycliques
+organisation_units_without_groups=Unit\u00e9s dOrganisation sans groupe
+orgunit_group_list=Liste de groupes d'unit\u00e9s d'organisation
+orphaned_organisation_units=Unit\u00e9s d'organisation orphelins
+overlapping_values=chevauchement des valeurs donn\u00e9es dans l'archive.
+page_layout=La mise en page
+patient_data_archive=Archive des donnees du beneficiaire
+perform_maintenance=Effectuer la maintenance
+performing_maintenance=Effectue la maintenance
+period_not_selected=S\u00e9lectionnez P\u00e9riode Disponible
+period_type=Type de p\u00e9riode
+periods=P\u00e9riodes
+portrait=Portrait
+positive_integer=Entier positif
+properties_welformed=Seuls les lettres, chiffres, asterisque (*), les virgules (,), et les caract\u00e8res d'espace sont autoris\u00e9s
+prune=Elaguer
+prune_organisation_unit_confirmation=ATTENTION: Si \u00abOUI\u00bb, donc l'ensemble des unit\u00e9s d'organisation, qui n'apparteniennent pas \u00e0 cette unit\u00e9 d'organisation s\u00e9lectionn\u00e9es seront supprim\u00e9es  n Etes-vous s\u00fbr de vouloir \u00e9laguer?
+prune_periods=Elaguer les p\u00e9riodes
+pruning=\u00c9lagage
+pruning_done=L'\u00e9lagage effectu\u00e9
+pruning_interrupted=Vous devez choisir l'unit\u00e9 d'organisation qui a un parent a \u00e9laguer.S'il vous pla\u00eet essayez de nouveau!
+put_count=Mettre le decompte
+query_cache_statistics=Statistique des caches de requ\u00eates
+query_name=Nom de la requ\u00eate
+query_took=La requ\u00eate a pris
+raw_data=Donn\u00e9es brutes
+rebuild_data_mart_index=Reconstruire l'index du data mart
+regenerate_resource_tables_viewers=R\u00e9g\u00e9n\u00e9rer les tables ressources et tables de Vue
+regenerating_resource_tables_and_views=Pr\u00e9paration pour la r\u00e9g\u00e9n\u00e9ration des tables ressources et tables de vue
+region_name=Nom de la r\u00e9gion
+remove_values_success=Valeurs supprim\u00e9es avec succ\u00e8s
+request_returned_in=Requ\u00eate r\u00e9pondue en
+resource_table=Table ressource
+resource_tables_generated=Tables ressource g\u00e9n\u00e9r\u00e9es
+resourcetable_at_position=Table ressources \u00e0 la position
+run=Ex\u00e9cuter la requ\u00eate
+search_results_for=R\u00e9sultats de la recherche pour
+second_level_cache_statistics=Statistique de deuxi\u00e8me niveau de cache
+sections_with_invalid_category_combinations=Sections avec les combinaisons de categorie invalides
+select_a_period=Veuillez choisir une p\u00e9riode
+select_a_period_type=Veuillez s\u00e9lectionner un type de p\u00e9riode
+select_all=S\u00e9lectionnez tout
+select_all_at_level=S\u00e9lectionnez tout \u00e0 tous les niveaux
+select_all_at_level_saved=V\u00e9rouiller tout \u00e0 tous les niveaux Enr\u00e9gistr\u00e9
+select_all_in_group=S\u00e9lectionner tout dans le groupe
+select_all_in_group_saved=Verrouiller tout dans le groupe Sauv\u00e9garde\u00e9
+select_different_data_elements=Veuillez choisir deux \u00e9l\u00e9ments de donn\u00e9esdiff\u00e9rents
+select_different_org_units=Veuillez choisir deux unit\u00e9s d'organisation diff\u00e9rentes
+select_mode=S\u00e9lectionner le mode
+select_parent_organisation_unit=S\u00e9lectionner l'unit\u00e9 d'organisation parent
+select_period_all=S\u00e9lectionner une p\u00e9riode / Tous
+select_period_type=S\u00e9lectionner le type de p\u00e9riode
+select_properties=S\u00e9lectionner la propri\u00e9t\u00e9
+select_resourcetables=S\u00e9lectionner une table ressource
+select_sorttypes=S\u00e9lectionner le type de tri
+select_the_data_element_to_eliminate=S\u00e9lectionner l'\u00e9l\u00e9ment de donn\u00e9es a \u00e9liminer
+select_the_data_element_to_keep=S\u00e9lectionner l'\u00e9l\u00e9ment de donn\u00e9es \u00e0 garder
+select_the_org_unit_to_eliminate=S\u00e9lectionner l'unit\u00e9 d'organisation \u00e0 \u00e9liminer
+select_the_org_unit_to_keep=S\u00e9lectionner l'unit\u00e9 d'organisation \u00e0 maintenir
+selected_attribute_options=Options des attributs s\u00e9lectionn\u00e9s
+selected_datasets=Ensembles de donn\u00e9es s\u00e9lectionn\u00e9s
+selected_orgunits=Unit\u00e9s d'organisation choisies
+show=Voir
+show_advance=Voir l'outil de conception
+sort=Trier
+sql_statement=Expression SQL
+sql_view=Vue SQL
+sql_view_instance_invalid=Ce visualiseur de ressource est invalide ou n'existe pas.
+sql_view_management=Gestion de vue Sql
+sql_view_table_is_not_created_yet=Veuillez ex\u00e9cuter la requ\u00eate pour cr\u00e9er la table de vue avant son affichage
+sql_view_table_name=Table de vue SQL avec nom
+sqlquery_is_empty=L'expression SQL ne peut pas \u00eatre nulle
+sqlquery_is_invalid=Cette expression SQL n'est pas valide.
+sqlquery_is_not_allowed=Il n'est pas permis de faire des requ\u00eates sur des tables sp\u00e9ciales!
+sqlquery_is_welformed=NB: Seule la requ\u00eate SELECT est autoris\u00e9e (Sans mot cl\u00e9 INTO).
+sqlview_process_canceled_interrupted=AVERTISSEMENT: Cette requ\u00eate pourrait renvoyer une grande quantit\u00e9 de donn\u00e9es de la base de donn\u00e9es. \n\n Voulez-vous la sauvergarder ....?
+start=D\u00e9marrer
+store_zero_data_values=Stocker les valeurs zero
+syntax_error_parameter_required=La syntaxe est incorrecte - Param\u00e8tre requis (ou manquant entre parenth\u00e8ses)
+system_administration=Administration syst\u00e8me
+there_are=Il y a
+there_are_no_overlapping_values=Il n'y a pas de donn\u00e9es qui se chevauchent dans l'archive.
+there_is_no_view_created=Il n'y a pas de table de vue cr\u00e9e
+available_patient_attributes=Attributs b\u00e9n\u00e9ficiaire disponible
+selected_patient_attributes=Attributs b\u00e9n\u00e9ficiaire selectionn\u00e9s
 filters=Filtres
-any=Tout
-equal_to=\u00e9gal
-greater_than=Sup\u00e9rieur
-greater_than_or_equal_to=Sup\u00e9rieur ou \u00e9gal
-less_than=Inf\u00e9rieur
-less_than_or_equal_to=Inf\u00e9rieur ou \u00e9gal
-in_between=Entre
-mapping_area=Zone de Cartographie
-save_mapping=Enregistrer la cartographie
-remove_mapping=Supprimer la cartographie
-aggregate_domain=Domain Aggregate
-is_equal_to_patient_domain=Est \u00e9gal au Domaine b\u00e9n\u00e9ficiaire
-please_select_a_group_from_above=S'il vous pla\u00eet s\u00e9lectionner un groupe d'en haut
-group=Groupe
-selected_aggregate_data_element=\u00c9l\u00e9ment s\u00e9lectionn\u00e9 les donn\u00e9es agr\u00e9g\u00e9es
-aggregate_data_elements=\u00c9l\u00e9ments de donn\u00e9es agr\u00e9g\u00e9es
-patient_data_elements=\u00c9l\u00e9ments de donn\u00e9es des b\u00e9n\u00e9ficiaires
-invalid_date=Format incorrect de valeur \u00e0 la date
-format_date=Le format correct devrait \u00eatre
-duplicate_names=Le nom est d\u00e9j\u00e0 utilis\u00e9
-removing_relationship_failed=Retrait de la relation \u00e9chou\u00e9
-back_to_search=Retour \u00e0 la recherche
-do_you_want_to_make_this_one_a_representative=Voulez-vous faire de ce repr\u00e9sentant?
-do_you_want_to_remove_this_one_from_being_representative=Voulez-vous d'enlever celui d'\u00eatre un repr\u00e9sentant?
-hide_details=Masquer les d\u00e9tails
-removing_representative_failed=Suppression repr\u00e9sentant a \u00e9chou\u00e9
-saving_representative_failed=Enregistrement repr\u00e9sentant a \u00e9chou\u00e9
-adding_relationship_failed=Ajout relation a \u00e9chou\u00e9
-please_select=S'il vous pla\u00eet choisir
-patients_and_programs=Beneficiaries and Programs
-is=est
-please_select_relationship_type=S'il vous pla\u00eet s\u00e9lectionner le type de relation
-confirm_delete_relationship_type=Etes-vous s\u00fbr de vouloir supprimer ce type de relation?
-relationship_type=Type de relation
-relationship_type_details=D\u00e9tails du type de relation
-a_is_to_b=A est \u00e0 B
-b_is_to_a=B est \u00e0 A
-edit_relationship_type=\u00c9diter un type de relation
-create_new_relationship_type=Cr\u00e9er un nouveau type de relation
-please_specify_the_a_side_of_the_relationship_type=S'il vous pla\u00eet sp\u00e9cifier la face A du type de relation
-please_specify_the_b_side_of_the_relationship_type=S'il vous pla\u00eet sp\u00e9cifier la face B du type de relation
-relationship_type_management=Gestion de type de relation
-or=ou
-age_month=Age (mois)
-specify_name_s=S'il vous pla\u00eet sp\u00e9cifier le(s) nom(s)
-estimated=Estimation
-age_must_integer=L'\u00e2ge doit \u00eatre un entier
-saving_value_failed_status_code=Enregistrement la valeur a \u00e9chou\u00e9 avec le code d'\u00e9tat
-saving_value_failed_error_code=Enregistrement la valeur a \u00e9chou\u00e9 avec le code d'erreur
-value_must_integer=La valeur doit \u00eatre un entier
-searching_patient_failed=B\u00e9n\u00e9ficiaire recherche a \u00e9chou\u00e9
-program_enrollment_failed=Inscription au programme \u00c9chec
-program_stage=\u00e9tape du programme
-date_selector=S\u00e9lecteur de la date
-close=Fermer
-edit_patient_attribute=Modifier l'attribut b\u00e9n\u00e9ficiaires
-attribute=Attributs
-value_type=Type de valeur
-create_new_patient_attribute=Cr\u00e9er un attribut nouveau b\u00e9n\u00e9ficiaire
-confirm_delete_patient_attribute=Etes-vous s\u00fbr de vouloir supprimer l'attribut b\u00e9n\u00e9ficiaire?
-patient_attribute_management=Gestion des attributs b\u00e9n\u00e9ficiaire
-name_in_use=Nom en usage
-please_select_village=S'il vous pla\u00eet Choisissez un village
+any=Aucun
+equal_to=Egal
+greater_than=Sup\u00e9rieur \u00e0
+mapping_area=Mapping Area
+remove_mapping=Remove Mapping
+is_equal_to_patient_domain=Is Equal to Beneficiary Domain
+please_select_a_group_from_above=Please select a group from above
+group=Group
+selected_aggregate_data_element=Selected Aggregate Data Element
+removing_relationship_failed=Removing Relationship failed
+do_you_want_to_make_this_one_a_representative=Do you want to make this one a representative?
+do_you_want_to_remove_this_one_from_being_representative=Do you want to remove this one from being representative?
+hide_details=Hide Details
+removing_representative_failed=Removing representative failed
+adding_relationship_failed=Adding relationship failed
+please_select_relationship_type=Please select relationship type
+confirm_delete_relationship_type=Are you sure you want to delete relationship type?
+relationship_type=Relationship Type
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+please_specify_the_a_side_of_the_relationship_type=Please specify the A side of the relationship type
+please_specify_the_b_side_of_the_relationship_type=Please specify the B side of the relationship type
+relationship_type_management=Relationship type management
+specify_name_s=Please specify name(s)
+estimated=Estimated
+value_must_integer=Value must be an integer
+program_enrollment_failed=Program Enrollment Failed
+program_stage=Program Stage
+edit_patient_attribute=Edit beneficiary attribute
+confirm_delete_patient_attribute=Are you sure you want to delete beneficiary attribute?
+name_in_use=Name in use
+please_select_village=Please Select a village from the tree
 no_matching_found=No matching found
-choose_this_patient=Choisissez cette B\u00e9n\u00e9ficiaire
-program_stage_sort_order=Ordre de tri Programme \u00e9tape
-sort=Trier
-value_must_positive=La valeur doit \u00eatre un nombre positif
-invalid_min_max_days=Combinaison incorrecte min-max jours 
-members_in_the_selected_house_hold=Les membres du m\u00e9nage s\u00e9lectionn\u00e9
-house_hold=M\u00e9nage
-household_enrollment=L'inscription des m\u00e9nages
-patients_and_programs=B\u00e9n\u00e9ficiaires et aux programmes
-please_select_program=S'il vous pla\u00eet s\u00e9lectionner un programme
-select_program=Select Program
-program_stage_management=Gestion de l'\u00e9tape du programme
-view_program_stages=Afficher les \u00e9tapes du programme
-select_all_in_group=S\u00e9lectionnez tous dans le groupe
-unselect_all_in_group=D\u00e9s\u00e9lectionner tout dans le groupe
-unselect_all_at_level=D\u00e9s\u00e9lectionner tout au niveau
-select_all_at_level=S\u00e9lectionnez tous au niveau
-define_associations=D\u00e9finir l'association
-define_program_associations=D\u00e9finir les associations Programme
-programs=Programmes
-selected_programs=Programmes s\u00e9lectionn\u00e9s
-available_programs=Programmes disponibles
-manage_household_enrollment=G\u00e9rer les inscriptions des m\u00e9nages
-no_of_dataelements=Nombre d'\u00e9l\u00e9ments de donn\u00e9es \u00e0 recueillir
-program_stage_count=Nombre d'\u00e9tapes dans le programme
-program_stages_in_program=\u00e9tapes du programme dans le programme
-stage_in_program=Visitez \u00e9tape du programme
-adding_program_stage_failed=Ajout phase du programme a \u00e9chou\u00e9
-data_elements_in_program_stage=\u00c9l\u00e9ments de donn\u00e9es \u00e0 l'\u00e9tape du programme
-please_specify_a_valid_stage=S'il vous pla\u00eet sp\u00e9cifier un ordre de programme valide l'\u00e9tape
-updating_program_stage_failed=Mise \u00e0 jour du programme \u00e9tape \u00e9chec
-confirm_delete_prorgam_stage=Etes-vous s\u00fbr de vouloir supprimer cette \u00e9tape du programme?
-available_data_elements=\u00c9l\u00e9ments de donn\u00e9es disponibles
-selected_data_elements=S\u00e9lectionn\u00e9 des \u00e9l\u00e9ments de donn\u00e9es
-program_stage_details=D\u00e9tails de l'\u00e9tape du programme
-edit_program_stage=Modifier \u00c9tape du programme 
-create_new_program_stage=Cr\u00e9er \u00e9tape du nouveau programme
-order=Ordre dans le programme
-max_days_from_start=Nombre maximal de jours \u00e0 attendre du d\u00e9but du programme
-program_details=D\u00e9tails du programme
-edit_program=Modifier le programme
-confirm_delete_prorgam=Etes-vous s\u00fbr de vouloir supprimer ce programme?
-create_new_program=Cr\u00e9er nouveau programme
-number_of_days=Dur\u00e9e du programme (nombre de jours)
-please_specify_a_name=S'il vous pla\u00eet sp\u00e9cifier un nom
-please_specify_a_description=S'il vous pla\u00eet sp\u00e9cifier une description
-please_specify_number_of_days=S'il vous pla\u00eet indiquer le nombre de jours (la dur\u00e9e du programme)
-search=Rechercher
-remove_member_s=Retirer Membre (s)
-add_member_s=Ajouter Membre (s)
-search_for_new_members=Recherche de nouveaux membres
-house_hold_members=Membres du m\u00e9nage
-available_members=Membres disponibles
-selected_members=Membres s\u00e9lectionn\u00e9s
-house_hold_members_management=Les membres du m\u00e9nage de gestion
-house_hold_details=D\u00e9tails des m\u00e9nages
-specify_search_criteria=S'il vous pla\u00eet indiquez vos crit\u00e8res de recherche
-no_matching_found=Aucun r\u00e9sultat trouv\u00e9
-updating_house_hold_failed=Mise \u00e0 jour des m\u00e9nages \u00c9chec
-adding_house_hold_failed=Ajout des m\u00e9nages \u00c9chec
-please_specify_an_address=S'il vous pla\u00eet sp\u00e9cifier une adresse pour la maison
-please_specify_a_landmark=S'il vous pla\u00eet sp\u00e9cifier un point de rep\u00e8re pour la maison
-please_select_a_registering_unit=Please select a registering Unit first!
-no_of_house_hold_members=Number of HouseHold Members
-confirm_delete_house_hold=Are you sure you want to delete HouseHold?
-update_household=Update Household
-manage_membership=Manage Household Membership
-manage_members=Manage Household Members
+program_stage_sort_order=Program Stage Sort Order
+house_hold=Household
+household_enrollment=Household Enrollment
+please_select_program=Please select a program
+program_stage_management=Program stage management
+view_program_stages=View program stages
+selected_programs=Selected Programs
+available_programs=Available Programs
+manage_household_enrollment=Manage Household Enrollment
+no_of_dataelements=Number of DataElements to be collected
+program_stage_count=Number of stages in program
+stage_in_program=Visit stage in Program
+data_elements_in_program_stage=DataElements in Program Stage
+updating_program_stage_failed=Updating Program Stage Failed
+confirm_delete_prorgam_stage=Are you sure you want to delete this program stage?
+available_data_elements=Available Data Elements
+program_stage_details=Details of Program Stage
+edit_program_stage=Edit program stage
+create_new_program_stage=Create new program stage
+order=Order in Program
+program_details=Program details
+confirm_delete_prorgam=Are you sure you want to delete this program ?
+create_new_program=Create new program
+search=Search
+remove_member_s=Remove Member(s)
+add_member_s=Add Member(s)
+search_for_new_members=Search for new members
+house_hold_members=Household Members
+selected_members=Selected Members
+specify_search_criteria=Please specify your search criteria
+updating_house_hold_failed=Updating Household Failed
+adding_house_hold_failed=Adding Household Failed
+please_specify_an_address=Please specify an address for the house
 house_number=Household Number
-add_new_household=Add New Household
 select=Select
 registering_unit=Registering Unit
 organisation_unit=OrganisationUnit
 search_result_matching_the_search_criteria=Result matching the search criteria:
 please_select_a_registering_unit_to_proceeed=Please select a Registration/Organization Unit to proceed.
-requried=Required
 demographics=Demographics
 address=Address
-address1=Address 1
-address2=Address 2
 city_village=City/Village
 state_province=State/Province
-country=Country
-region=Region
-postal_code=Postal Code
 land_mark=Land Mark
 house=House
 deceased=Deceased
-check_if_this_person_is_deceased=Check if this person is deceased
-id=Id
-add=Add
-edit_profile=Edit profile
-address_management=Address Management
-household_management=Household Management
 program_management=Program management
 please_select_item_from_menu=Please select an item from the menu
 everything_is_ok=Everything is OK
-patient_attribute=Beneficiary Attribute
 program=Program
-beneficiary_aggregation=Beneficiary Aggregation
-beneficiary_aggregation_query_builder=Beneficiary Aggregation Query Builder
 beneficiary_aggregation_query_builder_management=Beneficiary aggregation query builder management
-dataelement_group=Data Element Group
 dataelement=Data Element
-program_stage_de=ProgramStageDataElement
 case_attributes=Beneficiary Attributes
-operator=Operator
 and_or=And/Or
 dataentryform_management_for_program_stage=Data entry form management for Program stage
 select_method=Select method
-choose_existing_dataentry=Choose existing data entry form
 choose_dataentry=Data entry form
 dataentryform_details=Data entry form details
 blood_group=Blood group
-attribute_options=Attribute options
-add_more_option=Add Option
 remove_option=Remove Option
-mandatory=Mandatory
 patient_attribute_group_management=Beneficiary attribute group management
-move_selected=Move selected items
-remove_selected=Remove selected items
 availableAttribute=Available attributes
-selectedAttribute=Selected attributes
 patient_attribute_group_deltails=Beneficiary attribute group details
-patient_attribute_group=Beneficiary Attribute Group
-please_specify_attributes=Please specify attributes for group
-patient_attribute_group_association=Beneficiary Attribute Group Association
-edit_patient_attribute_group=Edit beneficiary attribute group
-create_new_patient_attribute_group=Create new beneficiary attribute group
 patient_attributes=Beneficiary Attributes
 identifier_format=Identifier Format
 patient_identifier_type_management=Beneficiary identifier type management
-patient_identifier_type=Beneficiary Identifier Type
 create_new_patient_identifier_type=Create new beneficiary identifier type
-edit_patient_identifier_type=Edit beneficiary identifier type
 delete_successfull=Deleted successfully
 father=Father
-mother=Mother
 guardian=Guardian
-child_contact_type=Child contact type
 child_contact_name=Child contact name
-warning_delete_patient_attribute_option=This option has relationship with BeneficiaryAttributeValue. You must not delete it.
-success_delete_patient_attribute_option=Delete beneficiary attribute option successfully.
-error_delete_patient_attribute_option=Can not find Beneficiary attribute option to delete.
 attribute_combo_type=Predefined value
 at_least_2_option=Please add at least two attribute options
 identifier_type=Identifier type
-combo=Predefined value
 related=Related
 no_result=No result
 error_connect_to_server=Error connect to server
 please_enter_value=Please enter value
 please_select_search_type=Please select search type
 please_select_identifier_type=Please select Identifier type
-please_select_attribute_type=Please select Attribute type
 validation_criteria=Validation Criteria
-edit_validation_criteria=Edit validation criteria
 create_validation_criteria=Create validation criteria
 intro_patient_attribute=Create, modify and view Beneficiary attributes. An attribute can be used to register extra information for a Beneficiary.
 intro_patient_attribute_group=Create, modify and view Beneficiary attribute groups. Groups makes it more convenient to add attributes to a Beneficiary.
 intro_patient_identifier_type=Create, modify and view Beneficiary identifier types. Any type and multiple identifiers can be registered.
-intro_relationship_type=Create, modify and view relationship types. A relationship is typically wife and husband or mother and child.
-intro_program=Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
-intro_beneficiary_aggregation_query_builder=Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
 intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Beneficiary data.
 intro_program_attribute=Create, modify and view Program attributes. A program can have any number of attributes.
-intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database.
 intro_patient_registration=Define the organisation units which should be allowed to register beneficiaries.
-intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data.
-add_dependent=Add dependent
 inheritable=Inheritable
 other_details=Other Details
-patient_attribute_details=Beneficiary attribute details
 search_result=Search result
 criteria=Criteria
-operator_less_then=<
 operator_equal_to==
-operator_greater_then=>
-program_is_invalid=Program is invalid
 validation_associations=Validation association
-define_validation_associations=Define validation associations
-define_validationDE_associations=Define validation Data Element Associations
-validationDE_associations=Validation Data Element Associations
 left_side=Left side
-right_side=Right side
-validation=Validation
 available_criteria=Available criteria
-selected_criteria=Selected criteria
-programstage_dataelement_validation=Program Stage Data Element Validation
-field_is_required=This field is required
-number_of_attribute=Number of attributes
 confirm_delete_patientIdentifierType=Are you sure you want to delete identifier type ?
 available_program=Available Program
 selected_program=Selected Program
 object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type
 confirm_delete_validation_criteria=Are you sure you want to delete validation criteria ?
-specify_dataelememt=Please specify a data element
-processing=Processing
 done=Done
-optioncombo=Option combo
-view_as=View as
 dataelement_of_orther_program_stage=Data element of other program stage
-short_name=Short name
-load_existed_form=Load existing form
-design_dataentry_form=Design data entry form
-dataelement_is_inserted=This data element is inserted into form
 compulsory=Compulsory
 design_data_entry_form=Design data entry form
-no_of_char=Number of characters
 letter=Letter
 no_max_days_allowed_input_data=Maximum number of days allowed to input data
 program_attribute=Program Attribute
-program_attribute_management=Program attribute management
-create_new_program_attribute=Create new program attribute
-edit_program_attribute=Edit program attribute
-program_infor=Program information
-import=Import
 import_data=Import Data
 import_file=Import file
 upload=Upload
-configuration=Configuration
 patient_xml_template_file=Beneficiary XML template file
-not_save_patient=Beneficiaries not saved
 row=Row
 reason=Reason
 patient_name_is_null=The name of beneficiary is missing
-birthday_is_null=Birthday is missing
 duplicate=Duplicate
 excel_file=Excel file.
-upload_file_null=Upload file is missing
 file_type_not_supported=File type is not supported
-dataelement_group=Data Element Group
 option_combo=Option combo
 case_aggregation_condition=Beneficiary Aggregation Query Builder
-case_aggregation_condition_detail=Beneficiary aggregation query builder details
-create_new_case_aggregation_condition=Create new beneficiary aggregation query builder
-case_attributes_and_properties=Case Attributes and Properties
 condition=Condition
-condition_detail=Condition details
 edit_case_aggregation_condition=Edit beneficiary aggregation query builder
 enrolldate_minus_incidentdate=Date of Enrollment - Date of Incident
 program_properties=Program properties
-not_enough_mandatory_identifier=Not enough data for the mandatory identifier(s)
-not_enough_madatory_attribute=Not enough data for the mandatory attribute(s)
 get_data_error=Get data error
 hierachy_orgunit=Hierarchy organisation unit
 similar_patients=Similar patients
 orgunit=Organisation unit
-validation_criteria_details=Validation criteria details
 program_attribute_details=Program attribute details
 patient_registration=Beneficiary Registration
-select_program=Select program
-fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form
-define_single_dataelement_validation=Define Single Data Element Validation
 add_single_program_validation=Add Single Program Validation
 add_multi_program_validation=Add Multi Program Validation
 edit_single_program_validation=Edit single program validation
 edit_multi_program_validation=Edit multi program validation
 program_validation_details=Program Validation Details
 program_validation_management=Define program validation managenent
-create_new_single_validation=Create new single validation
-create_new_multi_validation=Create new multi validation
 save_success=Save successfully
 configuration_xml_file_null=Configuration of folder where contains xml file is null
-there_is_no_defination_xml_file_in_user_home=There is no any definition related XML file in the user home
 patient_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
 beneficiary_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
-min_days_from_start=Mininum number of days from start
 warning_delete_program_attribute_option=This option has relationship with ProgramAttributeValue. You must not delete it.
-success_delete_program_attribute_option=Delete program attribute option successfully.
-validation_criteria_management=Validation criteria management
-aggregation_data_element=\u00c9l\u00e9ments de donn\u00e9es agr\u00e9g\u00e9es
+aggregation_data_element=Aggregation data element
 aggregation_expression=Aggregation expression
-aggregation_data_element_in_use=Aggregation data element is in use
-add_more_option_to_search=Add more option to search
-delete_program_data_entry_confirm=Do you want to delete program data entry ?
-patient_chart_management=Beneficiary chart management
 create_new_patient_chart=Create new beneficiary Chart
 edit_patient_chart=Edit beneficiary chart
-chart_type=Chart type
 chart_size=Chart size
-save=Save
 title=Title
-include_regression_line=Include regression line
-must_select_one_dataelement=Please select one data element
-value_x_dataelements=Value (X) - Data elements
 bar_chart=Bar chart
 bar3d_chart=Bar 3D chart
 line_chart=Line chart
 line3d_chart=Line 3D chart
-chart_size=Chart size
 normal=Normal
 wide=Wide
 tall=Tall
 patient_chart_details=Beneficiary chart details
-single_event=Single event
-paitents_and_programs=B\u00e9n\u00e9ficiaires et aux programmes
 gender=Gender
 dob_type=DOB Type
 date_of_enrollment_description=Description of enrollment date
+patient_identifier_type_details=Beneficiary identifier type details
+male=Male
+approximated=Approximated
+irregular_encounter=Irregular encounter
+date_of_birth=Date of Birth
+anonymous=Anonymous
+groupBy=Grouper par
+greater_than_or_equal_to=Sup\u00e9rieur ou \u00e9gal \u00e0
+less_than=Inf\u00e9rieur \u00e0
+less_than_or_equal_to=Inf\u00e9rieur ou \u00e9gal \u00e0
+in_between=In Between
+save_mapping=Save Mapping
+aggregate_domain=Aggregate Domain
+aggregate_data_elements=Aggregate Data Elements
+patient_data_elements=Beneficiary Data Elements
+invalid_date=Incorrect format for date value
+format_date=The correct format should be
+duplicate_names=Name is already in use
+back_to_search=Back to Search
+saving_representative_failed=Saving representative failed
+please_select=Please Select
+patients_and_programs=Beneficiaries and Programs
+is=is
+'s='s
+relationship_type_details=Relationship type details
+edit_relationship_type=Edit relationship type
+create_new_relationship_type=Create new relationship type
+or=or
+age_month=Age(months)
+age_must_integer=Age must be integer
+saving_value_failed_status_code=Saving value failed with status code
+saving_value_failed_error_code=Saving value failed with error code
+searching_patient_failed=Searching Beneficiary failed
+date_selector=Date Selector
+close=Close
+value_type=Value Type
+create_new_patient_attribute=Create new beneficiary attribute
+patient_attribute_management=Beneficiary attribute management
+choose_this_patient=Choose this Beneficiary
+value_must_positive=Value must be a positive number
+invalid_min_max_days=Invalid min-max days combination
+members_in_the_selected_house_hold=Members in the selected Household
+select_program=Select Program
+unselect_all_in_group=Unselect all in group
+unselect_all_at_level=Unselect all at level
+define_associations=Define Association
+define_program_associations=Define Program Associations
+programs=Programs
+program_stages_in_program=Program Stages in Program
+adding_program_stage_failed=Adding Program Stage Failed
+please_specify_a_valid_stage=Please specify a valid program stage order
+selected_data_elements=Selected Data Elements
+max_days_from_start=Max no of days to wait from start of Program
+edit_program=Edit program
+number_of_days=Duration of Program (no. of days)
+please_specify_a_name=Please specify a name
+please_specify_a_description=Please specify a description
+please_specify_number_of_days=Please specify number of days (Program duration)
+available_members=Available Members
+house_hold_members_management=Household Members Management
+house_hold_details=HouseHold Details
+please_specify_a_landmark=Please specify a landmark for the house
+please_select_a_registering_unit=Please select a registering Unit first!
+no_of_house_hold_members=Number of HouseHold Members
+confirm_delete_house_hold=Are you sure you want to delete HouseHold?
+update_household=Update Household
+manage_membership=Manage Household Membership
+manage_members=Manage Household Members
+add_new_household=Add New Household
+requried=Required
+address1=Address 1
+address2=Address 2
+country=Country
+region=Region
+postal_code=Postal Code
+check_if_this_person_is_deceased=Check if this person is deceased
+id=Id
+add=Add
+edit_profile=Edit profile
+address_management=Address Management
+household_management=Household Management
+patient_attribute=Beneficiary Attribute
+beneficiary_aggregation=Beneficiary Aggregation
+beneficiary_aggregation_query_builder=Beneficiary Aggregation Query Builder
+dataelement_group=Data Element Group
+program_stage_de=ProgramStageDataElement
+operator=Operator
+choose_existing_dataentry=Choose existing data entry form
+attribute_options=Attribute options
+add_more_option=Add Option
+move_selected=Move selected items
+remove_selected=Remove selected items
+selectedAttribute=Selected attributes
+patient_attribute_group=Beneficiary Attribute Group
+please_specify_attributes=Please specify attributes for group
+patient_attribute_group_association=Beneficiary Attribute Group Association
+edit_patient_attribute_group=Edit beneficiary attribute group
+create_new_patient_attribute_group=Create new beneficiary attribute group
+patient_identifier_type=Beneficiary Identifier Type
+edit_patient_identifier_type=Edit beneficiary identifier type
+mother=Mother
+child_contact_type=Child contact type
+warning_delete_patient_attribute_option=This option has relationship with BeneficiaryAttributeValue. You must not delete it.
+success_delete_patient_attribute_option=Delete beneficiary attribute option successfully.
+error_delete_patient_attribute_option=Can not find Beneficiary attribute option to delete.
+combo=Predefined value
+please_select_attribute_type=Please select Attribute type
+edit_validation_criteria=Edit validation criteria
+intro_relationship_type=Create, modify and view relationship types. A relationship is typically wife and husband or mother and child.
+intro_program=Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
+intro_beneficiary_aggregation_query_builder=Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
+intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database.
+intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data.
+add_dependent=Add dependent
+patient_attribute_details=Beneficiary attribute details
+operator_less_then=<
+operator_greater_then=>
+program_is_invalid=Program is invalid
+define_validation_associations=Define validation associations
+define_validationDE_associations=Define validation Data Element Associations
+validationDE_associations=Validation Data Element Associations
+right_side=Right side
+validation=Validation
+selected_criteria=Selected criteria
+programstage_dataelement_validation=Program Stage Data Element Validation
+field_is_required=This field is required
+number_of_attribute=Number of attributes
+specify_dataelememt=Please specify a data element
+processing=Processing
+optioncombo=Option combo
+view_as=View as
+short_name=Short name
+load_existed_form=Load existing form
+design_dataentry_form=Design data entry form
+dataelement_is_inserted=This data element is inserted into form
+no_of_char=Number of characters
+program_attribute_management=Program attribute management
+create_new_program_attribute=Create new program attribute
+edit_program_attribute=Edit program attribute
+program_infor=Program information
+import=Import
+configuration=Configuration
+not_save_patient=Beneficiaries not saved
+birthday_is_null=Birthday is missing
+upload_file_null=Upload file is missing
+case_aggregation_condition_detail=Beneficiary aggregation query builder details
+create_new_case_aggregation_condition=Create new beneficiary aggregation query builder
+case_attributes_and_properties=Case Attributes and Properties
+condition_detail=Condition details
+not_enough_mandatory_identifier=Not enough data for the mandatory identifier(s)
+not_enough_madatory_attribute=Not enough data for the mandatory attribute(s)
+validation_criteria_details=Validation criteria details
+fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form
+define_single_dataelement_validation=Define Single Data Element Validation
+create_new_single_validation=Create new single validation
+create_new_multi_validation=Create new multi validation
+there_is_no_defination_xml_file_in_user_home=There is no any definition related XML file in the user home
+min_days_from_start=Mininum number of days from start
+success_delete_program_attribute_option=Delete program attribute option successfully.
+validation_criteria_management=Validation criteria management
+aggregation_data_element_in_use=Aggregation data element is in use
+add_more_option_to_search=Add more option to search
+delete_program_data_entry_confirm=Do you want to delete program data entry ?
+patient_chart_management=Beneficiary chart management
+chart_type=Chart type
+save=Save
+include_regression_line=Include regression line
+must_select_one_dataelement=Please select one data element
+value_x_dataelements=Value (X) - Data elements
+single_event=Single event
+paitents_and_programs=Beneficiaries and Programs
 date_of_incident_description=Description of incident date
 date_of_enrollment=Date of enrollment
 date_of_incident=Date of incident
 patient_registration_title=Beneficiary registration
-patient_identifier_type_details=Beneficiary identifier type details
-male=Male
 female=Female
 transgender=Transgender
 verified=Verified
 declared=Declared
-approximated=Approximated
 others=Others
 test_condition=Test condition
 run_success=Run successful
 run_fail=Run failed
 patients_registered=Registered Beneficiaries No
-irregular_encounter=Irregular encounter
-date_of_birth=Date of Birth
-anonymous=Anonymous
-edit_program_validation=Edit program validation 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_pt_PT.properties	2011-12-29 07:23:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_pt_PT.properties	2012-01-11 03:37:02 +0000
@@ -1,41 +1,263 @@
+add_dependent=Adicionar dependente
+add_member_s=Adicionar Membro (s)
+add_more_option=Adicionar Op\u00e7\u00e3o
+add_new_household=Adicionar novo lar
+add=Adicionar
+adding_program_stage_failed=Adicionando Estagio do  Programa Falhou
+adding_relationship_failed=Adicionando relacionamento falhou
+address_management=Gest\u00e3o de Endere\u00e7o
+address=Endere\u00e7o
+address1=Endere\u00e7o 1
+address2=Endere\u00e7o 2
+age_must_integer=Idade deve ser um inteiro
+aggregate_data_elements=Agregar Elementos de Dado
+aggregate_domain=Dominio de agrega\u00e7\u00e3o
+and_or=E/Ou
+any=Qualquer
+approximated=Aproximado
+at_least_2_option=Por favor, adicione pelo menos duas op\u00e7\u00f5es de atributo
+attribute_combo_type=Valor Pr\u00e9-defenido
+attribute_options=Op\u00e7\u00f5es de atributo
+attribute=Atributo
+available_data_elements=Elemento de Dados dispon\u00edveis
+available_data_elements=Elementos de dados dispon\u00edveis
+available_data_elements=Elementos de dados disponiveis
+available_members=Membros Disponiveis
 available_patient_attributes=Atributos de Paciente dispon\u00edveis
-selected_patient_attributes=Selected Beneficiary Attributes
-groupBy=Group By
+available_program=Programa Disponivel
+available_programs=Programas Dispon\u00edveis
+availableAttribute=Atributos disponiveis
+back_to_search=Voltar para pesquisa
+bar_chart=Gr\u00e1fico de barra
+bar3d_chart=Grafico de bara em 3D
+beneficiary_aggregation=Agrega\u00e7\u00e3o de Benefici\u00e1rio
+birthday_is_null=Data de nascimento est\u00e1 faltando
+blood_group=Grupo Sangu\u00edneo
+case_attributes=Atributos do Benefici\u00e1rio
+chart_size=Tamanho de gr\u00e1fico
+chart_type=Tipo de Grafico
+check_if_this_person_is_deceased=Verifique se esta pessoa est\u00e1 morta
+child_contact_name=Nome de contacto de crian\u00e7a
+child_contact_type=Tipo de contacto da crian\u00e7a
+choose_dataentry=Formul\u00e1rio de Entrada de Dado
+choose_existing_dataentry=Escolha formul\u00e1rio de entrada de dados existentes
+choose_this_patient=Escolha este Benefici\u00e1rio
+city_village=Cidade/Vila
+close=Fechar
+close=fFechar
+combo=Valor Pr\u00e9-defenido
+compulsory=Compulsivo
+compulsory=Obrigat\u00f3rio
+condition_detail=Condi\u00e7\u00e3o de Detalhes
+condition=Condi\u00e7\u00e3o
+configuration_xml_file_null=Configura\u00e7\u00e3o da pasta onde cont\u00e9m o arquivo xml \u00e9 nulo
+configuration=Configura\u00e7\u00e3o
+confirm_delete_house_hold=Tem certeza de que deseja excluir casa?
+confirm_delete_patient_attribute=Tem certeza de que deseja excluir atributo benefici\u00e1rio?
+confirm_delete_patientIdentifierType=Tem certeza de que deseja excluir tipo de identificador?
+confirm_delete_prorgam_stage=Tem certeza de que quer apagar este estagio do Programa?
+confirm_delete_prorgam=Tem certeza de que deseja excluir este Programa
+confirm_delete_relationship_type=Tem certeza de que deseja excluir tipo de relacionamento?
+confirm_delete_validation_criteria=Tem certeza de que deseja excluir crit\u00e9rios de valida\u00e7\u00e3o?
+country=Pa\u00eds
+criteria=Crit\u00e9rio
+data_elements_in_program_stage=Elementos de dados, na terceiro estagio do Programa
+dataelement_group=Grupo de elemento de dado
+dataelement_group=Grupo de elemento e dado
+dataelement_group=Grupo el. dado
+dataelement_is_inserted=Este elemento de dados est\u00e1 inserido no formul\u00e1rio
+dataelement_of_orther_program_stage=O elemento de dados de outro est\u00e1gio programa
+dataelement=Elemento de dado
+dataentryform_details=Detalhes formul\u00e1rio de entrada de dados
+dataentryform_details=Detalhes de formul\u00e1rio de entrada dados
+dataentryform_management_for_program_stage=Gest\u00e3o de Formul\u00e1rio de Entrada de Dados para o Est\u00e1gio do Programa
+date_of_enrollment=Data de Inscri\u00e7\u00e3o
+date_of_incident=Data do Incidente
+date_selector=Escolha uma data
+deceased=Morto
+declared=Declarado
+define_associations=Atribuir conjunto de dados para as unidades organizacionais
+define_associations=Defenir Associa\u00e7\u00e3o
+define_program_associations=Defenir Associa\u00e7\u00e3o de Programa
+define_program_validation=Defenir Valida\u00e7\u00e3o de Programa
+delete_successfull=Apagado com \u00eaxito
+demographics=Demogr\u00e1fico
+design_data_entry_form=Desenhar formulario de entrada de dado
+design_data_entry_form=Desenho do formul\u00e1rio de entrada de dados
+design_dataentry_form=Desenhar formulario de entrada de dado
+done=Feito
+done=Realizado
+duplicate_names=Este nome j\u00e1 est\u00e1 registrado
+duplicate_names=Nome j\u00e1 est\u00e1 em uso
+duplicate_names=Nome j\u00e1 existe
+duplicate=Duplicado
+edit_profile=Editar Perfil
+equal_to=estimated=Estimado
+everything_is_ok=Tudo est\u00e1 OK
+father=Pai
+female=Femenino
+female=Feminino
 filters=Filtros
-any=Qualquer
-equal_to=estimated=Estimado
+format_date=O formato da data deve ser correcto
+gender=Genero
+greater_than_or_equal_to=>greater_than_or_equal_to=Maior que ou igual \u00e1
+greater_than=>
 greater_than=Maior que 
-greater_than_or_equal_to=>greater_than_or_equal_to=Maior que ou igual \u00e1
+group=Grupo
+hide_details=Esconder detalhes
+house_number=N\u00famero casa
+house=Casa
+id=Id
+identifier_format=Formato de identificador
+identifier_type=Tipo de identificador
+import_data=Importar Dado
+import_file=Importar ficheiro
+import=Importar
+inheritable=Herd\u00e1vel
+intro_beneficiary_aggregation_query_builder=Definir regras de agrega\u00e7\u00e3o para o processo de agrega\u00e7\u00e3o de dados para benefici\u00e1rio dados estat\u00edsticos.
+intro_configuration=Definir o Excel arquivo de modelo XML usado para automaticamente importar dados do paciente.
+intro_import_data=Importar informa\u00e7\u00f5es de pacientes automaticamente a partir de um arquivo de modelo do Excel para o banco de dados do paciente.
+intro_patient_attribute_group=Criar, modificar e ver grupos de atributos benefici\u00e1rio. Grupos tornam mais conveniente para adicionar atributos a um benefici\u00e1rio.
+intro_patient_attribute=Criar, modificar e exibir atributos de benefici\u00e1rio. Um atributo pode ser usado para registrar informa\u00e7\u00f5es extra para um benefici\u00e1rio.
+intro_patient_identifier_type=Criar, modificar e visualizar os tipos de identificador de Benefici\u00e1rio. Qualquer tipo e m\u00faltiplos identificadores podem ser registrados.
+intro_program_attribute=Criar, modificar e exibir os atributos do programa. Um programa pode ter qualquer n\u00famero de atributos.
+intro_program=Criar, modificar e ver os programas. Um programa tem etapas do programa e define quais a\u00e7\u00f5es devem ser tomadas em cada etapa.
+intro_relationship_type=Criar, modificar e visualizar os tipos de relacionamento. Um relacionamento \u00e9 normalmente marido e mulher ou m\u00e3e e filho.
+intro_validation_criteria=Criar, modificar e visualizar crit\u00e9rios de valida\u00e7\u00e3o. Um crit\u00e9rio \u00e9 utilizado para valida\u00e7\u00e3o dos dados do benefici\u00e1rio.
+invalid_date=Data Inv\u00e1lida
+invalid_date=Formato de data incorrecto
+invalid_min_max_days=Combina\u00e7\u00e3o inv\u00e1lida para dias min-max
+left_side=Lado esquerdo
+less_than_or_equal_to=<less_than_or_equal_to=Menor que ou igual a
+less_than=<
 less_than=Menor que
-less_than_or_equal_to=<less_than_or_equal_to=Menor que ou igual a
+male=Masculino
+mandatory=Obrigat\u00f3rio
+mother=M\u00e3e
+move_selected=Mover itens selecionados
+move_selected=Mover o seleccionado
+move_selected=Mover seleccionado
+name_in_use=Este nome esta em uso
+name_in_use=Nome em uso
+name_in_use=O nome j\u00e1 est\u00e1 em uso, por favor, especificar um nome diferente
+name_in_use=O nome j\u00e1 est\u00e1 em uso. Por favor, escolha um nome diferente
+no_of_char=N\u00famero de caracteres
+no_result=Nenhum resultado
+normal=Normal
+number_of_attribute=N\u00famero de atributos
+object_not_deleted_associated_by_objects=Objeto n\u00e3o exclu\u00eddo porque ele est\u00e1 associado por objetos do tipo
+operator=Operador
+organisation_unit=Unidade de Organiza\u00e7\u00e3o
+organisation_unit=Unidade Organizacional
+orgunit=Unidade Organizacional
+other_details=Outros detalhes
+paitents_and_programs=Benefici\u00e1rios e Programas
+patient_attribute_details=Detalhes Atributo do Paciente
+patient_attribute_group_association=Grupo Associa\u00e7\u00e3o de Atributo Benefici\u00e1rio
+patient_attribute_group_management=Gest\u00e3o de Grupo de Atributo Benefici\u00e1rio
+patient_attribute_group_management=Gest\u00e3o do Grupo de Atributos do Benefeci\u00e1rio
+patient_attribute_group=Grupo de Atributo de Benefici\u00e1rio
+patient_attribute_group=Grupo de Atributos do Benefici\u00e1rio
+patient_attribute_management=Grupo de Atributo Benefici\u00e1rio
+patient_attribute=Atributo de Benefici\u00e1rio
+patient_attributes=Atributos de Benefici\u00e1rio
+patient_data_elements=Elementos de Dado de Benefici\u00e1rio
+patient_identifier_type=Tipo de Identificador de Benefici\u00e1rio
+patient_registration=Registo de Benefici\u00e1rio
+patients_and_programs=Benefici\u00e1rios e Programas
+please_select_attribute_type=Por favor, seleccione tipo de atributo
+please_select_item_from_menu=Por favor, selecione o item do menu
+please_select_item_from_menu=Por favor, selecione um item no menu
+please_select_program=Por favor, seleccione um programa
+please_select_relationship_type=Por favor, selecione o tipo de relacionamento
+please_select_village=Por favor selecione aldeia/vila
+please_select_village=Selecione uma aldeia na \u00e1rvore
+please_select=Por favor seleccione
+please_select=Por favor, Seleccione
+please_specify_a_name=Por favor, especifique um nome
+please_specify_an_address=Por favor, especifique um endere\u00e7o para casa
+postal_code=C\u00f3digo Postal
+processing=Processando
+program_attribute_management=Gest\u00e3o de Atributos programa
+program_attribute=Atributo do Programa
+program_details=Detalhes do Programa
+program_is_invalid=Programa \u00e9 inv\u00e1lido
+program_stage=Est\u00e1gio do Programa
+program=Programa
+programs=Programas
+reason=Raz\u00e3o
+region=Regi\u00e3o
+registering_unit=Unidade de Registo
+relationship_type=Tipo de Rela\u00e7\u00e3o
+remove_mapping=Remover Mapeamento
+remove_option=Remover Op\u00e7\u00e3o
+remove_selected=Remover itens seleccionados
+remove_selected=Remover seleccionado
+remove_selected=Remover seleccionados
+remove_selected=Remover seleccione
+requried=Exigido
+requried=Requer
+right_side=Lado direito
+row=Linha
+save_success=Salvado com sucesso
+save_success=Salvo com sucesso
+save=Gravar
+save=Salvar
+saving_value_failed_error_code=O processo de grava\u00e7\u00e3o do valor falhou com c\u00f3digo de erro
+saving_value_failed_error_code=O processo de grava\u00e7\u00e3o falhou com c\u00f3digo de erro
+saving_value_failed_error_code=Salvar valor falhou com c\u00f3digo de erro
+saving_value_failed_status_code=O processo de grava\u00e7\u00e3o do valor falhou com c\u00f3digo de estado
+saving_value_failed_status_code=O processo de grava\u00e7\u00e3o falhou com estado de erro
+search_result_matching_the_search_criteria=Resultado correspondente ao crit\u00e9rio de pesquisa:
+search_result=Resultado da pesquisa
+search=Pesquisa
+search=Pesquisar
+searching_patient_failed=A pesquisa de Benefici\u00e1rio falhou
+select_all_at_level=Selecionar todos no n\u00edvel
+select_all_in_group=Selecionar todos no grupo
+select_program=Seleccione o programa
+select=[Seleccione]
+select=Seleccionar
+select=Seleccione
+selected_data_elements=Elementos de dados seleccionados
+selected_data_elements=Elementos de dados selecionados
+selected_members=Membros seleccioandos
+selected_program=Programa selecionados
+selectedAttribute=Atributos selecionados
+short_name=Nome curto
+sort=Ordenar
+specify_dataelememt=Por favor, especifique um elemento de dados
+specify_name_s=Por favor, especificar o nome (s)
+state_province=Estado/Provincia
+tall=Tall
+title=T\u00edtulo
+unselect_all_at_level=Desmarcar todos a n\u00edvel
+unselect_all_at_level=Desseleccionar todos a n\u00edvel
+unselect_all_in_group=Desmarcar todos no grupo
+validation_associations=Valida\u00e7\u00e3o de associa\u00e7\u00e3o
+validation=Valida\u00e7\u00e3o
+value_must_integer=O valor deve ser um n\u00famero inteiro
+value_must_integer=Valor deve ser um inteiro
+value_must_integer=Valor deve ser um n\u00famero inteiro
+value_must_positive=Valor deve ser um inteiro posetivo
+value_type=Tipo de Valor
+verified=Verificado
+wide=Extenso
+selected_patient_attributes=Selected Beneficiary Attributes
+groupBy=Group By
 in_between=In Between
 mapping_area=Mapping Area
 save_mapping=Save Mapping
-remove_mapping=Remover Mapeamento
-aggregate_domain=Dominio de agrega\u00e7\u00e3o
 is_equal_to_patient_domain=Is Equal to Beneficiary Domain
 please_select_a_group_from_above=Please select a group from above
-group=Grupo
 selected_aggregate_data_element=Selected Aggregate Data Element
-aggregate_data_elements=Agregar Elementos de Dado
-patient_data_elements=Elementos de Dado de Benefici\u00e1rio
-invalid_date=Formato de data incorrecto
-format_date=O formato da data deve ser correcto
-duplicate_names=Nome j\u00e1 existe
 removing_relationship_failed=Removing Relationship failed
-back_to_search=Voltar para pesquisa
 do_you_want_to_make_this_one_a_representative=Do you want to make this one a representative?
 do_you_want_to_remove_this_one_from_being_representative=Do you want to remove this one from being representative?
-hide_details=Esconder detalhes
 removing_representative_failed=Removing representative failed
 saving_representative_failed=Saving representative failed
-adding_relationship_failed=Adicionando relacionamento falhou
-please_select=Por favor, Seleccione
-patients_and_programs=Benefici\u00e1rios e Programas
 is=is
-please_select_relationship_type=Por favor, selecione o tipo de relacionamento
-confirm_delete_relationship_type=Are you sure you want to delete relationship type?
-relationship_type=Tipo de Rela\u00e7\u00e3o
+'s='s
 relationship_type_details=Relationship type details
 a_is_to_b=A is to B
 b_is_to_a=B is to A
@@ -46,290 +268,127 @@
 relationship_type_management=Relationship type management
 or=or
 age_month=Age(months)
-specify_name_s=Por favor, especificar o nome (s)
 estimated=Estimated
-age_must_integer=Idade deve ser um inteiro
-saving_value_failed_status_code=Saving value failed with status code
-saving_value_failed_error_code=Salvar valor falhou com c\u00f3digo de erro
-value_must_integer=Valor deve ser um n\u00famero inteiro
-searching_patient_failed=A pesquisa de Benefici\u00e1rio falhou
 program_enrollment_failed=Program Enrollment Failed
-program_stage=Est\u00e1gio do Programa
-date_selector=Escolha uma data
-close=fFechar
 edit_patient_attribute=Edit beneficiary attribute
-attribute=Atributo
-value_type=Tipo de Valor
 create_new_patient_attribute=Create new beneficiary attribute
-confirm_delete_patient_attribute=Tem certeza de que deseja excluir atributo benefici\u00e1rio?
-patient_attribute_management=Grupo de Atributo Benefici\u00e1rio
-name_in_use=O nome j\u00e1 est\u00e1 em uso. Por favor, escolha um nome diferente
-please_select_village=Selecione uma aldeia na \u00e1rvore
 no_matching_found=No matching found
-choose_this_patient=Escolha este Benefici\u00e1rio
 program_stage_sort_order=Program Stage Sort Order
-sort=Ordenar
-value_must_positive=Valor deve ser um inteiro posetivo
-invalid_min_max_days=Combina\u00e7\u00e3o inv\u00e1lida para dias min-max
 members_in_the_selected_house_hold=Members in the selected Household
 house_hold=Household
 household_enrollment=Household Enrollment
-patients_and_programs=Benefici\u00e1rios e Programas
-please_select_program=Por favor, seleccione um programa
-select_program=Seleccione o programa
 program_stage_management=Program stage management
 view_program_stages=View program stages
-select_all_in_group=Selecionar todos no grupo
-unselect_all_in_group=Desmarcar todos no grupo
-unselect_all_at_level=Desseleccionar todos a n\u00edvel
-select_all_at_level=Selecionar todos no n\u00edvel
-define_associations=Defenir Associa\u00e7\u00e3o
-define_program_associations=Defenir Associa\u00e7\u00e3o de Programa
-programs=Programas
 selected_programs=Selected Programs
-available_programs=Programas Dispon\u00edveis
 manage_household_enrollment=Manage Household Enrollment
 no_of_dataelements=Number of DataElements to be collected
 program_stage_count=Number of stages in program
 program_stages_in_program=Program Stages in Program
 stage_in_program=Visit stage in Program
-adding_program_stage_failed=Adicionando Estagio do  Programa Falhou
-data_elements_in_program_stage=Elementos de dados, na terceiro estagio do Programa
-please_specify_a_valid_stage=Please specify a valid program stage order
+please_specify_a_valid_stage=Please specify a valid program stage order 
 updating_program_stage_failed=Updating Program Stage Failed
-confirm_delete_prorgam_stage=Tem certeza de que quer apagar este estagio do Programa?
-available_data_elements=Elementos de dados disponiveis
-selected_data_elements=Selected Data Elements
 program_stage_details=Details of Program Stage
 edit_program_stage=Edit program stage
 create_new_program_stage=Create new program stage
 order=Order in Program
 max_days_from_start=Max no of days to wait from start of Program
-program_details=Detalhes do Programa
 edit_program=Edit program
-confirm_delete_prorgam=Tem certeza de que deseja excluir este Programa
 create_new_program=Create new program
 number_of_days=Duration of Program (no. of days)
-please_specify_a_name=Por favor, especifique um nome
-please_specify_a_description=Please specify a description
+please_specify_a_description=Please specify a description 
 please_specify_number_of_days=Please specify number of days (Program duration)
-search=Pesquisar
 remove_member_s=Remove Member(s)
-add_member_s=Adicionar Membro (s)
 search_for_new_members=Search for new members
 house_hold_members=Household Members
-available_members=Membros Disponiveis
-selected_members=Membros seleccioandos
 house_hold_members_management=Household Members Management
 house_hold_details=HouseHold Details
 specify_search_criteria=Please specify your search criteria
-no_matching_found=No matching found
 updating_house_hold_failed=Updating Household Failed
 adding_house_hold_failed=Adding Household Failed
-please_specify_an_address=Please specify an address for the house
 please_specify_a_landmark=Please specify a landmark for the house
 please_select_a_registering_unit=Please select a registering Unit first!
 no_of_house_hold_members=Number of HouseHold Members
-confirm_delete_house_hold=Tem certeza de que deseja excluir casa?
 update_household=Update Household
 manage_membership=Manage Household Membership
 manage_members=Manage Household Members
-house_number=N\u00famero casa
-add_new_household=Add New Household
-select=Seleccione
-registering_unit=Unidade de Registo
-organisation_unit=Unidade Organizacional
-search_result_matching_the_search_criteria=Result matching the search criteria:
 please_select_a_registering_unit_to_proceeed=Please select a Registration/Organization Unit to proceed.
-requried=Requer
-demographics=Demogr\u00e1fico
-address=Endere\u00e7o
-address1=Endere\u00e7o 1
-address2=Endere\u00e7o 2
-city_village=Cidade/Vila
-state_province=Estado/Provincia
-country=Pa\u00eds
-region=Regi\u00e3o
-postal_code=C\u00f3digo Postal
 land_mark=Land Mark
-house=Casa
-deceased=Morto
-check_if_this_person_is_deceased=Verifique se esta pessoa est\u00e1 morta
-id=Id
-add=Adicionar
-edit_profile=Editar Perfil
-address_management=Gest\u00e3o de Endere\u00e7o
 household_management=Household Management
 program_management=Program management
-please_select_item_from_menu=Por favor, selecione um item no menu
-everything_is_ok=Tudo est\u00e1 OK
-patient_attribute=Atributo de Benefici\u00e1rio
-program=Programa
-beneficiary_aggregation=Agrega\u00e7\u00e3o de Benefici\u00e1rio
 beneficiary_aggregation_query_builder=Beneficiary Aggregation Query Builder
 beneficiary_aggregation_query_builder_management=Beneficiary aggregation query builder management
-dataelement_group=Grupo el. dado
-dataelement=Elemento de dado
 program_stage_de=ProgramStageDataElement
-case_attributes=Atributos do Benefici\u00e1rio
-operator=Operador
-and_or=E/Ou
-dataentryform_management_for_program_stage=Gest\u00e3o de Formul\u00e1rio de Entrada de Dados para o Est\u00e1gio do Programa
 select_method=Select method
-choose_existing_dataentry=Escolha formul\u00e1rio de entrada de dados existentes
-choose_dataentry=Formul\u00e1rio de Entrada de Dado
-dataentryform_details=Detalhes de formul\u00e1rio de entrada dados
-blood_group=Grupo Sangu\u00edneo
-attribute_options=Op\u00e7\u00f5es de atributo
-add_more_option=Adicionar Op\u00e7\u00e3o
-remove_option=Remover Op\u00e7\u00e3o
-mandatory=Obrigat\u00f3rio
-patient_attribute_group_management=Gest\u00e3o do Grupo de Atributos do Benefeci\u00e1rio
-move_selected=Mover seleccionado
-remove_selected=Remover seleccione
-availableAttribute=Atributos disponiveis
-selectedAttribute=Atributos selecionados
 patient_attribute_group_deltails=Beneficiary attribute group details
-patient_attribute_group=Grupo de Atributos do Benefici\u00e1rio
 please_specify_attributes=Please specify attributes for group
-patient_attribute_group_association=Grupo Associa\u00e7\u00e3o de Atributo Benefici\u00e1rio
 edit_patient_attribute_group=Edit beneficiary attribute group
 create_new_patient_attribute_group=Create new beneficiary attribute group
-patient_attributes=Atributos de Benefici\u00e1rio
-identifier_format=Formato de identificador
 patient_identifier_type_management=Beneficiary identifier type management
-patient_identifier_type=Tipo de Identificador de Benefici\u00e1rio
 create_new_patient_identifier_type=Create new beneficiary identifier type
 edit_patient_identifier_type=Edit beneficiary identifier type
-delete_successfull=Deleted successfully
-father=Pai
-mother=M\u00e3e
 guardian=Guardian
-child_contact_type=Tipo de contacto da crian\u00e7a
-child_contact_name=Nome de contacto de crian\u00e7a
 warning_delete_patient_attribute_option=This option has relationship with BeneficiaryAttributeValue. You must not delete it.
 success_delete_patient_attribute_option=Delete beneficiary attribute option successfully.
-error_delete_patient_attribute_option=Can not find Beneficiary attribute option to delete.
-attribute_combo_type=Valor Pr\u00e9-defenido
-at_least_2_option=Por favor, adicione pelo menos duas op\u00e7\u00f5es de atributo
-identifier_type=Tipo de identificador
-combo=Valor Pr\u00e9-defenido
+error_delete_patient_attribute_option=Can not find Beneficiary attribute option to delete. 
 related=Related
-no_result=Nenhum resultado
 error_connect_to_server=Error connect to server
 please_enter_value=Please enter value
 please_select_search_type=Please select search type
 please_select_identifier_type=Please select Identifier type
-please_select_attribute_type=Por favor, seleccione tipo de atributo
 validation_criteria=Validation Criteria
 edit_validation_criteria=Edit validation criteria
 create_validation_criteria=Create validation criteria
-intro_patient_attribute=Criar, modificar e exibir atributos de benefici\u00e1rio. Um atributo pode ser usado para registrar informa\u00e7\u00f5es extra para um benefici\u00e1rio.
-intro_patient_attribute_group=Criar, modificar e ver grupos de atributos benefici\u00e1rio. Grupos tornam mais conveniente para adicionar atributos a um benefici\u00e1rio.
-intro_patient_identifier_type=Criar, modificar e visualizar os tipos de identificador de Benefici\u00e1rio. Qualquer tipo e m\u00faltiplos identificadores podem ser registrados.
-intro_relationship_type=Criar, modificar e visualizar os tipos de relacionamento. Um relacionamento \u00e9 normalmente marido e mulher ou m\u00e3e e filho.
-intro_program=Criar, modificar e ver os programas. Um programa tem etapas do programa e define quais a\u00e7\u00f5es devem ser tomadas em cada etapa.
-intro_beneficiary_aggregation_query_builder=Definir regras de agrega\u00e7\u00e3o para o processo de agrega\u00e7\u00e3o de dados para benefici\u00e1rio dados estat\u00edsticos.
-intro_validation_criteria=Criar, modificar e visualizar crit\u00e9rios de valida\u00e7\u00e3o. Um crit\u00e9rio \u00e9 utilizado para valida\u00e7\u00e3o dos dados do benefici\u00e1rio.
-intro_program_attribute=Criar, modificar e exibir os atributos do programa. Um programa pode ter qualquer n\u00famero de atributos.
-intro_import_data=Importar informa\u00e7\u00f5es de pacientes automaticamente a partir de um arquivo de modelo do Excel para o banco de dados do paciente.
-intro_patient_registration=Define the organisation units which should be allowed to register beneficiaries.
-intro_configuration=Definir o Excel arquivo de modelo XML usado para automaticamente importar dados do paciente.
-add_dependent=Adicionar dependente
-inheritable=Herd\u00e1vel
-other_details=Outros detalhes
-patient_attribute_details=Detalhes Atributo do Paciente
-search_result=Resultado da pesquisa
-criteria=Crit\u00e9rio
 operator_less_then=<
 operator_equal_to==
 operator_greater_then=>
-program_is_invalid=Programa \u00e9 inv\u00e1lido
-validation_associations=Valida\u00e7\u00e3o de associa\u00e7\u00e3o
 define_validation_associations=Define validation associations
 define_validationDE_associations=Define validation Data Element Associations
 validationDE_associations=Validation Data Element Associations
-left_side=Lado esquerdo
-right_side=Lado direito
-validation=Valida\u00e7\u00e3o
 available_criteria=Available criteria
 selected_criteria=Selected criteria
 programstage_dataelement_validation=Program Stage Data Element Validation
 field_is_required=This field is required
-number_of_attribute=N\u00famero de atributos
-confirm_delete_patientIdentifierType=Tem certeza de que deseja excluir tipo de identificador?
-available_program=Programa Disponivel
-selected_program=Programa selecionados
-object_not_deleted_associated_by_objects=Objeto n\u00e3o exclu\u00eddo porque ele est\u00e1 associado por objetos do tipo
-confirm_delete_validation_criteria=Tem certeza de que deseja excluir crit\u00e9rios de valida\u00e7\u00e3o?
-specify_dataelememt=Por favor, especifique um elemento de dados
-processing=Processando
-done=Done
-optioncombo=Option combo
+optioncombo=Option Combo
 view_as=View as
-dataelement_of_orther_program_stage=O elemento de dados de outro est\u00e1gio programa
-short_name=Nome curto
 load_existed_form=Load existing form
-design_dataentry_form=Desenhar formulario de entrada de dado
-dataelement_is_inserted=Este elemento de dados est\u00e1 inserido no formul\u00e1rio
-compulsory=Obrigat\u00f3rio
-design_data_entry_form=Desenho do formul\u00e1rio de entrada de dados
-no_of_char=N\u00famero de caracteres
 letter=Letter
 no_max_days_allowed_input_data=Maximum number of days allowed to input data
-program_attribute=Atributo do Programa
-program_attribute_management=Gest\u00e3o de Atributos programa
 create_new_program_attribute=Create new program attribute
 edit_program_attribute=Edit program attribute
 program_infor=Program information
-import=Importar
-import_data=Importar Dado
-import_file=Importar ficheiro
 upload=Upload
-configuration=Configura\u00e7\u00e3o
 patient_xml_template_file=Beneficiary XML template file
 not_save_patient=Beneficiaries not saved
-row=Linha
-reason=Raz\u00e3o
 patient_name_is_null=The name of beneficiary is missing
-birthday_is_null=Data de nascimento est\u00e1 faltando
-duplicate=Duplicado
 excel_file=Excel file.
 upload_file_null=Upload file is missing
 file_type_not_supported=File type is not supported
-dataelement_group=Grupo el. dado
-option_combo=Option combo
+option_combo=Option Combo
 case_aggregation_condition=Beneficiary Aggregation Query Builder
 case_aggregation_condition_detail=Beneficiary aggregation query builder details
 create_new_case_aggregation_condition=Create new beneficiary aggregation query builder
 case_attributes_and_properties=Case Attributes and Properties
-condition=Condi\u00e7\u00e3o
-condition_detail=Condi\u00e7\u00e3o de Detalhes
 edit_case_aggregation_condition=Edit beneficiary aggregation query builder
-enrolldate_minus_incidentdate=Date of Enrollment - Date of Incident
+enrolldate_minus_incidentdate=Date of Enrollment - Date of Incident 
 program_properties=Program properties
 not_enough_mandatory_identifier=Not enough data for the mandatory identifier(s)
 not_enough_madatory_attribute=Not enough data for the mandatory attribute(s)
 get_data_error=Get data error
-hierachy_orgunit=Hierarchy organisation unit
+hierachy_orgunit=Hierarchy Organisation Unit
 similar_patients=Similar patients
-orgunit=Organisation unit
 validation_criteria_details=Validation criteria details
 program_attribute_details=Program attribute details
-patient_registration=Beneficiary Registration
-select_program=Select program
+intro_patient_registration=Select organisation units which can register beneficiaries
 fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form
 define_single_dataelement_validation=Define Single Data Element Validation
 add_single_program_validation=Add Single Program Validation
 add_multi_program_validation=Add Multi Program Validation
 edit_single_program_validation=Edit single program validation
 edit_multi_program_validation=Edit multi program validation
-program_validation_details=Program Validation Details
+program_validation_details=Program Validation Details 
 program_validation_management=Define program validation managenent
 create_new_single_validation=Create new single validation
 create_new_multi_validation=Create new multi validation
-save_success=Salvo com sucesso
-configuration_xml_file_null=Configura\u00e7\u00e3o da pasta onde cont\u00e9m o arquivo xml \u00e9 nulo
 there_is_no_defination_xml_file_in_user_home=There is no any definition related XML file in the user home
 patient_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
 beneficiary_attribute_group_sort_order=Beneficiary Attribute Group Sort Order
@@ -341,42 +400,23 @@
 aggregation_expression=Aggregation expression
 aggregation_data_element_in_use=Aggregation data element is in use
 add_more_option_to_search=Add more option to search
-delete_program_data_entry_confirm=Do you want to delete program data entry ?
-patient_chart_management=Beneficiary chart management
+delete_program_data_entry_confirm=Do you want to delete program data entry ? 
+patient_chart_management=Bneneficiary chart management
 create_new_patient_chart=Create new beneficiary Chart
 edit_patient_chart=Edit beneficiary chart
-chart_type=Tipo de Grafico
-chart_size=Tamanho de gr\u00e1fico
-save=Salvar
-title=T\u00edtulo
 include_regression_line=Include regression line
-must_select_one_dataelement=Please select one data element
-value_x_dataelements=Value (X) - Data elements
-bar_chart=Gr\u00e1fico de barra
-bar3d_chart=Grafico de bara em 3D
+must_select_one_dataelement=Please select one dataelement
+value_x_dataelements=Value (X) - Data elements 
 line_chart=Line chart
 line3d_chart=Line 3D chart
-chart_size=Tamanho de gr\u00e1fico
-normal=Normal
-wide=Extenso
-tall=Tall
 patient_chart_details=Beneficiary chart details
 single_event=Single event
-paitents_and_programs=Benefici\u00e1rios e Programas
-gender=Genero
 dob_type=DOB Type
 date_of_enrollment_description=Description of enrollment date
 date_of_incident_description=Description of incident date
-date_of_enrollment=Data de Inscri\u00e7\u00e3o
-date_of_incident=Date of incident
-patient_registration_title=Beneficiary registration
+patient_registration_title=Beneficiary registration  
 patient_identifier_type_details=Beneficiary identifier type details
-male=Masculino
-female=Feminino
 transgender=Transgender
-verified=Verificado
-declared=Declarado
-approximated=Aproximado
 others=Others
 test_condition=Test condition
 run_success=Run successful
@@ -384,5 +424,4 @@
 patients_registered=Registered Beneficiaries No
 irregular_encounter=Irregular encounter
 date_of_birth=Date of Birth
-anonymous=Anonymous
-edit_program_validation=Edit program validation 
+anonymous_event=Anonymous Event

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties	2011-12-26 11:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties	2012-01-11 03:37:02 +0000
@@ -161,6 +161,7 @@
 specfiy_birth_date_or_age=Vui l\u00F2ng ghi r\u00F5 ng\u00E0y sinh ho\u1EB7c tu\u1ED5i
 create_new_program=T\u1EA1o m\u1EDBi m\u1ED9t ch\u01B0\u01A1ng tr\u00ECnh
 specify_search_criteria=H\u00E3y x\u00E1c nh\u1EADn \u0111i\u1EC1u ki\u1EC7n t\u00ECm ki\u1EBFm
+'s=c\u00F3
 patient_attribute=Thu\u1ED9c t\u00EDnh c\u1EE7a c\u00E1 th\u1EC3
 edit_relationship_type=Ch\u1EC9nh s\u1EEDa lo\u1EA1i quan h\u1EC7
 orgunit=\u0110\u01A1n v\u1ECB

=== 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	2011-12-28 06:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm	2012-01-11 03:37:02 +0000
@@ -29,7 +29,7 @@
     <tr>
 		<td width="20em"><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
 		<td>
-			<select id="dataElementGroup" name="dataElementGroup" style="width:30.5em" onchange="getAggDataElements();">
+			<select id="dataElementGroup" name="dataElementGroup" style="min-width:30.5em" onchange="getAggDataElements();">
 				<option value="">[$i18n.getString('please_select')]</option>
 				#foreach( $dataElementGroup in $dataElementGroups)
 					<option value="$dataElementGroup.id" >$dataElementGroup.name</option>
@@ -42,7 +42,7 @@
     <tr>
 		<td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
-			<select id="aggregationDataElementId" name="aggregationDataElementId" style="width:30.5em" class="{validate:{required:true}}" >
+			<select id="aggregationDataElementId" name="aggregationDataElementId" style="min-width:30.5em" class="{validate:{required:true}}" >
 			</select>
 		</td>				
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2011-12-27 06:08:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2012-01-11 03:37:02 +0000
@@ -68,10 +68,7 @@
       <tr>        
         <th>$i18n.getString( "available_data_elements" )</th>
         <th></th>
-        <th>$i18n.getString( "selected_data_elements" )							
-			<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"></select>
-			<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>     
-		</th>
+        <th>$i18n.getString( "selected_data_elements" )</th>
       </tr>
     </thead>
   
@@ -99,9 +96,12 @@
             <a href="javascript:moveUpDataElement()"><img src="../images/move_up.png"/></a><br/><br/>
             <a href="javascript:moveDownDataElement()"><img src="../images/move_down.png"/></a><br/><br/>
         </td>  
-		 </tr>
+			
+      </tr>
     </tbody>
 </table>
+<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"></select>
+<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>     
 <p>
 	<input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
 	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$program.id'" style="width:10em"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm	2012-01-11 03:37:02 +0000
@@ -51,7 +51,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
                 <p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2011-12-22 02:52:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2012-01-11 03:37:02 +0000
@@ -148,7 +148,6 @@
 {
     jQuery.post( 'getCaseAggregation.action', { id:caseAggregationId }, function ( json )
 	{
-		setInnerHTML( 'idField', json.caseAggregation.id );
 		setInnerHTML( 'descriptionField', json.caseAggregation.description );	
 		setInnerHTML( 'operatorField', json.caseAggregation.operator );
 		setInnerHTML( 'aggregationDataElementField', json.caseAggregation.aggregationDataElement );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2011-10-04 07:27:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttribute.js	2012-01-11 03:37:02 +0000
@@ -6,7 +6,6 @@
 {
 	jQuery.post( 'getPatientAttribute.action', { id: patientAttributeId },
 		function ( json ) {
-			setInnerHTML( 'idField', json.patientAttribute.id );
 			setInnerHTML( 'nameField', json.patientAttribute.name );	
 			setInnerHTML( 'descriptionField', json.patientAttribute.description );
 			

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js	2011-11-02 07:37:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientAttributeGroup.js	2012-01-11 03:37:02 +0000
@@ -7,7 +7,6 @@
 	jQuery.post( 'getPatientAttributeGroup.action', { id: patientAttributeGroupId },
 		function ( json ) {
 				
-			setInnerHTML( 'idField', json.patientAttributeGroup.id );
 			setInnerHTML( 'nameField', json.patientAttributeGroup.name );	
 			setInnerHTML( 'descriptionField', json.patientAttributeGroup.description );
 			setInnerHTML( 'noAttributeField', json.patientAttributeGroup.noAttribute );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js	2011-10-04 08:53:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientChart.js	2012-01-11 03:37:02 +0000
@@ -4,7 +4,6 @@
 	jQuery.postJSON( "getPatientChart.action", {
 			id:patientChartId 
 		}, function(json){
-			setInnerHTML( 'idField', json.id );
 			setInnerHTML( 'titleField', json.title );
 
 			var typeMap = {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2011-10-04 07:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js	2012-01-11 03:37:02 +0000
@@ -6,7 +6,6 @@
 {
 	jQuery.post( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId },
 		function ( json ) {
-			setInnerHTML( 'idField', json.patientIdentifierType.id );
 			setInnerHTML( 'nameField', json.patientIdentifierType.name );	
 			setInnerHTML( 'descriptionField', json.patientIdentifierType.description );
 			

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2012-01-11 03:37:02 +0000
@@ -7,7 +7,6 @@
 	jQuery.post( "getProgram.action", {
 		id:programId
 	}, function(json){
-		setInnerHTML( 'idField', json.program.id );
 		setInnerHTML( 'nameField', json.program.name );
 		setInnerHTML( 'descriptionField', json.program.description );
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programAttribute.js	2012-01-11 03:37:02 +0000
@@ -5,7 +5,6 @@
 function showProgramAttributeDetails( programAttributeId )
 {
 	jQuery.post( 'getProgramAttribute.action', { id: programAttributeId }, function ( json ) {
-		setInnerHTML( 'idField', json.programAttribute.id );
 		setInnerHTML( 'nameField',  json.programAttribute.name );	
 		setInnerHTML( 'descriptionField', json.programAttribute.description );
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2011-09-28 07:11:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2012-01-11 03:37:02 +0000
@@ -39,7 +39,6 @@
 function showProgramStageDetails( programStageId )
 {
 	jQuery.post( 'getProgramStage.action', { id: programStageId }, function ( json ) {
-		setInnerHTML( 'idField', json.programStage.id );
 		setInnerHTML( 'nameField', json.programStage.name );	
 		setInnerHTML( 'descriptionField', json.programStage.description );
 		setInnerHTML( 'stageInProgramField', json.programStage.stageInProgram );   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js	2011-12-22 02:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programValidation.js	2012-01-11 03:37:02 +0000
@@ -12,7 +12,6 @@
 function showProgramValidationDetails ( programValidationId )
 {
     jQuery.post( 'getProgramValidation.action', { validationId: programValidationId }, function ( json ) {
-		setInnerHTML( 'idField', json.validation.id );
 		setInnerHTML( 'descriptionField', json.validation.description );
 		setInnerHTML( 'leftSideField', json.validation.leftSide );
 		if( json.validation.rightSide != '1==1')

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js	2011-09-29 04:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationship.js	2012-01-11 03:37:02 +0000
@@ -5,7 +5,6 @@
 function showRelationshipTypeDetails( relationshipTypeId )
 {
   	jQuery.post( 'getRelationshipType.action', { id: relationshipTypeId }, function ( json ) {
-		setInnerHTML( 'idField', json.relationshipType.id );
 		setInnerHTML( 'aIsToBField', json.relationshipType.aIsToB );	
 		setInnerHTML( 'bIsToAField', json.relationshipType.bIsToA );       
 		setInnerHTML( 'descriptionField', json.relationshipType.description );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js	2011-10-05 06:56:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js	2012-01-11 03:37:02 +0000
@@ -14,7 +14,6 @@
 function showValidationCriteriaDetails( criteriaId )
 {
 	jQuery.post( 'getValidationCriteria.action', { id: criteriaId }, function ( json ) {
-		setInnerHTML( 'idField', json.validationCriteria.id );
 		setInnerHTML( 'nameField', json.validationCriteria.name );
 		setInnerHTML( 'descriptionField', json.validationCriteria.description );
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2011-10-03 07:45:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm	2012-01-11 03:37:02 +0000
@@ -49,7 +49,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "mandatory" ):</label><br><span id="mandatoryField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2011-10-05 07:27:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm	2012-01-11 03:37:02 +0000
@@ -55,7 +55,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
                 <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "mandatory" ):</label><br><span id="mandatoryField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm	2011-10-03 07:45:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm	2012-01-11 03:37:02 +0000
@@ -53,7 +53,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
                 <p><label class="bold">$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
                 <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
                 <p><label class="bold">$i18n.getString( "number_of_attribute" ):</label><br><span id="noAttributeField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm	2011-10-04 08:53:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientChartList.vm	2012-01-11 03:37:02 +0000
@@ -43,7 +43,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "title" ):</label><br><span id="titleField"></span></p>
 				<p><label class="bold">$i18n.getString( "chart_type" ):</label><br><span id="typeField"></span></p>				
 				<p><label class="bold">$i18n.getString( "chart_size" ):</label><br><span id="sizeField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm	2011-01-20 15:25:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "define_program_associations" )</h3>
+<h3>$i18n.getString( "assign_program_to_orgunits_for_registering" )</h3>
 
 <h4>$encoder.htmlEncode( $program.name )</h4>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2011-10-05 07:27:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAttributeList.vm	2012-01-11 03:37:02 +0000
@@ -52,7 +52,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2011-12-20 02:48:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2012-01-11 03:37:02 +0000
@@ -23,9 +23,9 @@
 					<td>$encoder.htmlEncode( $program.name )</td>                
 					
 					<td style="text-align:center">
-					  <a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( 'define_associations' )"><img src="../images/assign.png" alt="$i18n.getString( 'define_associations' )"></a>
+					  <a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( 'assign_program_to_orgunits' )"><img src="../images/assign.png" alt="$i18n.getString( 'assign_program_to_orgunits' )"></a>
 					  #if( $program.anonymous=='false')
-					  <a href="programValidation.action?programId=$program.id" title="$i18n.getString( 'program_validation_management' )"><img src="../images/assign_b.png" alt="$i18n.getString( 'define_program_validation' )"></a>
+					  <a href="programValidation.action?programId=$program.id" title="$i18n.getString( 'program_validation_management' )"><img src="../images/assign_b.png" alt="$i18n.getString( 'program_validation_management' )"></a>
 					  #else
 						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 					  #end
@@ -48,7 +48,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>				
 				<p><label class="bold">$i18n.getString( "single_event" ):</label><br><span id="singleEventField"></span></p>				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2011-10-03 07:45:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm	2012-01-11 03:37:02 +0000
@@ -59,7 +59,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>				
 				<p><label class="bold">$i18n.getString( "stage_in_program" ):</label><br><span id="stageInProgramField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2011-10-04 08:53:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm	2012-01-11 03:37:02 +0000
@@ -47,7 +47,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="descriptionField"></span></p>
 				<p><label class="bold" id='leftSideTitle'>$i18n.getString( "left_side" ):</label><br><span id="leftSideField"></span></p>
 				<p id='rightSideDiv'><label class="bold">$i18n.getString( "right_side" ):</label><br><span id="rightSideField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm	2011-05-19 08:12:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm	2012-01-11 03:37:02 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "define_program_associations" ) </h3>
+<h3>$i18n.getString( "assign_validation_for_programs" ) </h3>
 
 <form action='defineProgramsForValidationCriteria.action' method='post' onsubmit="selectAllById('programIds');">
 <table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm	2011-10-03 07:45:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm	2012-01-11 03:37:02 +0000
@@ -54,7 +54,6 @@
             <div style="float:right;">
                 <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
             </div>              
-            <p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
             <p><label class="bold">$i18n.getString( "a_is_to_b" ):</label><br><span id="aIsToBField"></span></p>
             <p><label class="bold">$i18n.getString( "b_is_to_a" ):</label><br><span id="bIsToAField"></span></p>
             <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>                            

=== 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	2011-12-28 06:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm	2012-01-11 03:37:02 +0000
@@ -31,7 +31,7 @@
     <tr>
 		<td width="20em"><label for="dataElementGroup">$i18n.getString( "dataelement_group" )</label></td>
 		<td>
-			<select id="dataElementGroup" name="dataElementGroup" style="width:30.5em" onchange="getAggDataElements();">
+			<select id="dataElementGroup" name="dataElementGroup" style="min-width:30.5em" onchange="getAggDataElements();">
 				<option value="0">[$i18n.getString('please_select')]</option>
 				#foreach( $dataElementGroup in $dataElementGroups)
 					<option value="$dataElementGroup.id" >$dataElementGroup.name</option>
@@ -44,7 +44,7 @@
     <tr>
 		<td width="20em"><label for="dataElement">$i18n.getString( "dataelement" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 		<td>
-			<select id="aggregationDataElementId" name="aggregationDataElementId" style="width:30.5em" class="{validate:{required:true}}" >
+			<select id="aggregationDataElementId" name="aggregationDataElementId" style="min-width:30.5em" class="{validate:{required:true}}" >
 				<option value="$caseAggregation.aggregationDataElement.id.$caseAggregation.optionCombo.id">$caseAggregation.aggregationDataElement.name ($caseAggregation.optionCombo.name)</option>
 			</select>
 		</td>				

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2011-12-27 06:08:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2012-01-11 03:37:02 +0000
@@ -83,10 +83,7 @@
 		<tr>
 			<th>$i18n.getString( "available_data_elements" )</th>
 			<th></th>
-			<th>$i18n.getString( "selected_data_elements" )
-				<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"> </select>
-				<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>
-			</th>
+			<th>$i18n.getString( "selected_data_elements" )</th>
 		</tr>
     </thead>
 	
@@ -108,7 +105,7 @@
 					</thead>
 					<tbody id="selectedList">
 						#foreach ( $programStageDataElement in $programStageDataElements )
-							<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id" class="selected">
+							<tr ondblclick="unSelectDataElement( this )" id="$programStageDataElement.dataElement.id">
 								<td onclick="select(this)">$encoder.htmlEncode( $programStageDataElement.dataElement.name )</td>
 								<td><input type="checkbox" name="compulsory" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.compulsory == true ) checked #end /></td>
 							</tr>
@@ -126,6 +123,8 @@
     </tr>
     </tbody>
 </table>
+<select id="selectedDataElementsValidator" name='selectedDataElementsValidator' multiple="multiple" class="{validate:{required:true}}" style="display:none"> </select>
+<select id="compulsories" name='compulsories' multiple="multiple" style="display:none"></select>
 <p>
 	<input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/>
 	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='programStage.action?id=$programStage.program.id'" style="width:10em"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2011-10-05 06:56:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm	2012-01-11 03:37:02 +0000
@@ -26,7 +26,7 @@
 				<tr id="tr${criteria.id}">
 				  <td>$criteria.name</td>
 				  <td>
-					<a href="showProgramsForValidationCriteriaForm.action?criteriaId=$criteria.id" title="$i18n.getString( "define_associations" )"><img src="../images/assign.png" alt="$i18n.getString( 'assign_program' )"></a>
+					<a href="showProgramsForValidationCriteriaForm.action?criteriaId=$criteria.id" title="$i18n.getString( 'assign_validation_for_programs' )"><img src="../images/assign.png" alt="$i18n.getString( 'assign_validation_for_programs' )"></a>
 					<a href="showUpdateValidationCriteriaForm.action?id=$criteria.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
 					<a href="javascript:removeCriteria( '$criteria.id', '$encoder.jsEncode( $criteria.getName() )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 					<a href="javascript:showValidationCriteriaDetails( '$criteria.id' )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
@@ -41,7 +41,6 @@
 				<div style="float:right">
 					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id='idField'></span></p>
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id='nameField'></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id='descriptionField'></span></p>
 				<p><label class="bold">$i18n.getString( "criteria" ):</label><br><span id='criteriaField'></span></p>