=== 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-06-02 18:23:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-06-10 08:33:22 +0000
@@ -254,7 +254,7 @@
 attributes = Attributes
 displayed_in_list = Display in list
 report_date_description = Description of report date
-template_reminder_message = Template reminder message
+reminder_message_template = Reminder message templates
 message = Message
 params = Parameters
 program_name = Program name
@@ -463,16 +463,16 @@
 tracker_associate = Tracker associate
 view_validation_criteria = View validation criteria
 define_registration_form= Define registration form
-template_reminder_message_details = Template reminder message details
-edit_template_reminder_message = Edit template reminder message
-create_new_template_reminder_message = Create new template reminder message
-confirm_delete_template_reminder_message=Are you sure you want to delete template reminder message?
+reminder_message_template_details = Reminder message template details
+edit_reminder_message_template = Edit reminder message template
+create_new_reminder_message_template = Create new reminder message template
+confirm_delete_reminder_message_template=Are you sure you want to delete reminder message template?
 days_before = day(s) before
 days_after = day(s) after
 data_entry_method_for_option_sets=Data entry method for option sets
 users = Users
 attribute_users = Attribute users
-view_template_reminder_messages = View template reminder messages
+view_reminder_message_templates = View reminder message templatess
 display_in_list_no_program = Display in list without program
 manage_attributes_with_no_program = Manage attributes with no program
 manage_attributes_for_visit_schedule = Manage attributes for visit schedule
@@ -545,7 +545,7 @@
 please_enter_alert_message_when_hiding_a_field_that_contains_value = Please enter alert message when hiding a field that contains value
 please_enter_alert_message_when_hiding_a_section_that_contains_values = Please enter alert message when hiding a section that contains values
 hide_section = Hide section
-template_reminder_message_management=Template reminder message management
+reminder_message_template_management=Reminder message template management
 expression_description=Expression description
 expression_items=Expression items
 filter_items=Filter items

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_id.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_id.properties	2013-07-02 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_id.properties	2015-06-10 08:33:22 +0000
@@ -262,7 +262,7 @@
 displayed_in_list=Displayed in list
 report_date_description=Description of report date
 days_before_after_due_date=Days before/after due date
-template_reminder_message=Template reminder message
+reminder_message_template=Reminder message template
 message=Message
 params=Parameters
 patient_name=Person name

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties	2015-06-02 10:47:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties	2015-06-10 08:33:22 +0000
@@ -303,7 +303,7 @@
 add_all=Add all
 attributes=Attributes
 report_date_description=Description of report date
-template_reminder_message=Template reminder message
+reminder_message_template=Reminder message template
 program_stage_name=Program stage name
 orgunit_name=Organisation unit name
 days_since_due_date=Days since due date
@@ -399,8 +399,8 @@
 show_advanced_options=Show advanced options
 tracker_associate=Tracker associate
 view_validation_criteria=View validation criteria
-template_reminder_message_details=Template reminder message details
-confirm_delete_template_reminder_message=Are you sure you want to delete template reminder message?
+reminder_message_template_details=Reminder message template details
+confirm_delete_reminder_message_template=Are you sure you want to delete Reminder message template?
 data_entry_method_for_option_sets=Data entry method for option sets
 users=Users
 attribute_users=Attribute users
@@ -483,10 +483,10 @@
 default_value=Default value
 dashboard_shortcut_to_add_relative=Shortcut link to add a relative
 scheduling_of_events=Scheduling of events
-edit_template_reminder_message=Edit template reminder message
-create_new_template_reminder_message=Create new template reminder message
+edit_reminder_message_template=Edit Reminder message template
+create_new_reminder_message_template=Create new Reminder message template
 days_after=day(s) after
-view_template_reminder_messages=View template reminder messages
+view_reminder_message_templates=View template reminder messages
 tracked_entity_management=Tracked entity management
 option_set=Option set
 whole_system=Whole system
\ 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/addProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm	2014-10-14 14:04:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm	2015-06-10 08:33:22 +0000
@@ -19,7 +19,7 @@
 
 </script>
 
-<h3>$i18n.getString( "create_new_template_reminder_message" ) #openHelp( "program_template_reminder" )</h3>
+<h3>$i18n.getString( "create_new_reminder_message_template" ) #openHelp( "program_template_reminder" )</h3>
 <h5>$program.displayName</h5>
 
 <form id="addReminderForm" name="addReminderForm" action="addProgramReminder.action" method="post" onsubmit="selectAllById('selectedPropertyIds');" class="inputForm">
@@ -28,7 +28,7 @@
   <table>
     <thead>
       <tr>
-        <th colspan="2" style="width: 590px;">$i18n.getString( "template_reminder_message_details" )</th>
+        <th colspan="2" style="width: 590px;">$i18n.getString( "reminder_message_template_details" )</th>
       </tr>
     </thead>
     <tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm	2014-10-14 14:04:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm	2015-06-10 08:33:22 +0000
@@ -19,7 +19,7 @@
 
 </script>
 
-<h3>$i18n.getString( "create_new_template_reminder_message" ) #openHelp( "program_stage_template_reminder" )</h3>
+<h3>$i18n.getString( "create_new_reminder_message_template" ) #openHelp( "program_stage_template_reminder" )</h3>
 <h5>$programStage.displayName</h5>
 
 <form id="addReminderForm" name="addReminderForm" action="addProgramStageReminder.action" method="post" onsubmit="selectAllById('selectedPropertyIds');" class="inputForm">
