=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-10-16 05:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-10-16 11:04:37 +0000
@@ -68,11 +68,11 @@
                                 <event-paginator ng-if="stage.id === currentEvent.programStage"></event-paginator>                             
                             </span>
                             <div ng-if="!eventsByStage[stage.id] || eventsByStage[stage.id].length < 1">
-                                <div class="alert alert-warning">{{'empty_event_list'| translate}}</div> 
+                                <div class="alert alert-warning">{{'no_events_exist'| translate}}</div> 
                             </div>
-                        </td>                        
+                        </td>
                     </tr>
-                </tbody>                
+                </tbody>
             </table>
         </div>
 
@@ -223,6 +223,6 @@
                 </tr>
             </table>
         </div>
-        <div ng-show="currentEvent && !currentEvent.notes" class="alert alert-warning">{{'empty_notes'| translate}}</div> 
+        <div ng-show="currentEvent && !currentEvent.notes" class="alert alert-warning">{{'no_notes_exist'| translate}}</div> 
     </div>        
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2015-10-16 05:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2015-10-16 11:04:37 +0000
@@ -53,7 +53,7 @@
                     </tr>
                 </table>
             </div>
-            <div ng-show="selectedEnrollment && !selectedEnrollment.notes" class="alert alert-warning">{{'empty_notes'| translate}}</div> 
+            <div ng-show="selectedEnrollment && !selectedEnrollment.notes" class="alert alert-warning">{{'no_notes_exist'| translate}}</div> 
         </div>
         <div ng-show="showMessagingDiv">
             <div class="alert alert-warning">{{'under_construction'| translate}}</div> 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js	2015-10-08 13:59:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js	2015-10-16 11:04:37 +0000
@@ -8,8 +8,8 @@
     $scope.widget = $scope.$parent.$parent.biggerWidget ? $scope.$parent.$parent.biggerWidget
     : $scope.$parent.$parent.smallerWidget ? $scope.$parent.$parent.smallerWidget : null;
     $scope.widgetTitle = $scope.widget.title;    
-    $scope.emptyFeedbackListLabel = $translate.instant('empty_feedback_list');
-    $scope.emptyIndicatorListLabel = $translate.instant('empty_inidcator_list');
+    $scope.emptyFeedbackListLabel = $translate.instant('no_feedback_exist');
+    $scope.emptyIndicatorListLabel = $translate.instant('no_indicators_exist');
     
     $scope.widgetTitleLabel = $translate.instant($scope.widgetTitle);
     
@@ -60,4 +60,4 @@
         $scope.showKeyDataSection = keyDataInEffect;
         $scope.showTextSection = textInEffect;        
     });     
-});
\ 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 21:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-10-16 11:04:37 +0000
@@ -23,7 +23,7 @@
 not_yet_enrolled_note=Not yet enrolled. Note recording not possible.
 not_yet_enrolled_report=Not yet enrolled. Reporting not possible.
 no_data_report=No records exist for reporting
-empty_notes=Empty notes list
+no_notes_exist=No notes exist
 event=Event
 no_event_is_yet_created=No events are available for data entry. Please create one.
 event_creation=Please create one from below
@@ -60,10 +60,9 @@
 search_input_required=Please specify a search criteria
 in_progress=In progress
 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
-empty_event_list=Empty event list
+no_events_exist=No events exist
 total=Total
 total_number_of_pages=No of pages
 rows_per_page=No of rows per page
@@ -141,9 +140,9 @@
 name=Name
 dataentry=Data Entry
 indicators=Indicators
-empty_inidcator_list=No indicators to show
+no_indicators_exist=No indicators exist
 feedback=Feedback
-empty_feedback_list=No feedback to show
+no_feedback_exist=No feedback exist
 custom_form=Custom form
 default_form=Default form
 menu=Menu

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties	2015-06-23 13:17:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties	2015-10-16 11:04:37 +0000
@@ -17,7 +17,6 @@
 not_yet_enrolled_note=\u063a\u064a\u0631 \u0645\u0633\u062c\u0644 \u062d\u062a\u0649 \u0627\u0644\u0622\u0646 . \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0629 \u063a\u064a\u0631 \u0645\u0645\u0643\u0646
 not_yet_enrolled_report=\u063a\u064a\u0631 \u0645\u0633\u062c\u0644 \u062d\u062a\u0649 \u0627\u0644\u0622\u0646 . \u0627\u0644\u0627\u0639\u062f\u0627\u062f \u063a\u064a\u0631 \u0645\u0645\u0643\u0646
 no_data_report=\u0644\u0627\u064a\u0648\u062c\u062f \u062a\u0633\u062c\u064a\u0644 \u0644\u064a\u062a\u0645 \u0627\u0644\u0627\u0639\u062f\u0627\u062f
-empty_notes=\u0644\u0627\u0626\u062d\u0629 \u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0627\u0644\u0641\u0627\u0631\u063a\u0629
 no_event_is_yet_created=\u0644\u0627\u064a\u0648\u062c\u062f \u062d\u062f\u062b \u0645\u062a\u0648\u0641\u0631 \u0644\u0627\u062f\u062e\u0627\u0644 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a . \u0631\u062c\u0627\u0621\u064b \u0627\u0646\u0634\u0626 \u0648\u0627\u062d\u062f\u0627\u064b
 event_creation=\u0631\u062c\u0627\u0621\u064b \u0627\u0646\u0634\u0626 \u0648\u0627\u062d\u062f\u0627\u064b \u0645\u0646 \u0627\u0644\u0623\u0633\u0641\u0644
 not_selected=\u063a\u064a\u0631 \u0645\u062e\u062a\u0627\u0631
@@ -39,7 +38,6 @@
 search_input_required=\u0631\u062c\u0627\u0621\u064b \u062d\u062f\u062f \u0645\u0639\u0627\u064a\u064a\u0631 \u0627\u0644\u0628\u062d\u062b
 in_progress=\u0642\u064a\u062f \u0627\u0644\u0639\u0645\u0644
 registered_entities=\u0643\u064a\u0627\u0646\u0627\u062a \u0645\u0633\u062c\u0644\u0629
-empty_entity_list=\u0644\u0627\u062a\u0648\u062c\u062f \u0643\u064a\u0627\u0646\u0627\u062a \u0645\u0633\u062c\u0644\u0629
 empty=\u0641\u0627\u0631\u063a
 form_is_empty_fill_at_least_one=\u0627\u0644\u0627\u0633\u062a\u0645\u0627\u0631\u0629 \u0641\u0627\u0631\u063a\u0629 . \u0631\u062c\u0627\u0621\u064b \u0627\u0645\u0644\u0623 \u0648\u0627\u062d\u062f\u0629 \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644
 total_number_of_pages=\u0639\u062f\u062f \u0627\u0644\u0635\u0641\u062d\u0627\u062a