=== 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-08-01 14:15:58 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-08-01 14:29:58 +0000 @@ -37,42 +37,42 @@ registration_date=Date of registration full_name=Full name entry=Entry -available_data_elements=Available Data Element -selected_data_elements=Selected Data Element +available_data_elements=Available data elements +selected_data_elements=Selected data elements nr=Number program_stage=Program stage specify_a_search_criteria=Please specify your search criteria search=Search -patient_identifier=Person Identifier +patient_identifier=Person identifier identifier=Identifier demographics=Demographics age=Age gender=Gender male=Male female=Female -date_of_birth=Date of Birth -search_by_name_identifier=Search by Name or Identifier +date_of_birth=Date of birth +search_by_name_identifier=Search by name or identifier operation=Operation search_result_matching_the_search_criteria=Result matches the search criteria -registering_unit=Registering Unit +registering_unit=Registering unit select=Select program_summary_report=Program Summary Report visit_plan=Visit Plans 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 event is completed ? +error_required_field=Please enter value for all data element in red color +complete_confirm_message=Are you sure this event is completed? complete=Complete case_aggregation_form=Person aggregation form -dataset_list=Dataset List +dataset_list=Data set list multiple_individual_records=Multiple individual records intro_case_aggregation=Generate routine data values from patient data by month (or other intervals if desired) and organisation unit. from=From to=To value_must_number=Value must be an number -value_must_positive_integer=Value must be an positive integer -value_must_negative_integer=Value must be an negative integer +value_must_positive_integer=Value must be a positive integer +value_must_negative_integer=Value must be a negative integer days=days please_select=Please select children_only=Children Only @@ -83,27 +83,26 @@ value=Value status=Status no_value_added_or_update=No values added or updated -date_less_incident_date=This date is less then the incident date. +date_less_incident_date=This date is less then the incident date deleted=Deleted -old_value=Old Value 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 +please_select_to_date_greater_or_equals_to_from_date=Please select to-date later or equal to from-date +violate_validation=Violating validation common_info=Common information dob_type=DOB type intro_multiple_individual_records=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 +data_value=data value successful_validation=The data entry screen successfully passed validation unsuccessful_validation=The data entry screen has validation errors, please correct these before proceeding -the_following_dataelements_are_in_multi_stages=The following dataelements are in multi-program stages +the_following_dataelements_are_in_multi_stages=The following data elements are in multi-program stages validation_result=Validation result should=should run_validation=Run validation please_select_village=Please select village -select_sorting_attribute=Select a specfied attribute / ALL +select_sorting_attribute=Select a specified attribute / all no_result_found=No result found hierachy_orgunit=Hierarchy organisation unit F=F @@ -111,10 +110,10 @@ 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 persons. Any type of data can be registered for a person by including attributes. +intro_patient=Create, modify and search for persons. Any type of data can be registered for a person through attributes. registration=Registration -select_relationship=Select Relationship -please_select_a_representative=Please select a representing relationship +select_relationship=Select relationship +please_select_a_representative=Please select a representative representative=Representative confirm_delete_relationship=Are you sure you want to delete relationship? the_relationship_already_exists=The relationship already exists - choose a different relationship or partner @@ -126,7 +125,7 @@ manage_relationship=Relationship management relationship_already_exists=Relationship already exists nr=No -unenroll=Unenroll +unenroll=Un-enroll enroll=Enroll date_of_incident=Date of incident date_of_enrollment=Date of enrollment @@ -145,7 +144,7 @@ check_duplicate=Check duplicate 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. +duplicate_warning=We found some persons who have the same information. You can choose to continue creating this person or choose one of existing persons. create_new_patient=Continue register this person no_duplicate_found=No duplicate person found patient_system_id=System generated ID @@ -165,7 +164,7 @@ total_result=Total number of results add_new_relationship_for=Add new relationship for sort_by=Sort by -transgender=Transgender +transgender=Trans-gender verified=Verified declared=Declared approximated=Approximated @@ -173,7 +172,7 @@ month=Month year=Year please_verify_birthday=Please verify the birthday -have_to_be_greater_or_equals_to=have to be greater and equals to +have_to_be_greater_or_equals_to=have to be greater or equals to no_patients_found=No patients found please_enter_a_valid_full_name=Please enter a valid full name program_unenrollment=Program un-enrollment @@ -187,20 +186,20 @@ program_unenrollment_management=Program un-enrollment management enrol_success=Person enrolled successfully duplicated_patient_list=Duplicated patient list -specfiy_birth_date_or_age=Specfiy birth date or age +specfiy_birth_date_or_age=Specify birth date or age 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? +confirm_delete_patient=Are you sure you want to delete this person? please_enter_a_valid_birth_date=Please enter a valid date of birth relationship_management=Relationship management -save_success=Save successfully +save_success=Saved successfully yes_and_attribute=Yes and inherit attribute identifiers=Identifiers relationship_type=Relationship type identifier_type=Person identifier type choose_this_person=Choose this person -format_date=Format Date +format_date=Format date specify_search_criteria=Please specify search criteria patient_profile=Person profile other_details=Other details @@ -215,10 +214,10 @@ relationship_for=Relationship for date_of_edit=Date of edit anonymous_events=Single event without registration -intro_anonymous_events=Register Single events without registration. The data to register is defined by a single event without registration program. +intro_anonymous_events=Register single events without registration. The data to register is defined by a single event without registration program. create_new_event=Create new event -delete_current_event=Delete current event -delete_event_success=Delete event successfully +delete_current_event=Deleted current event +delete_event_success=Deleted event successfully please_enter_report_date=Please enter report date comfirm_delete_event=Are you sure you want to delete the event? registered_by_orgunit=Registered by facility @@ -246,7 +245,7 @@ saved = Saved save_selected_values = Save selected values save_all_values = Save all values -intro_tabular_report= Use an interactive reporting tool for tracker-data using tabular presentation with dynamic filters for each person attribute/data element. +intro_tabular_report= Interactive reporting tool for person data with dynamic filters for each person attribute and data element. tabular_report = Tabular report true = Yes false = No @@ -271,22 +270,21 @@ 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 person must be less or equals to 100 +age_of_patient_must_be_less_or_equals_to_100 = Age of person must be less or equal to 100 years data_element = Data element V=Verified D=Declared A=Approximated -some_data_element_not_exist = Some data element is not exist include_parent_orgunits_starting_from_level = Include parent organisation units starting from (level) level = Level -please_fill_out_only_one_of_these_fields = Please fill out at only one of these fields. -age_year = Age(year) +please_fill_out_only_one_of_these_fields = Please fill only one of these fields +age_year = Age (years) create = Create change_patient_location = Change person location enroll_for = Enroll for identifier_and_attribute = Identifier/Attribute unenrollment = Un-enrollment -modify_due_date_or_visit_date = Modify due/Visit dates +modify_due_date_or_visit_date = Modify due/visit dates data_entry_screen = Data entry screen unenrol_success = Person un-enrolled successfully enrolled_for = Enrolled for @@ -295,16 +293,16 @@ please_select_a_program_stage = Please select a program stage available_identifier_types = Available identifier types selected_identifier_types = Selected identifier types -show_hierachy_from_level = Show hierachy from level +show_hierachy_from_level = Show hierarchy from level attribute = Attribute download = Download xls = XLS show_hide_settings = Show/hide settings page = Page et_no_data = No data returned from server -et_no_dataelement = Please select at least one data element. -em_no_orgunits = Please select an organisation unit. -em_no_program_stage = Please select a program stage. +et_no_dataelement = Please select at least one data element +em_no_orgunits = Please select an organisation unit +em_no_program_stage = Please select a program stage reset = Reset no = No options = Options @@ -324,7 +322,7 @@ favorites = Favorites manage_favorites = Manage favorites update = Update -et_no_programs = Please select an program. +et_no_programs = Please select a program last_updated = Last updated rename_favorite=Rename favorite delete_object=Delete @@ -340,7 +338,7 @@ confirmation = Confirmation data_entry_form = Data entry form view = View -start_date_must_be_less_then_or_equals_to_end_date = Start date must be less then or equals to end date +start_date_must_be_less_then_or_equals_to_end_date = Start date must be less than or equal to end date is_not_valid = is not valid the_date_is_not_valid = The date is not valid before = Before @@ -349,23 +347,23 @@ clear_filter = Clear filter events = Events orgunit_groups = Groups -not_empty = The value must be not empty. -seach_available_patient = Seach available person +not_empty = The value must be not empty +seach_available_patient = Search available person set_as_representative = Set as representative set_as_representative_and_copy_attributes_for_the_person = Set as representative and copy attributes for the person -is_not_representative = Is not representative ? +is_not_representative = Is not representative? save_all = Save all -list_all_events = List All Events +list_all_events = List all events search_events_by_dataelements = Search events by data elements specify_data_element = Please specify a data element advanced_search = Advanced search no_patient_enrolled_the_program = No person enrolled the program -complete_and_add_new_event = Complete & Add new -no_compulsary_data_elements = No compulsary data elements +complete_and_add_new_event = Complete and Add new +no_compulsary_data_elements = No compulsory data elements single_event_with_registration = Single event with registration show_data_entry = Show data entry -intro_single_event_with_registration = The data to register is defined by a single event with registration program. -remove_empty_events = Remove Empty events +intro_single_event_with_registration = The data to register is defined by a single event with registration program +remove_empty_events = Remove empty events true_value = true false_value = false patients = persons @@ -374,16 +372,16 @@ deleting = Deleting color_quick_help = Color quick help color = Color -what_do_colors_mean = What do colors mean ? +what_do_colors_mean = What do colors mean? completed_stages = Stage is complete data_entered_and_uncompleted_stages = Stage is incomplete but has registered data coming_stages = Stage is scheduled in future stages_open_but_no_data_entered = Stage is overdue and incomplete value_is_invalid = Value is invalid value_is_valid = Value is valid -incomplete_confirm_message=Are you sure this event is incompleted ? +incomplete_confirm_message=Are you sure this event is incomplete? incomplete = Incomplete -remove_empty_events_success = Remove empty events successfully -confirm_remove_empty_events = Are you sure you want to remove empty events ? +remove_empty_events_success = Removed empty events successfully +confirm_remove_empty_events = Are you sure you want to remove empty events? please_select_relationship_type = Please select a relationship type please_select_a_patient_for_setting_relationship = Please select a person for setting relationship \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_es_ES.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_es_ES.properties 2012-07-26 11:43:38 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_es_ES.properties 2012-08-01 14:29:58 +0000 @@ -290,7 +290,6 @@ V=Verificado D=Declarado A=Aproximado -some_data_element_not_exist=Some data element is not exist include_parent_orgunits_starting_from_level=Include parent organisation units starting from (level) level=Level please_fill_out_only_one_of_these_fields=Please fill out at only one of these fields. === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm 2012-08-01 14:15:58 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm 2012-08-01 14:29:58 +0000 @@ -1,4 +1,4 @@ - +