dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14046
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-02-16 15:24:41 +0100
message:
  Translations of category option group set
modified:
  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/webapp/dhis-web-maintenance-datadictionary/index.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-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	2014-02-14 12:14:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2014-02-16 14:24:41 +0000
@@ -153,8 +153,11 @@
 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_data_element_category=Create, modify, view and delete data element categories. Categories are fine-grained break-downs of data elements.
-intro_data_element_category_combo=Create, modify, view and delete data element category combinations.
+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_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.
 intro_indicator=Create, modify, view and delete indicators. An indicator is a formula consisting of data elements and numbers.
 intro_indicator_type=Create, modify, view and delete indicator types. An indicator type is a factor for an indicator, like percentage.
 intro_indicator_group=Create, modify, view and delete indicator groups. Groups are used for improved analysis.
@@ -202,7 +205,6 @@
 legend_set=Legend set
 skip_total_in_reports=Skip category total in reports
 data_element_category_option = Data Element Category Option
-intro_data_element_category_option=Create, modify, view and delete data element category options. Category Option are fine-grained break-downs of catagory.
 data_element_category_option_management = Data element category option management
 create_new_data_element_category_option=Create new data element category option
 edit_data_element_category_option=Edit data element category option
@@ -217,6 +219,9 @@
 option_set_for_data_values=Option set for data values
 option_set_for_comments=Option set for comments
 organisation_unit_counts=Organisation unit counts
+category_option=Category Option
+category=Category
+category_combo=Category Combination
 category_option_group = Category Option Group
 category_option_group_management = Category option group management
 create_new_category_option_group = Create new category option group

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2014-02-13 12:51:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2014-02-16 14:24:41 +0000
@@ -5,11 +5,11 @@
 	#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
     #introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )
     #introListImgItem( "dataElementGroupSet.action" "data_element_group_set" "groupset" )
-    #introListImgItem( "categoryOption.action" "data_element_category_option" "category" )
-    #introListImgItem( "categoryOptionGroup.action" "data_element_category_option_group" "category" )
-    #introListImgItem( "categoryOptionGroupSet.action" "data_element_category_option_group_set" "category" )
-    #introListImgItem( "category.action" "data_element_category" "category" )
-    #introListImgItem( "categoryCombo.action" "data_element_category_combo" "category" )
+    #introListImgItem( "categoryOption.action" "category_option" "category" )
+    #introListImgItem( "category.action" "category" "category" )
+    #introListImgItem( "categoryCombo.action" "category_combo" "category" )
+    #introListImgItem( "categoryOptionGroup.action" "category_option_group" "category" )
+    #introListImgItem( "categoryOptionGroupSet.action" "category_option_group_set" "category" )
     #introListImgItem( "dataDictionary.action" "data_dictionary" "datadictionary" )
     #introListImgItem( "indicator.action" "indicator" "indicator" )
     #introListImgItem( "indicatorType.action" "indicator_type" "indicator" )