dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20970
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-11-06 12:51:47 +0100
message:
  Label, using 'incident' consistently
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties


--
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-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	2015-10-20 08:18:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-11-06 11:51:47 +0000
@@ -232,7 +232,7 @@
 insert = Insert 
 visit_selected_program_stage = Visited selected program stage
 intro_tracked_entity_aggregation_query_builder = Define formulas, expressions, rules for aggregation data from name-based to aggregation system
-show_incident_date = Show incidence date
+show_incident_date = Show incident date
 display_date_of_incident = Display date of incident
 tracked_entity_attribute_group_sort_order = Tracked entity attribute group sort order
 visit_selected_program_stage_x_th_time = Visit selected program stage n(th) time
@@ -397,13 +397,12 @@
 selected_dynamic_attributes = Selected dynamic attributes
 registrationDate = Registration date
 create_default_registration_form = Create default registration form
-use_birth_date_as_incident_date = Set incidence date to date of birth
 use_birth_date_as_enrollment_date = Set enrollment date to date of birth
 default_form_name = Default form name
 custom_form_name = Custom form name
 allow_select_enrollment_dates_in_future = Allow selecting enrollment dates in future
 allow_select_enrollment_date_in_future = Allow future enrollment dates
-allow_select_incident_date_in_future = Allow future incidence dates
+allow_select_incident_date_in_future = Allow future incident dates
 relationship_text = Relationship text
 relationship_details = Relationship details
 program_related = Program related