=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2015-04-07 10:51:20 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2015-05-18 21:05:25 +0000 @@ -142,12 +142,12 @@ data_element_does_not_exist=Identifier does not reference a data element category_option_combo_does_not_exist=Identifier does not reference a category option combo expression_not_well_formed=Expression is not well formed -intro_data_element=Create, modify, view and delete data elements. Data elements are phenomena for which will be captured and analysed. +intro_data_element=Create, modify, view and delete data elements. Data elements are phenomena for which will be captured and analyzed. intro_data_element_group=Create, modify, view and delete data element groups. Groups are used for improved analysis. intro_data_element_group_editor=Easily add or remove data elements to and from data element groups, as well as deleted data elements. intro_data_element_group_set=Create, modify, view and delete data element group sets. Group sets are used for improved analysis. -intro_category_option=Create, modify, view and delete data element category options. Category Option are fine-grained break-downs of catagory. -intro_category=Create, modify, view and delete data element categories. Categories are fine-grained break-downs of data elements. +intro_category_option=Create, modify, view and delete data element category options. Category options are options with in category. +intro_category=Create, modify, view and delete data element categories. Categories are used for disaggregation of data elements. intro_category_combo=Create, modify, view and delete data element category combinations. intro_category_option_group=Create, modify, view and delete category option groups, which can be used to classify category options. intro_category_option_group_set=Create, modify, view and delete category option group sets, which can be used for improved data analysis. @@ -233,8 +233,8 @@ id=Id min=Min max=Max -category_option_combo = Category Option Combo -intro_category_option_combo = View and edit data element category option combos. Category Option Combo are fine-grained break-downs of catagory. +category_option_combo = Category Option Combination +intro_category_option_combo = View and edit data element category option combinations. Category option combinations are break-downs of category. edit_data_element_category_option_combo = Edit data element category option combo average_sum_in_org_unit_hierarchy=Average (sum in org unit hierarchy) approve_data=Approve data