=== 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-05-29 15:37:40 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -3,7 +3,7 @@ back_to_relationship=Back to relationship program_stages_history_plan=Program stages history/plan scheduled_for=Scheduled for -list_all_patients=List all beneficiaries +list_all_patients=List all persons program_summary=Program summary data_entry=Data entry name_based=Name-based @@ -31,7 +31,7 @@ saving_value_failed_status_code=Saving value failed with status code saving_value_failed_error_code=Saving value failed with error code value_must_integer=Value must be an integer -searching_patient_failed=Searching beneficiary failed +searching_patient_failed=Searching person failed select_value=Select value address=Address village=Village @@ -44,7 +44,7 @@ program_stage=Program stage specify_a_search_criteria=Please specify your search criteria search=Search -patient_identifier=Beneficiary Identifier +patient_identifier=Person Identifier identifier=Identifier demographics=Demographics age=Age @@ -60,14 +60,14 @@ program_summary_report=Program Summary Report name_based_data_entry=Name-based data entry visit_plan=Visit Plans -intro_name_based_data_entry=Enter data for beneficiaries and their respective programs and program stages. +intro_name_based_data_entry=Enter data for persons and their respective programs and program stages. intro_program_summary=View the summary report to get an overview of the services provided for a program. intro_visit_plan=View the visit plan to get an overview of outstanding, pending and completed visits. other_facility=Private facility error_required_field=Please enter value for all data element in red color. complete_confirm_message=Are you sure this Program stage is completed ? You can not change its data after it is completed. complete=Complete data entry -case_aggregation_form=Beneficiary aggregation form +case_aggregation_form=Person aggregation form dataset_list=Dataset List multiple_name_based=Multiple Name-based intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit. @@ -89,13 +89,13 @@ date_less_incident_date=This date is less then the incident date. deleted=Deleted old_value=Old Value -case_aggregation=Beneficiary aggregation +case_aggregation=Person aggregation please_specify_an_orgunit=Please specify an organisation unit please_select_to_date_greater_or_equals_to_from_date=Please select to-date greater or equals to from-date violate_validation=Violate validation common_info=Common information dob_type=DOB type -intro_multiple_name_based_data_entry=Enter data for multiple program stages and beneficiaries for a program. The entry screen gives an overview of the stage status. +intro_multiple_name_based_data_entry=Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status. in=In is_null=is null data_value=datavalue @@ -114,7 +114,7 @@ view_patient_chart=View patient chart generate_patient_chart=Generate patient chart patient_chart_management=Patient chart management -intro_patient=Create, modify and search for beneficiaries. Any type of data can be registered for a beneficiary by including attributes. +intro_patient=Create, modify and search for persons. Any type of data can be registered for a person by including attributes. registration=Registration select_relationship=Select Relationship please_select_a_representative=Please select a representing relationship @@ -129,32 +129,32 @@ relationship=Relationship manage_relationship=Relationship management relationship_already_exists=Relationship already exists -list_all_patients=List all beneficiaries +list_all_patients=List all persons nr=No unenroll=Unenroll enroll=Enroll date_of_incident=Date of incident date_of_enrollment=Date of enrollment program_enrollment_management=Program enrollment management -patient_registered=Beneficiary registered -patient_details=Beneficiary details +patient_registered=Person registered +patient_details=Person details enrolled_in_program=Enrolled in programs -update_patient=Edit profile of beneficiary +update_patient=Edit profile of person search_by_name_identifier=Search by name or identifier -add_new_patient=Register new beneficiary -patient_identifier=Beneficiary identifier +add_new_patient=Register new person +patient_identifier=Person identifier system_identifier=System generated identifier -patient_management=Beneficiary management -patient_duplicate=Beneficiary duplicate -edit_this_patient=Edit profile of this beneficiary +patient_management=Person management +patient_duplicate=Person duplicate +edit_this_patient=Edit profile of this person check_duplicate=Check duplicate -patient_identifiers=Beneficiary identifiers -patient_attributes=Beneficiary attributes -duplicate_warning=We found some beneficiaries that have the same information. You can choose continue creating this beneficiary, or choose one of existing beneficiaries to update information. -create_new_patient=Continue register this beneficiary -no_duplicate_found=No duplicate beneficiary found +patient_identifiers=Person identifiers +patient_attributes=Person attributes +duplicate_warning=We found some persons that have the same information. You can choose continue creating this person, or choose one of existing persons to update information. +create_new_patient=Continue register this person +no_duplicate_found=No duplicate person found patient_system_id=System generated ID -identifier_duplicate=Beneficiary identifier duplicate +identifier_duplicate=Person identifier duplicate has_guardian=Has guardian add_new_person=Add new person search_existing_person=Search existing person @@ -162,8 +162,8 @@ search_value=Search value add_person_successfully=Add person successfully please_select_relationshipType=Please select relationship type -please_choose_representative_for_this_under_age_patient=Please chose representative for this under age beneficiary -please_choose_relationshipType_for_this_under_age_patient=Please choose relationship type for this under age beneficiary +please_choose_representative_for_this_under_age_patient=Please chose representative for this under age person +please_choose_relationshipType_for_this_under_age_patient=Please choose relationship type for this under age person dateOfEnrollmentDescription=Date of enrollment description dateOfIncidentDescription=Date of incident description child_representative=Child's representative @@ -188,32 +188,32 @@ date_invalid=The date is invalid date_less_incident=The date is less than date of incident search_by_program=Search by program -list_patients_by_program=List beneficiaries by program +list_patients_by_program=List persons by program program_unenrollment_management=Program un-enrollment management -enrol_success=Beneficiary enrolled successfully +enrol_success=Person enrolled successfully duplicated_patient_list=Duplicated patient list specfiy_birth_date_or_age=Specfiy birth date or age -update_this_patient=Update this beneficiary -search_patients_by_attributes=Search beneficiaries by attributes -patient=Beneficiary -confirm_delete_patient=Are you sure you want to delete the beneficiary? +update_this_patient=Update this person +search_patients_by_attributes=Search persons by attributes +patient=Person +confirm_delete_patient=Are you sure you want to delete the person? please_enter_a_valid_birth_date=Please enter a valid date of birth relationship_management=Relationship management save_success=Save successfully yes_and_attribute=Yes and inherit attribute identifiers=Identifiers relationship_type=Relationship type -identifier_type=Beneficiary identifier type +identifier_type=Person identifier type choose_this_person=Choose this person format_date=Format Date specify_search_criteria=Please specify search criteria -patient_profile=Beneficiary profile +patient_profile=Person profile other_details=Other details register_event=Register event enroll_to_program=Enroll in program add_dependent=Add dependent edit_profile=Edit profile -case_aggregation_result=Beneficiary aggregation result +case_aggregation_result=Person aggregation result aggregate_details=Aggregate details show_details=Show details representative_info=Representative's information @@ -231,7 +231,7 @@ event_information=Event information history_events=History events reason=Reason -patient_could_not_be_enrolled_due_to_following_enrollment_criteria=The beneficiary could not be enrolled due to the following enrollment criteria +patient_could_not_be_enrolled_due_to_following_enrollment_criteria=The person could not be enrolled due to the following enrollment criteria before_current_date=Before current date before_or_equals_to_current_date=Before or equals to current date after_current_date=After current date @@ -269,7 +269,7 @@ program_enrollment = Program enrollment date_of_enrollment=Date of enrollment date_of_incident=Date of incident -patient_details_and_history = Beneficiary details and history +patient_details_and_history = Person details and history selected = Selected orgunit = Organisation unit add_all = Add all @@ -278,7 +278,7 @@ order_by_report_date = Order by report date clear = Clear selected_orgunit_no_have_any_child = Selected organisation unit no have any child -age_of_patient_must_be_less_or_equals_to_100 = Age of beneficiary must be less or equals to 100 +age_of_patient_must_be_less_or_equals_to_100 = Age of person must be less or equals to 100 data_element = Data element V=Verified D=Declared @@ -289,14 +289,14 @@ please_fill_out_only_one_of_these_fields = Please fill out at only one of these fields. age_year = Age(year) create = Create -migration_patient = Migration beneficiary -patient_info = Beneficiary information +migration_patient = Migration person +patient_info = Person information program_enrolled_for = Program enrolled for identifier_and_attribute = Identifier/Attribute unenrollment = Un-enrollment modify_due_date_or_visit_date = Modify due/Visit dates data_entry_screen = Data entry screen -unenrol_success = Beneficiary un-enrolled successfully +unenrol_success = Person un-enrolled successfully enrolled_for = Enrolled for selected_boundary = Selected (boundary) regular_program = Regular program === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-05-26 12:31:07 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -44,7 +44,7 @@ current_activityplan=Current Activity Plan all_activityplan=All Activity Plan activity_type=Activity Type -beneficiary_list=Beneficiary List +beneficiary_list=Person List activity_list=Activity List successfully_saved=Successfully Saved select_option=Select Option @@ -54,15 +54,15 @@ blood_group=Blood Group details_for=Detail For organisation_unit=Organisation Unit -beneficiary_registration=Beneficiary Registration +beneficiary_registration=Person Registration full_name=FullName male=Male female=Female transgender=Transgender is_empty=Empty Field -beneficiary_enrollment=Beneficiary Enrollment -beneficiary_search=Beneficiary Search -beneficiary_name=Beneficiary Name +beneficiary_enrollment=Person Enrollment +beneficiary_search=Person Search +beneficiary_name=Person Name search_result_for=Search Result for search=Search enrolled_programs=Enrolled Program(s) @@ -74,7 +74,7 @@ single_event=Single Event single_event_list=Single Event List tracking=Tracking -find_beneficiary=Find Beneficiary +find_beneficiary=Find Person activity_plan=Activity Plan search_by_name_or_id=Search By Name or ID select_orgunit=Select Organisation Unit === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-05-11 08:44:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -86,7 +86,7 @@ intro_data_browser=Browse the database and get an overview of where data exists. View and export counts of data elements as well as raw data. intro_data_integrity=Run data integrity checks and unveil anomalies and problems in the meta data setup. intro_data_archive=Archive data which is not currently relevant to your system in order to improve performance. Data can also be unarchived. -intro_patient_data_archive=Archive beneficiary data which is not currently relevant to your system. Data can also be unarchived. +intro_patient_data_archive=Archive person data which is not currently relevant to your system. Data can also be unarchived. intro_maintenance=Perform maintenance tasks such as pruning of data values and periods and clearing of database resource tables. intro_resource_table=Generate resource database tables for the organisation unit hierarchy and group set structure among others. intro_organisation_unit_merge=Merge two organisation units and their data values. Data is merged depending on existence and date of last modification. @@ -212,8 +212,8 @@ data_set_list=Data Set list data_element_group_list=Data Element Group list orgunit_group_list=Organisation Unit Group list -patient_data_archive=Beneficiary Data Archive -intro__patient_data_archive=Archive beneficiary data which is not currently relevant to your system in order to improve performance. Data can also be unarchived. +patient_data_archive=Person Data Archive +intro__patient_data_archive=Archive person data which is not currently relevant to your system in order to improve performance. Data can also be unarchived. pruning_interrupted=You must choose the organisation unit has parent to prune. Please try again! sqlquery_is_not_allowed=Not allowance to query in the special tables! sections_with_invalid_category_combinations=Sections with invalid category combinations === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2012-05-29 07:58:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -1,5 +1,5 @@ -intro_patient_mobile_setting=Define what beneficiary information will be sent to the mobile device. -patient_mobile_setting=Beneficiary Mobile Settings +intro_patient_mobile_setting=Define what person information will be sent to the mobile device. +patient_mobile_setting=Person Mobile Settings gender=Gender dob_type=DoB Type date_of_birth=Date of Birth @@ -30,7 +30,7 @@ operation=Operation gateway_type=Gateway Type send_sms=Send SMS -send_sms_beneficiary=Send SMS to Beneficiary +send_sms_beneficiary=Send SMS to Person add_gateway=Add Gateway gateway_type=Gateway Type type=Type @@ -75,12 +75,12 @@ raw_phone_number=Raw phone numbers assigned_user_number=User assigned to organisation unit selected_unit_number=Selected organisation unit -patient_number=Beneficiary/Patient +patient_number=Person/Patient programs=Programs organisation_unit_level=Organisation unit level chidren_only=Children only please_select_a_program=Please select a program -there_is_no_program=There is no program selected, won't send SMS to any Beneficiary +there_is_no_program=There is no program selected, won't send SMS to any Person please_select_a_gateway_type_to_send_sms=Please specify a gateway to send the SMS service_stopped_cannot_send_sms=Service is stopped. SMS cannot be sent. please_verify_phone=Please verify the phone number(s). Separate each number with a semicolon (;) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-05-26 17:38:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -5,7 +5,7 @@ less_than=Less Than less_than_or_equal_to=Less Than or Equal in_between=In Between -is_equal_to_patient_domain=Is Equal to Beneficiary Domain +is_equal_to_patient_domain=Is Equal to Person Domain group=Group duplicate_names=Name is already in use hide_details=Hide Details @@ -24,12 +24,12 @@ value_must_integer=Value must be an integer program_stage=Program Stage close=Close -edit_patient_attribute=Edit beneficiary attribute +edit_patient_attribute=Edit person attribute attribute=Attribute value_type=Value Type -create_new_patient_attribute=Create new beneficiary attribute -confirm_delete_patient_attribute=Are you sure you want to delete beneficiary attribute? -patient_attribute_management=Beneficiary attribute management +create_new_patient_attribute=Create new person attribute +confirm_delete_patient_attribute=Are you sure you want to delete person attribute? +patient_attribute_management=Person attribute management name_in_use=Name in use program_stage_sort_order=Program Stage Sort Order sort=Sort @@ -64,14 +64,14 @@ add=Add program_management=Program management everything_is_ok=Everything is OK -patient_attribute=Beneficiary Attribute +patient_attribute=Person 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 +beneficiary_aggregation=Person Aggregation +beneficiary_aggregation_query_builder=Person Aggregation Query Builder +beneficiary_aggregation_query_builder_management=Person aggregation query builder management dataelement_group=Data Element Group dataelement=Data Element -case_attributes=Beneficiary Attributes +case_attributes=Person Attributes operator=Operator dataentryform_management_for_program_stage=Data entry form management for Program stage choose_existing_dataentry=Choose existing data entry form @@ -81,23 +81,23 @@ add_more_option=Add Option remove_option=Remove Option mandatory=Mandatory -patient_attribute_group_management=Beneficiary attribute group management +patient_attribute_group_management=Person 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 -edit_patient_attribute_group=Edit beneficiary attribute group -create_new_patient_attribute_group=Create new beneficiary attribute group -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 +patient_attribute_group_deltails=Person attribute group details +patient_attribute_group=Person Attribute Group +edit_patient_attribute_group=Edit person attribute group +create_new_patient_attribute_group=Create new person attribute group +patient_identifier_type_management=Person identifier type management +patient_identifier_type=Person Identifier Type +create_new_patient_identifier_type=Create new person identifier type +edit_patient_identifier_type=Edit person identifier type delete_successfull=Deleted successfully 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. +success_delete_patient_attribute_option=Delete person attribute option successfully. +error_delete_patient_attribute_option=Can not find Person attribute option to delete. attribute_combo_type=Predefined value at_least_2_option=Please add at least two attribute options identifier_type=Identifier type @@ -106,18 +106,18 @@ 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_patient_attribute=Create, modify and view Person attributes. An attribute can be used to register extra information for a Person. +intro_patient_attribute_group=Create, modify and view Person attribute groups. Groups makes it more convenient to add attributes to a Person. +intro_patient_identifier_type=Create, modify and view Person 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_beneficiary_aggregation_query_builder=Set up aggregation rules for the process of aggregating Person data to statistical data. +intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Person data. intro_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_configuration=Set the Excel XML template file used for automatically importing beneficiary data. +intro_import_data=Import information of patients automatically from an Excel template file into the person database. +intro_configuration=Set the Excel XML template file used for automatically importing person data. inheritable=Inheritable -patient_attribute_details=Beneficiary attribute details +patient_attribute_details=Person attribute details search_result=Search result criteria=Criteria operator_less_then=< @@ -156,12 +156,12 @@ duplicate=Duplicate 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_aggregation_condition=Person Aggregation Query Builder +case_aggregation_condition_detail=Person aggregation query builder details +create_new_case_aggregation_condition=Create new person aggregation query builder condition=Condition condition_detail=Condition details -edit_case_aggregation_condition=Edit beneficiary aggregation query builder +edit_case_aggregation_condition=Edit person aggregation query builder enrolldate_minus_incidentdate=Date of Enrollment - Date of Incident program_properties=Program properties orgunit=Organisation unit @@ -174,7 +174,7 @@ program_validation_management=Program validation managenent create_new_single_validation=Create new single validation create_new_multi_validation=Create new multi validation -beneficiary_attribute_group_sort_order=Beneficiary Attribute Group Sort Order +beneficiary_attribute_group_sort_order=Person attribute group sort order scheduled_days_from_start=Scheduled days from start success_delete_program_attribute_option=Delete program attribute option successfully. validation_criteria_management=Validation criteria management @@ -182,34 +182,17 @@ aggregation_expression=Aggregation expression aggregation_data_element_in_use=Aggregation data element is in use 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 -patients=Beneficiaries +patients=Persons gender=Gender dob_type=DOB Type date_of_enrollment_description=Description of enrollment date date_of_incident_description=Description of incident date date_of_enrollment=Date of enrollment date_of_incident=Date of incident -patient_identifier_type_details=Beneficiary identifier type details +patient_identifier_type_details=Person identifier type details male=Male female=Female transgender=Transgender @@ -220,7 +203,7 @@ test_condition=Test condition run_success=Run successful run_fail=Run failed -patients_registered=Registered Beneficiaries No +patients_registered=Registered Persons No repeatable=Repeatable date_of_birth=Date of Birth anonymous=Anonymous @@ -247,7 +230,7 @@ add_all_values=Add all values display_provided_other_facility_column=Display provided other facility column aggregation_query_builder=Aggregation Query Builder -patient_org_unit_registration=Beneficiary Org Unit Registration +patient_org_unit_registration=Person Org Unit Registration dataset= Dataset filter_by_data_set = Filter by dataset show_all_item = Show All Items === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-05-13 13:32:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-05-30 07:22:33 +0000 @@ -125,14 +125,14 @@ F_RELATIONSHIPTYPE_DELETE=Delete Relationship Type F_RELATIONSHIPTYPE_ADD=Add Relationship Type F_ORGANISATION_REGISTRATION=Organisation Unit Registration -F_PATIENTATTRIBUTE_ADD=Add Beneficiary Attribute -F_PATIENTATTRIBUTE_UPDATE=Update Beneficiary Attribute -F_PATIENTATTRIBUTE_DELETE=Delete Beneficiary Attribute -F_PATIENTATTRIBUTEVALUE_ADD=Add Beneficiary Attribute Value +F_PATIENTATTRIBUTE_ADD=Add Person Attribute +F_PATIENTATTRIBUTE_UPDATE=Update Person Attribute +F_PATIENTATTRIBUTE_DELETE=Delete Person Attribute +F_PATIENTATTRIBUTEVALUE_ADD=Add Person Attribute Value F_RELATIONSHIP_ADD=Add Relationship -F_PATIENT_ADD=Add Beneficiary -F_PATIENT_UPDATE=Update Beneficiary -F_PATIENT_DELETE=Delete Beneficiary +F_PATIENT_ADD=Add Person +F_PATIENT_UPDATE=Update Person +F_PATIENT_DELETE=Delete Person F_PROGRAM_ADD=Add Program F_PROGRAM_UPDATE=Update Program F_PROGRAM_DELETE=Delete Program @@ -140,34 +140,34 @@ F_PROGRAMSTAGE_ADD=Add Program Stage F_PROGRAMSTAGE_UPDATE=Update Program Stage F_PROGRAMSTAGE_DELETE=Delete Program Stage -F_PATIENTIDENTIFIERTYPE_ADD=Add Beneficiary Identifier Type -F_PATIENTIDENTIFIERTYPE_DELETE=Delete Beneficiary Identifier Type -F_PATIENTIDENTIFIERTYPE_UPDATE=Update Beneficiary Identifier Type +F_PATIENTIDENTIFIERTYPE_ADD=Add Person Identifier Type +F_PATIENTIDENTIFIERTYPE_DELETE=Delete Person Identifier Type +F_PATIENTIDENTIFIERTYPE_UPDATE=Update Person Identifier Type F_PROGRAM_ATTRIBUTE_ADD=Add Program Attribute F_PROGRAM_ATTRIBUTE_DELETE=Delete Program Attribute F_PROGRAM_ATTRIBUTE_UPDATE=Update Program Attribute -F_PATIENT_DATAVALUE_ADD = Add Beneficiary Data Value -F_PATIENT_DATAVALUE_UPDATE = Update Beneficiary Data Value -F_PATIENT_DATAVALUE_DELETE = Delete Beneficiary Data Value +F_PATIENT_DATAVALUE_ADD = Add Person Data Value +F_PATIENT_DATAVALUE_UPDATE = Update Person Data Value +F_PATIENT_DATAVALUE_DELETE = Delete Person Data Value F_GENERATE_ACTIVITY_PLANS = Generate Activity Plans F_GENERATE_PROGRAM_SUMMARY_REPORT = Generate Program Summary Report -F_GENERATE_BENEFICIARY_TABULAR_REPORT = Generate Beneficiary Tabular report -F_PATIENT_AGGREGATION = Beneficiary Aggregation -F_GENERATE_PATIENT_CHART = Generate Beneficiary Chart -F_PATIENT_MANAGEMENT = Beneficiary Management +F_GENERATE_BENEFICIARY_TABULAR_REPORT = Generate Person Tabular report +F_PATIENT_AGGREGATION = Person Aggregation +F_GENERATE_PATIENT_CHART = Generate Person Chart +F_PATIENT_MANAGEMENT = Person Management F_NAME_BASED_DATA_ENTRY = Name-Based Data Entry F_PROGRAM_ENROLLMENT = Program Enrollment F_PROGRAM_UNENROLLMENT = Program Un-Enrollment -F_RELATIONSHIP_MANAGEMENT = Beneficiary Relationship Management -F_RELATIONSHIP_ADD = Add Beneficiary Relationship -F_RELATIONSHIP_DELETE = Delete Beneficiary Relationship +F_RELATIONSHIP_MANAGEMENT = Person Relationship Management +F_RELATIONSHIP_ADD = Add Person Relationship +F_RELATIONSHIP_DELETE = Delete Person Relationship F_SYSTEM_SETTING=Change system settings F_COPY_EXCEL_ITEM_ADMINISTRATION=Copy Excel Item F_EXCEL_TEMPLATE_MANAGEMENT_DELETE=Delete Excel Template F_EXCEL_TEMPLATE_MANAGEMENT_LIST=List Excel Template F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=Upload Excel Template F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=Rename Excel Template file -F_PATIENTATTRIBUTEVALUE_DELETE=Delete Beneficiary Attribute Value +F_PATIENTATTRIBUTEVALUE_DELETE=Delete Person Attribute Value F_RELATIONSHIPTYPE_UPDATE=Update Relationship Type F_RELATIONSHIP_DELETE=Delete Relationship F_GIS_ADMIN=Administrate GIS