=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html	2015-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html	2015-09-15 17:16:30 +0000
@@ -49,7 +49,7 @@
                     <div class="col-sm-12" id={{biggerWidget.title}} ng-repeat="biggerWidget in dashboardWidgets | orderBy:'order' | filter: {parent: 'biggerWidget'}"">
                         <div ng-show="biggerWidget.show" ng-include="biggerWidget.view" ng-class="{true: 'hideInPrint'} [biggerWidget.title != 'report']"></div>
                     </div>                                       
-                </div>                
+                </div>
             </div>
             <!-- dashboard bigger widgets end -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-09-14 14:10:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-09-15 17:16:30 +0000
@@ -7,6 +7,7 @@
                 $filter,
                 $log,
                 $timeout,
+                $translate,
                 Paginator,
                 DateUtils,
                 EventUtils,
@@ -40,6 +41,11 @@
     $scope.warningMessages = {};
     $scope.tableMaxNumberOfDataElements = 10;
     
+    //Labels
+    $scope.dataElementLabel = $translate.instant('data_element');
+    $scope.valueLabel = $translate.instant('value');
+    $scope.providedElsewhereLabel = $translate.instant('provided_elsewhere');
+    
 
     var userProfile = SessionStorageService.get('USER_PROFILE');
     var storedBy = userProfile && userProfile.username ? userProfile.username : '';

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-09-15 17:16:30 +0000
@@ -3,21 +3,17 @@
     <table class="dhis2-list-table-striped" ng-if='currentEvent && !currentStage.programStageSections.length'>
         <thead>
             <tr>
-                <th>
-                    {{'data_element'| translate}}
-                </th>
-                <th>
-                    {{'value'| translate}}
-                </th>
-                <th ng-if="allowProvidedElsewhereExists">
-                    {{'provided_elsewhere'| translate}}
+                <th ng-bind="dataElementLabel">
+                </th>
+                <th ng-bind="valueLabel">
+                </th>
+                <th ng-if="allowProvidedElsewhereExists" ng-bind="providedElsewhereLabel">
                 </th>
             </tr>
         </thead>
         <tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements" ng-if="!isHidden(prStDe.dataElement.id)">
             <td>
-                <!--<span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name"></span>-->
-                {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
+                <span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name"></span>
                 <a ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
                     <span class="glyphicon glyphicon-info-sign" ></span>
                     <span ng-show="showHelpText[prStDe.dataElement.id]" ><br>{{prStDe.dataElement.description}}</span>
@@ -225,24 +221,20 @@
             <!-- The inline style was needed to override overflow:hidden in the css. Can possibly be replaced with a CSS update. --> 
             <accordion-group heading="{{section.name}}" is-open="section.open" ng-repeat='section in currentStage.programStageSections' style="overflow:visible">
                 <table class="dhis2-list-table-striped">                    
-                    <thead>                        
+                    <thead>
                         <tr>
-                            <th>
-                                {{'data_element'| translate}}
-                            </th>
-                            <th>
-                                {{'value'| translate}}
-                            </th>
-                            <th ng-if="allowProvidedElsewhereExists">
-                                {{'provided_elsewhere'| translate}}
-                            </th>
-                        </tr>                        
+                            <th ng-bind="dataElementLabel">
+                            </th>
+                            <th ng-bind="valueLabel">
+                            </th>
+                            <th ng-if="allowProvidedElsewhereExists" ng-bind="providedElsewhereLabel">
+                            </th>
+                        </tr>
                     </thead>
                     <tbody id="list">       
                         <tr ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id)">
                             <td>
-                                <!--<span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name"></span>-->
-                                {{prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name}}
+                                <span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name"></span>                                
                                 <a ng-if="prStDes[de.dataElement.id].dataElement.description" Title="{{prStDes[de.dataElement.id].dataElement.description}}" ng-init="showHelpText[de.dataElement.id] = false;" ng-click="showHelpText[de.dataElement.id] = !showHelpText[de.dataElement.id]">
                                     <span class="glyphicon glyphicon-info-sign" ></span>
                                     <span ng-show="showHelpText[de.dataElement.id]" ><br>{{prStDes[de.dataElement.id].dataElement.description}}</span>