dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15124
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-04-30 14:24:39 +0200
message:
  Program stage, clarification of labels
modified:
  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/webapp/dhis-web-maintenance-program/addProgramStageForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.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-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-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-04-30 12:24:39 +0000
@@ -158,7 +158,7 @@
 program_attribute_details=Program attribute details
 select_program=Select program
 create_new_program_validation_rule=Create new program validation rule
-add_multi_program_validation_rule=Add multi program validation rule
+add_multi_program_validation_rule=Add multi-program validation rule
 program_validation_rule_details=Program validation rule details
 program_validation_rule_management=Program validation rule management
 tracked_entity_attribute_group_sort_order=Tracked entity attribute group sort order
@@ -213,10 +213,10 @@
 available_values=Available values
 insert_selected_values=Insert selected values
 display_provided_other_facility_column=Display provided other facility column
-tracked_entity_org_unit_registration=Tracked entity Org Unit Registration
+tracked_entity_org_unit_registration=Tracked entity org unit registration
 dataset=Data set
 filter_by_data_set=Filter by data set
-show_all_item=Show All Items
+show_all_item=Show all items
 multiple_events_with_registration=Multiple events with registration
 single_event_with_registration=Single event with registration
 single_event_without_registration=Single event without registration
@@ -360,11 +360,11 @@
 save_and_close = Save and close
 delete_this_form = Delete this form
 auto_save_tracked_entity_forms = Auto save tracked entity forms
-enter_a_name = Please enter a name between 4 and 150 characters long.
+enter_a_name = Please enter a name between 4 and 150 characters long
 save_unsuccess = Save unsuccessfully
 validate_form = Validate form
 validate_success = The registration form passed validation successfully
-remind_completing_program_after_program_stage_completed = Remind completing program after a program stage completed
+ask_user_to_complete_program_when_stage_complete = Ask user to complete program when stage is complete
 days_since_enrollment_date = Days since enrollment date
 days_before_after_comparison_date = Days before/after comparison date
 incident_date = Incident date
@@ -415,12 +415,12 @@
 selected_dynamic_attributes = Selected dynamic attributes
 registrationDate = Registration date
 create_default_registration_form = Create default registration form
-minus_with_dataelement = Data Element Date Diff
+minus_with_dataelement = Data element date diff
 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 seleting enrollment dates in future
+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
 relationship_text = Relationship text
@@ -442,14 +442,14 @@
 message_type = Message type
 both = Both
 direct_sms = Direct SMS
-remind_creating_next_event_on_this_event_completed = Remind creating next event on this event completed
+ask_user_to_create_new_event_when_stage_complete=Ask user to create new event when stage is complete
 data_entry_method = Data entry method
-local_identifier = Local Identifier
+local_identifier = Local identifier
 scope = Scope
 drop_down_lists = Drop-down lists
 radio_buttons = Radio buttons
 open_data_entry_form_after_enrolment  = Open data entry form after enrollment
-report_date_to_use  = Report Date to use
+report_date_to_use  = Report date to use
 the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrollment is active in the stage
 add_relative = Add relative
 who_is_the_new_relative_to_the_existing_tracked_entity_instance = Who is the new relative to the existing tracked entity instance?
@@ -494,4 +494,4 @@
 in = in
 whole_system = Whole system
 orgunit = Organisation unit
-program_within_orgunit = Program within Organisation unit
\ No newline at end of file
+program_within_orgunit = Program within organisation unit
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm	2014-04-30 11:41:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm	2014-04-30 12:24:39 +0000
@@ -106,13 +106,13 @@
 	</tr>
 	
 	<tr>
-		<td><label for="remindCompleted">$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+		<td><label for="remindCompleted">$i18n.getString( "ask_user_to_complete_program_when_stage_complete" )</label></td>
 		<td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' ></td>
 		<td></td>
 	</tr>
 	
 	<tr>
-		<td><label for="allowGenerateNextVisit">$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+		<td><label for="allowGenerateNextVisit">$i18n.getString( "ask_user_to_create_new_event_when_stage_complete" )</label></td>
 		<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' ></td>
 		<td></td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2014-04-26 12:14:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm	2014-04-30 12:24:39 +0000
@@ -114,13 +114,13 @@
 			</tr>
 			
 			<tr>
-				<td><label for="remindCompleted">$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+				<td><label for="remindCompleted">$i18n.getString( "ask_user_to_complete_program_when_stage_complete" )</label></td>
 				<td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' #if( $programStage.remindCompleted=='true' ) checked #end ></td>
 				<td></td>
 			</tr>
 			
 			<tr>
-				<td><label for="allowGenerateNextVisit">$i18n.getString( "remind_creating_next_event_on_this_event_completed" )</label></td>
+				<td><label for="allowGenerateNextVisit">$i18n.getString( "ask_user_to_create_new_event_when_stage_complete" )</label></td>
 				<td><input type="checkbox" id="allowGenerateNextVisit" name="allowGenerateNextVisit" value='true' #if( $programStage.allowGenerateNextVisit=='true' ) checked #end ></td>
 				<td></td>
 			</tr>