=== modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-02-10 10:37:03 +0000 +++ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties 2014-02-16 13:04:00 +0000 @@ -43,7 +43,7 @@ dhis-web-maintenance-user=Users dhis-web-maintenance-dataadmin=Data Administration dhis-web-maintenance-settings=Settings -dhis-web-maintenance-program=Tracked Entities and Programs +dhis-web-maintenance-program=Programs and Attributes dhis-web-maintenance-mobile=Mobile Configuration dhis-web-maintenance-appmanager=App Management dhis-web-caseentry=Individual Records === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-02-13 09:51:36 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties 2014-02-16 13:04:00 +0000 @@ -95,9 +95,12 @@ related=Related validation_criteria=Validation Criteria edit_validation_criteria=Edit validation criteria +attribute_group=Attribute Group +attribute_visit_schedule=Attribute Visit Schedule create_validation_criteria=Create validation criteria intro_attribute=Create, modify and view tracked entity attributes. An attribute can be used to register extra information for a tracked entity. intro_attribute_group=Create, modify and view tracked entity attribute groups. Groups makes it more convenient to add attributes to a tracked entity. +intro_attribute_visit_schedule=Define which attributes to use in messages sent to clients regarding scheduled visits. 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_aggregation_query_builder=Set up aggregation rules for the process of aggregating tracked entity data to statistical data. @@ -311,7 +314,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_tracked_entity_registration_form = Add tracked entity form -intro_tracked_entity_form = Create custom tracked entity forms with tracked entity attributes. +intro_tracked_entity_form = Create custom tracked entity data capture forms with tracked entity attributes. tracked_entity_registration_form_management = Tracked entity form management properties = Properties full_name = Full name === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm 2014-02-10 10:37:03 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm 2014-02-16 13:04:00 +0000 @@ -3,7 +3,7 @@