@@ -28,7 +28,7 @@
   <table>
     <thead>
       <tr>
-        <th colspan="2" style="width: 590px;">$i18n.getString( "template_reminder_message_details" )</th>
+        <th colspan="2" style="width: 590px;">$i18n.getString( "reminder_message_template_details" )</th>
       </tr>
     </thead>
     <tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2015-06-02 10:47:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2015-06-10 08:33:22 +0000
@@ -8,7 +8,7 @@
     <li data-enabled="canUpdate"><a data-target-fn="showProgramUserRoleForm"><i class="fa fa-plus"></i>&nbsp;&nbsp;$i18n.getString( "assign_program_to_userroles" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="showUpdateProgramForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="programStageManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_stages" )</a></li>
-    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_messages" )</a></li> 
+    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_reminder_message_templates" )</a></li> 
 	<li data-enabled="canManageProgramRule"><a data-target-fn="programRule"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_rule" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="validationCriteria"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_criteria" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="programValidationManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_rules" )</a></li>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2015-06-02 10:47:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2015-06-10 08:33:22 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "template_reminder_message_management" ) #openHelp( "program_templete_reminder" )</h3>
+<h3>$i18n.getString( "reminder_message_template_management" ) #openHelp( "program_templete_reminder" )</h3>
 <h5>$encoder.htmlEncode($program.displayName)</h5>
 
 <div id="contextMenu" class="contextMenu">
@@ -63,7 +63,7 @@
 </table>
 
 <script type="text/javascript">
-	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_template_reminder_message" ) , "'" )';
+	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_reminder_message_template" ) , "'" )';
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';	
     var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
     var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2015-06-03 17:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2015-06-10 08:33:22 +0000
@@ -4,7 +4,7 @@
 
 <div id="contextMenu" class="contextMenu" style="width: 230px;">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programStageReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_messages" )</a></li>
+    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programStageReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_reminder_message_templates" )</a></li>
     <li><a data-target-fn="showUpdateProgramStageForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
     <li><a data-target-fn="programStageSectionList"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "section_management" )</a></li>
     <li><a data-target-fn="viewDataEntryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "design_data_entry_form" )</a></li>
@@ -90,6 +90,6 @@
 	var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ), "'")';
 	var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ), "'")';
 	var i18n_save_success = '$encoder.jsEscape( $i18n.getString( "save_success" ), "'")';
-	var i18n_template_reminder_message = '$encoder.jsEscape( $i18n.getString( "template_reminder_message" ), "'")';
+	var i18n_reminder_message_template = '$encoder.jsEscape( $i18n.getString( "reminder_message_template" ), "'")';
 	var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ), "'")';
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2014-11-03 13:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2015-06-10 08:33:22 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "template_reminder_message" )</h3>
+<h3>$i18n.getString( "reminder_message_template" )</h3>
 <h5>$encoder.htmlEncode($programStage.displayName)</h5>
 
 <div id="contextMenu" class="contextMenu">
@@ -62,7 +62,7 @@
 </table>
 
 <script type="text/javascript">
-	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_template_reminder_message" ) , "'" )';
+	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_reminder_message_template" ) , "'" )';
 	var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';	
     var i18n_yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'")';
     var i18n_no = '$encoder.jsEscape( $i18n.getString( "no" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm	2014-11-03 13:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm	2015-06-10 08:33:22 +0000
@@ -50,7 +50,7 @@
 
 </script>
 
-<h3>$i18n.getString( "edit_template_reminder_message" ) #openHelp( "program_template_reminder" )</h3>
+<h3>$i18n.getString( "edit_reminder_message_template" ) #openHelp( "program_template_reminder" )</h3>
 <h5>$encoder.htmlEncode($program.displayName)</h5>
 
 <form id="updateReminderForm" name="updateReminderForm" action="updateProgramReminder.action" method="get" onsubmit="selectAllById('selectedPropertyIds');" class="inputForm">
@@ -60,7 +60,7 @@
   <table>
     <thead>
       <tr>
-        <th colspan="2" style="width: 590px;">$i18n.getString( "template_reminder_message_details" )</th>
+        <th colspan="2" style="width: 590px;">$i18n.getString( "reminder_message_template_details" )</th>
       </tr>
     </thead>
     <tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm	2014-11-03 13:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm	2015-06-10 08:33:22 +0000
@@ -22,7 +22,7 @@
 
 </script>
 
-<h3>$i18n.getString( "edit_template_reminder_message" ) #openHelp( "program_stage_template_reminder" )</h3>
+<h3>$i18n.getString( "edit_reminder_message_template" ) #openHelp( "program_stage_template_reminder" )</h3>
 <h5>$encoder.htmlEncode($programStage.displayName)</h5>
 
 <form id="updateReminderForm" name="updateReminderForm" action="updateProgramStageReminder.action" method="get" onsubmit="selectAllById('selectedPropertyIds');" class="inputForm">
@@ -32,7 +32,7 @@
   <table>
     <thead>
       <tr>
-        <th colspan="2" style="width: 590px;">$i18n.getString( "template_reminder_message_details" )</th>
+        <th colspan="2" style="width: 590px;">$i18n.getString( "reminder_message_template_details" )</th>
       </tr>
     </thead>
     <tbody>