=== 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 2013-03-21 15:18:52 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-03-25 08:55:41 +0000 @@ -80,8 +80,8 @@ on_value=on value=Value status=Status -no_aggregate_date_values_are_added_or_update_in_all_facilities=No aggregage data values are added or updated in all facilities -no_aggregate_date_values_are_added_or_update_in_other_facilities=No aggregage data values are added or updated in other facilities +no_aggregate_date_values_are_added_or_update_in_all_facilities=No aggregate data values are added or updated in all facilities +no_aggregate_date_values_are_added_or_update_in_other_facilities=No aggregate data values are added or updated in other facilities date_less_incident_date=This date is less then the incident date deleted=Deleted person_aggregation=Person Aggregation @@ -107,7 +107,7 @@ view_patient_chart=View patient chart generate_patient_chart=Generate patient chart patient_chart_management=Patient chart management -intro_find_and_add_person=Register, edit and search private information of persons. Support person dashboard for managing relationships, program enrollment, entering case entry form, ... +intro_find_and_add_person=Register, edit and search information about persons. View person dashboard and manage relationships and programs. registration=Registration select_relationship=Select relationship please_select_a_representative=Please select a representative @@ -145,7 +145,7 @@ no_duplicate_found=No duplicate person found patient_system_id=System generated ID identifier_duplicate=Person identifier duplicate -has_guardian=Has guardian/caretaker +has_guardian=Has guardian/care-taker add_new_person=Add new person search_existing_person=Search existing person search_by=Search by @@ -462,7 +462,7 @@ stage_skipped = Stage is skipped location = Location some_data_element_not_exist = Some data elements not exist -guardian=Guardian/caretaker +guardian=Guardian/care-taker of = of failed_to_get_events = Failed to get events. Please generate resource tables before from Maintenance > Data Administration > Resource Table. single_event_with_registration_management = Single event with registration management @@ -551,7 +551,7 @@ please_select_one_position_for_row = Please select one position for row please_select_one_position_for_filter = Please select one position for filtering select_a_dataelement_for_sum_avg_operator = Please select a data element for sum/avg operator -runing_validation_rules = Validation rules are being processed, please wait ... +runing_validation_rules = Validation rules are being processed, please wait program_enrollment = Program enrollment sum_avg_of = Sum/Avg of filter = Filter @@ -601,7 +601,7 @@ confirm_data_values_aggregated_saved_into_database_directly = Are you sure you want to save data values aggregated into database directly ? aggregate_successfully = Aggregate successfully complete_quit = Complete/Quit -re_enrol = Re-enrol +re_enrol = Re-enroll overwrite = Overwrite remove_confirm_message=Are you sure you want to delete program enrollment? weeks = Weeks === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-22 13:47:40 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm 2013-03-25 08:55:41 +0000 @@ -80,7 +80,6 @@ javascript/entry.js images/ajax-loader-circle.gif images/close.gif -images/comments.png images/data_entry.png images/flag-blue.png images/open.gif === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2013-01-29 15:19:42 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2013-03-25 08:55:41 +0000 @@ -9,6 +9,7 @@ #if( $auth.hasAccess( "dhis-web-caseentry", "activityPlanSelect" ) ) #introListImgItem( "activityPlanSelect.action" "activity_planning" "visitplan" ) #end + #if( $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) ) #introListImgItem( "smsReminderSelect.action" "program_tracking" "summaryreport" ) #end @@ -16,9 +17,11 @@ #if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) ) #introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "attribute" ) #end + #if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) ) #introListImgItem( "singleEventSelect.action" "single_event_with_registration" "attribute" ) #end + #if( $auth.hasAccess( "dhis-web-caseentry", "anonymousRegistration" ) ) #introListImgItem( "anonymousRegistration.action" "anonymous_events" "attribute" ) #end === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-03-13 02:30:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-03-25 08:55:41 +0000 @@ -328,7 +328,7 @@ block_entry_form_after_completed = Block entry form after completed select_operator_number_of_visits_for_this_condition = Please select operator number of visit for this condition add_patient_registration_form = Add person registration form -intro_patient_registration_form = Define custom person registration form +intro_patient_registration_form = Create custom person registration forms with person attributes and identifiers. patient_registration_form_management = Person registration form management properties = Properties full_name = Full name @@ -351,7 +351,7 @@ avg_dataelement_value = Average of data element values min_dataelement_value = Minimum of data element values max_dataelement_value = Maximum of data element values -assign_program_to_userroles = Assign program to userroles +assign_program_to_userroles = Assign program to user roles property_is_inserted = The property is inserted in form please_insert_all_required_fields = Please insert all required fields required_fields_valivation = Required fields validation @@ -362,8 +362,8 @@ only_enroll_once = Only enroll once insert_a_due_date = Please insert a due-date capture_coordinates = Capture coordinates -task_stragely = Task stragely +task_stragely = Task strategy last_month = Last month -last_3_month = Last 3 month -last_6_month = Last 6 month -last_12_month = Last 12 month \ No newline at end of file +last_3_month = Last 3 months +last_6_month = Last 6 months +last_12_month = Last 12 months \ No newline at end of file