=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-10-15 13:22:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-10-15 13:29:41 +0000
@@ -1,14 +1,14 @@
 home=Home
-dhis2=DHIS2
-dhis2_home=DHIS2 Home
+dhis2=DHIS 2
+dhis2_home=DHIS 2 Home
 event_capture=Event capture
 registering_unit=Registering unit
 registered_events=Registered events
 new_event_registration=New event registration
 event_details=Event details
-no_registered_event=There are no registered events.
+no_registered_event=There are no registered events
 event_registration_error=Error in event registration
-validation_error=Validation Error
+validation_error=Validation error
 error=Error
 help=Help
 click_for_action=Click for more actions
@@ -35,9 +35,9 @@
 int_required=Value must be a number
 string_required=Value must be a text
 date_required=Value must be date
-bool_required=Value must be true/false.
+bool_required=Value must be true or false
 option_required=Option is required. Please select one.
-ok=Ok
+ok=OK
 find=Find
 done=Done
 remove=Remove
@@ -61,22 +61,22 @@
 comment=Comment
 recorded_comments=Recorded comments
 show_comments=Show comments
-new_event=New Event
+new_event=New event
 data_element=Data element
 value=Value
 form_id=Form id
 register_event=Register event
 total=Total
-total_number_of_pages=No. of pages
-rows_per_page=No. of rows per page
+total_number_of_pages=No of pages
+rows_per_page=No of rows per page
 jump_to_page=Jump to page
 page=Page 
 first=First
 previous=Previous
 next=Next
 last=Last
-org_units=Organisation Units
-org_unit=Organisation Unit
+org_units=Organisation units
+org_unit=Organisation unit
 programs=Programs
 program=Program
 program_stage=Program stage
@@ -119,8 +119,8 @@
 account=Account
 log_out=Log out
 about_dhis2=About DHIS 2 
-update_event=Update Event
-missing_translation_file=Missing Translation File
+update_event=Update event
+missing_translation_file=Missing translation file
 missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
 value_must_be=Value must be
 number=Number
@@ -129,22 +129,22 @@
 value_must_be_negInt=Value must be negative integer
 value_must_be_zeroPositiveInt=Value must be zero or positive integer
 value_must_be_int=Value must be integer 
-posInt=Positive Integer
-negInt=Negative Integer
-zeroPositiveInt=Zero or Positive Integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
 latitude_required=Value must be between [-90 ... 90]
 longitude_required=Value must be between [-180 ... 180]
 loading_tree=Loading organisation unit tree
 loading_metadata=Loading meta-data
 future_date_not_allowed=Future date is not allowed
-validation_warnings=Validation Warnings
+validation_warnings=Validation warnings
 unsaved_data_exists_proceed=Unsaved data exists. Do you want to proceed?
 proceed=Proceed
-lacking_required_authority_to_add_update_event=Lacking required authority to add/update event.
+lacking_required_authority_to_add_update_event=Lacking required authority to add or update event
 select_or_search=Select or search from the list
 indicators=Indicators
 hide_menu=Hide menu
 extend_menu=Extend menu
 show_main_menu=Show main menu
 close_editing=Close editing
-fill_all_category_options=Please fill all category options.
\ No newline at end of file
+fill_all_category_options=Please fill all category options
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-10-15 13:22:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-10-15 13:29:41 +0000
@@ -4,26 +4,26 @@
 tracked_entity_management=Tracked entity management
 registering_unit=Registering unit
 program=Program
-tracked_entity=Tracked Entity
-tracked_entity_attribute=Tracked Entity Attribute
+tracked_entity=Tracked entity
+tracked_entity_attribute=Tracked entity attribute
 select_or_search=Select or search from the list
 please_select=[Please select]
 please_select_a_program=[Please select a program]
 no_program_exists=[No program exists]
-please_select_a_program_for_enrollment=Please select a program for enrollment.
-please_select_program_report=Please select a program for reporting.
+please_select_a_program_for_enrollment=Please select a program for enrollment
+please_select_program_report=Please select a program for reporting
 please_select_a_relationship=Please select a relationship
-no_relationship=No relationship exists.
-relationship_not_possible=No tracked entity instance, relationship not possible.
+no_relationship=No relationship exists
+relationship_not_possible=No tracked entity instance, relationship not possible
 no_program_exists_enrollment=No program exists for the selected org unit. Enrollment not possible.
 no_program_exists_report=No program exists for the selected org unit. Reporting not possible.
 not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
 not_yet_enrolled_enrollment=Not yet enrolled. Please enroll.
 no_active_enrollment_exists=No active enrollment exists for the selected program
 not_yet_enrolled_note=Not yet enrolled. Note recording not possible.
-not_yet_enrolled_report=Not yet enrolled. Reporting not possible
+not_yet_enrolled_report=Not yet enrolled. Reporting not possible.
 no_data_report=No record exists for reporting
-empty_notes=Empty notes list.
+empty_notes=Empty notes list
 event=Event
 no_event_is_yet_created=No event is available for data entry. Please create one.
 event_creation=Please create one from below
@@ -34,7 +34,7 @@
 list_all=List all
 list=List
 invalid=Invalid
-selected_tei_is_invalid=Selected tracked entity instance is invalid.
+selected_tei_is_invalid=Selected tracked entity instance is invalid
 required=Required
 number_required=Number required
 date_required=Date required
@@ -62,11 +62,11 @@
 registered_entities=Registered entities
 empty_entity_list=There are no registered entities
 empty=Empty
-form_is_empty_fill_at_least_one=Form is empty, please fill at least one.
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
 empty_event_list=Empty event list
 total=Total
-total_number_of_pages=No. of pages
-rows_per_page=No. of rows per page
+total_number_of_pages=No of pages
+rows_per_page=No of rows per page
 jump_to_page=Jump to page
 page=Page 
 first=First
@@ -98,7 +98,7 @@
 complete=Complete
 incomplete=Incomplete
 validate=Validate
-validation_result=Validation Result
+validation_result=Validation result
 status=Status
 details=Details
 _details=details
@@ -141,7 +141,7 @@
 name=Name
 dataentry=Data Entry
 indicators=Indicators
-empty_inidcator_list=No indicator to show
+empty_inidcator_list=No indicators to show
 feedback=Feedback
 empty_feedback_list=No feedback to show
 custom_form=Custom form
@@ -189,7 +189,7 @@
 visits=Visits
 current_selections=Current selections
 activePrograms=Active programs
-no_active_program=No active program to show
+no_active_program=No active programs to show
 no_active_program_than_selected=No active program other than selected
 org_unit=Organisation unit
 org_unit_scope=Organisation unit scope
@@ -227,7 +227,7 @@
 reschedule_duedate=Reschedule due date
 reschedule=Reschedule
 rescheduling=Rescheduling
-scheduling_messaging=Scheduling and Messaging
+scheduling_messaging=Scheduling and messaging
 not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
 schedule_details=Schedule details
 no_event_to_schedule=No event to schedule
@@ -279,7 +279,7 @@
 registration_complete=Registration is completed
 validation_error=Validation Error
 validation_warnings=Validation Warnings
-dashboard_layout_saved=Dashboard layout saved as default.
+dashboard_layout_saved=Dashboard layout saved as default
 event_orgunit_name=Organisation unit
 category=Category
 entity_type=Entity type
@@ -304,7 +304,7 @@
 do_you_want_to_proceed=Do you want to proceed with invalid criteria?
 are_you_sure_to_proceed=Are you sure to proceed?
 more=More
-under_construction=Under construction.    
+under_construction=Under construction
 advanced_search=Advanced search
 profile=Profile
 applications=Apps