diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
new file mode 100644
index 000000000..13754918b
--- /dev/null
+++ b/.github/workflows/verify.yml
@@ -0,0 +1,99 @@
+name: 'dhis2: verify (app)'
+
+on:
+    push:
+        branches:
+
+env:
+    GIT_AUTHOR_NAME: '@dhis2-bot'
+    GIT_AUTHOR_EMAIL: 'apps@dhis2.org'
+    GIT_COMMITTER_NAME: '@dhis2-bot'
+    GIT_COMMITTER_EMAIL: 'apps@dhis2.org'
+    GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}}
+    CI: true
+
+jobs:
+    install:
+        runs-on: ubuntu-latest
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Install
+              if: steps.yarn-cache.outputs.cache-hit != 'true'
+              run: yarn install --frozen-lockfile
+
+    build:
+        runs-on: ubuntu-latest
+        needs: install
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - name: Build
+              run: yarn build
+
+            - uses: actions/upload-artifact@v2
+              with:
+                  name: app-build
+                  path: |
+                      **/build
+                      !**/node_modules
+                  retention-days: 1
+
+    publish:
+        runs-on: ubuntu-latest
+        needs: [build] # add e2e if you use it
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  token: ${{env.GH_TOKEN}}
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/download-artifact@v2
+              with:
+                  name: app-build
+
+            - uses: dhis2/deploy-build@master
+              with:
+                  build-dir: build
+                  github-token: ${{ env.GH_TOKEN }}
+
+    release:
+        runs-on: ubuntu-latest
+        needs: [publish]
+        if: "github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  token: ${{env.GH_TOKEN}}
+
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - name: Publish release to GitHub
+              run: npx @dhis2/cli-utils release
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1321b2491..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: node_js
-node_js:
-- '8'
-cache:
-  directories:
-  - node_modules
-before_script:
-- npm install --global @dhis2/deploy-build
-script:
-- npm run build
-deploy:
-- provider: script
-  script: deploy-build
-  skip_cleanup: true
-  on:
-    all_branches: true
-env:
-  global:
-    secure: A9HNijEiwHz0ZV9DsPbl7VwUlV1rf7SsRiIW3Mq0AsXbupWXc9imFvbDDCyORNy61GKlHBgrHB9BxQZlaG4GO0aAVNpQ1yyTf4+B2NPpM5ja567HQdTH1P/AyDnT67FlSbetI/Rya+vecXCvS3KzGZDrhw2OHs059vBufBycnSYCQd6K+zNqJNI3iXlQZGyU9CW/ha0ggU5b1oXX8YqmRdYn+uvf6XJJmFINvI60n3ECxOwKuQg/ok2BukH8n/0H1kSSxycehn/7MoABEgc6qXxWjgAcDnKFZYngnntwJxtUFa60CW9xKuVtWtTEgvio4i2KfhAl5cxSHiBT3a2xzeyH/NXdTSRDo3O6+hptfaNc/Tux/8eLHNOqaDFlp2CGMG411qFk53EpuT+bV7LiyZpye3c3HZRz7YUQqrJVI3RV9DnEMIpC6etvCLU4yuRLJEGi5EMx3VMBLmumSRHmh7SvPUtu/sZfj1jFbEplAoJMFsQUBq+99r1kQjX3MUTLazjYkA6muHvr0zA5K3c30PGM+c24JxTybJ1L5AQpthQznXBr7NF6C5yt/7B3E+QbJ5N3CU5T357fcRlM16fVhHtOmylUP0s49RtXeM8pygAyycnU5SkITnygPH+0Fih8+xiF8xAiDztb8dEzbaL6AR9wntAiu9X9BFyP2vTL/UU=
diff --git a/.tx/config b/.tx/config
index 2998d367d..86b508f3c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = fa_AF: prs, uz@Cyrl: uz_Cyrl, uz@Latn: uz_Latn
+lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
 
 [app-tracker-capture-app.i18n-app-properties--master]
 file_filter = i18n/i18n_app_<lang>.properties
diff --git a/README.md b/README.md
index 428220e6a..f000721d0 100644
--- a/README.md
+++ b/README.md
@@ -31,4 +31,3 @@ npm run build
 ```
 > **Note:** If you have problems running the app try running the dhis2-core server with TomCat.
 
-![Travis CI](https://travis-ci.com/dhis2/tracker-capture-app.svg)
diff --git a/components/dashboard/dashboard-controller.js b/components/dashboard/dashboard-controller.js
index 4a797ee65..71c7cfaaa 100644
--- a/components/dashboard/dashboard-controller.js
+++ b/components/dashboard/dashboard-controller.js
@@ -196,7 +196,8 @@ trackerCapture.controller('DashboardController',
                                             selectedEnrollment = enrollments.find(function(e){ return e.program === $scope.selectedProgramId && e.status === 'ACTIVE'; });
                                         }
 
-                                        ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, false).then(function (response) {
+                                        ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, selectedEnrollment ? true : false,
+                                            selectedEnrollment ? {id:selectedEnrollment.program} : null).then(function (response) {
                                             $scope.programs = [];
                                             $scope.programNames = [];
                                             $scope.programStageNames = [];
diff --git a/components/dashboard/dashboard-widgets.html b/components/dashboard/dashboard-widgets.html
index 6c992bb75..c31a825db 100644
--- a/components/dashboard/dashboard-widgets.html
+++ b/components/dashboard/dashboard-widgets.html
@@ -14,7 +14,16 @@ <h1>{{'select_widgets_to_show'| translate}}</h1>
                 </td>
                 <td>
                     
-                    <span ng-if="defaultDashboardWidgetsByTitle[widget.title].canBeUsedAsTopBar"><input type="checkbox" ng-model="widget.useAsTopBar" ng-change="setUseAsTopBar(widget)"/> Use as top bar</span>
+                    <span ng-if="defaultDashboardWidgetsByTitle[widget.title].canBeUsedAsTopBar">
+                        <div ng-style="{display: 'flex', 'align-items': 'center'}">
+                            <div>
+                                <input type="checkbox" ng-model="widget.useAsTopBar" ng-change="setUseAsTopBar(widget)"/>
+                            </div>
+                            <div ng-style="{'margin-left': '4px'}">
+                                {{'use_as_top_bar'| translate}}
+                            </div>
+                        </div>
+                    </span>
                 </td>
             </tr>
         </table>
diff --git a/components/dashboard/dashboard.html b/components/dashboard/dashboard.html
index 390c11f74..1098c2bff 100644
--- a/components/dashboard/dashboard.html
+++ b/components/dashboard/dashboard.html
@@ -67,7 +67,7 @@
                         <ul class="dropdown-menu pull-right" role="menu">
                             <li><a href ng-click="showHideWidgets()">{{showHideWidgetsLabel}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard"><a href ng-click="saveDashboarLayoutAsDefault()">{{'save_layout_as_default' | translate}}</a></li>
-                            <li><a href ng-click="openTopBarSettings()">Top bar settings</a></li>
+                            <li><a href ng-click="openTopBarSettings()">{{'top_bar_settings' | translate}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard && lockedList && !lockedList[selectedProgram.id]"><a href ng-click="toggleLockDashboard()"><i class="fa fa-lock" aria-hidden="true"></i> {{'lock_default_layout' | translate}}</a></li>
                             <li ng-if="userAuthority.canAdministerDashboard && lockedList && lockedList[selectedProgram.id]"><a href ng-click="toggleLockDashboard()"><i class="fa fa-unlock" aria-hidden="true"></i> {{'unlock_default_layout' | translate}}</a></li>
                         </ul>
diff --git a/components/dataentry/dataentry-controller.js b/components/dataentry/dataentry-controller.js
index ccb421637..c06d2730a 100644
--- a/components/dataentry/dataentry-controller.js
+++ b/components/dataentry/dataentry-controller.js
@@ -33,7 +33,8 @@ trackerCapture.controller('DataEntryController',
                 EventCreationService,
                 AuthorityService,
                 AccessUtils,
-                TCOrgUnitService) {
+                TCOrgUnitService,
+                UsersService) {
     
     //Unique instance id for the controller:
     $scope.APIURL = DHIS2URL;
@@ -164,8 +165,8 @@ trackerCapture.controller('DataEntryController',
         {color: 'alert-warning', description: 'executed', showInStageLegend: true, showInEventLegend: true},        
         {color: 'alert-success', description: 'ontime', showInStageLegend: true, showInEventLegend: true},
         {color: 'alert-danger', description: 'overdue', showInStageLegend: true, showInEventLegend: true},        
-        {color: 'alert-default', description: 'skipped', showInStageLegend: false, showInEventLegend: true}/*,
-        {color: '', description: 'empty', showInStageLegend: true, showInEventLegend: false}*/
+        {color: 'alert-default', description: 'skipped', showInStageLegend: false, showInEventLegend: true}
+        /*,{color: '', description: 'empty', showInStageLegend: true, showInEventLegend: false}*/
     ];
  
     $scope.model= {};
@@ -216,9 +217,9 @@ trackerCapture.controller('DataEntryController',
     };
     
     
-    //listen for new events created
+    
     $scope.$on('eventcreated', function (event, args) {
-        //TODO: Sort this out:
+        
         $scope.addNewEvent(args.event);
     });
     
@@ -418,7 +419,40 @@ trackerCapture.controller('DataEntryController',
                         $log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a field defined");                        
                     }
                 }
-            } else if (effect.action === "SHOWERROR" 
+            }
+            
+            /*
+            else if (effect.action === "HIDEFIELDNODELETE") {
+                if (effect.dataElement) {
+
+                    if (affectedEvent.status !== 'SCHEDULE' && affectedEvent.status !== 'SKIPPED' && !affectedEvent.editingNotAllowed) {
+                        if (effect.ineffect && affectedEvent[effect.dataElement.id]) {
+                            //If a field is going to be hidden, but contains a value, we need to take action;
+                            if (effect.content) {
+                                //TODO: Alerts is going to be replaced with a proper display mecanism.
+                                alert(effect.content);
+                            }
+                        }
+                    }
+
+                    if (effect.ineffect) {
+                        $scope.hiddenFields[event][effect.dataElement.id] = true;
+                    } else if (!$scope.hiddenFields[event][effect.dataElement.id]) {
+                        $scope.hiddenFields[event][effect.dataElement.id] = false;
+                    }
+                } else {
+                    if (!effect.trackedEntityAttribute) {
+                        $log.warn("ProgramRuleAction " + effect.id + " is of type HIDEFIELD, bot does not have a field defined");
+                    }
+                }
+            } 
+
+            */
+            
+            
+            
+            
+            else if (effect.action === "SHOWERROR" 
                     || effect.action === "ERRORONCOMPLETE") {
                 if (effect.ineffect) {
                     var message = effect.content + (effect.data ? effect.data : "");
@@ -895,7 +929,7 @@ trackerCapture.controller('DataEntryController',
                 $scope.programStages = $scope.tabularEntryStages = $scope.selectedProgram.programStages;
                 
                 angular.forEach($scope.selectedProgram.programStages, function (stage) {
-                    if (stage.openAfterEnrollment) {
+                    if (!$scope.currentStage && stage.openAfterEnrollment) {
                         $scope.currentStage = stage;
                     }
 
@@ -1201,6 +1235,7 @@ trackerCapture.controller('DataEntryController',
         newEvent = EventUtils.processEvent(newEvent, $scope.stagesById[newEvent.programStage], $scope.optionSets, $scope.prStDes);
         if(setProgramStage) $scope.currentStage = $scope.stagesById[newEvent.programStage];
         sortEventsByStage('ADD', newEvent);
+        CurrentSelection.setSelectedTeiEvents($scope.allEventsSorted);
         broadcastDataEntryControllerData();
     };
     
@@ -1415,6 +1450,12 @@ trackerCapture.controller('DataEntryController',
         
                         if ($scope.currentEvent.notes) {
                             angular.forEach($scope.currentEvent.notes, function (note) {
+                                UsersService.getByQuery(note.storedBy).then( function(users) {
+                                    if(users.length === 1) {
+                                        note.storedBy = users[0].firstName + ' ' + users[0].lastName;
+                                    }
+                                });
+                                
                                 note.displayDate = DateUtils.formatFromApiToUser(note.storedDate);
                                 note.storedDate = DateUtils.formatToHrsMins(note.storedDate);
                             });
@@ -1426,6 +1467,2320 @@ trackerCapture.controller('DataEntryController',
                         $scope.getDataEntryForm();
                         $timeout(function(){
                             $scope.showLoadingEventSpinner = false;
+
+
+                          		
+			//03/08/2020 - edit here for adding totals - end here
+			
+            var currentEventDetails = $scope.currentEvent;
+			var cumulativeTotal = 0;				
+			var selectedEntityid =  $scope.selectedEntity.trackedEntityInstance;			
+			var selectedEntityUrl = '../api/trackedEntityInstances/'+selectedEntityid + '?paging=false&fields=enrollments[events]&program=JRuLW57woOB&programStatus=ACTIVE';
+						
+			var currentEventDate = new Date(event.eventDate);
+			var currentEvent = event.event;
+			//console.log("eventDate: " + event.eventDate);
+			$('#TableCaptureForm tr').each(function (i, row) {				
+							//console.log('row id: '+ row.id);
+							if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7") {								
+								$.getJSON(selectedEntityUrl,
+									function (json) {					
+									var enrollmentsjson = json;
+									var cumulativeTotal = 0;
+									if (enrollmentsjson.enrollments != undefined) {										
+										if (enrollmentsjson.enrollments[0].events.length > 0) {											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												//console.log("eventDate: " + event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													//console.log( rowEventDate < currentEventDate);
+													if (rowEventDate < currentEventDate) {
+														//console.log("currentEvent: " + currentEvent);
+														//console.log("event.event: " + event.event);
+														if (currentEvent != event.event) {
+															//console.log("rowEventDate: " + rowEventDate);
+															//console.log("currentEventDate: " + currentEventDate);
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'OdcXvW9sRW7') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+
+																		
+
+
+
+
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+
+												}
+
+
+
+
+											})
+
+											if ($scope.currentEvent.OdcXvW9sRW7 != undefined && $scope.currentEvent.BupjOLROGnk == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.OdcXvW9sRW7;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.BupjOLROGnk = cumulativeTotal;													
+													var newvalueDE = "BupjOLROGnk";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.OdcXvW9sRW7 == undefined && $scope.currentEvent.BupjOLROGnk != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.BupjOLROGnk - cumulativeTotal;
+													if (newupdateValue >= 0) {
+														$scope.currentEvent.OdcXvW9sRW7 = newupdateValue;
+														var newvalueDE = "OdcXvW9sRW7";
+														var ev = {
+															event: currentEventDetails.event,
+															orgUnit: currentEventDetails.orgUnit,
+															program: currentEventDetails.program,
+															programStage: currentEventDetails.programStage,
+															status: currentEventDetails.status,
+															geometry: currentEventDetails.geometry,
+															assignedUser: currentEventDetails.assignedUser,
+															trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+															dataValues: [{
+																dataElement: newvalueDE,
+																value: newupdateValue,
+																providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+															}]
+														};
+
+														DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+														})
+													}
+													else {
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+												}
+											}
+
+
+										}
+									}
+									})
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+							}													
+							else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {										
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+
+												if (event.programStage == 'mRDg7F9tAZH') {
+
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'sheYRpw3hy5') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+
+
+
+												}
+											})
+
+											if ($scope.currentEvent.sheYRpw3hy5 != undefined && $scope.currentEvent.hiqwZ04mgyv == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.sheYRpw3hy5;
+												////console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.hiqwZ04mgyv = cumulativeTotal;													
+													var newvalueDE = "hiqwZ04mgyv";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.sheYRpw3hy5 == undefined && $scope.currentEvent.hiqwZ04mgyv != undefined) 
+												{
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.hiqwZ04mgyv - cumulativeTotal;
+													if (newupdateValue >= 0) {
+														$scope.currentEvent.sheYRpw3hy5 = newupdateValue;
+														var newvalueDE = "sheYRpw3hy5";
+
+														var ev = {
+															event: currentEventDetails.event,
+															orgUnit: currentEventDetails.orgUnit,
+															program: currentEventDetails.program,
+															programStage: currentEventDetails.programStage,
+															status: currentEventDetails.status,
+															geometry: currentEventDetails.geometry,
+															assignedUser: currentEventDetails.assignedUser,
+															trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+															dataValues: [{
+																dataElement: newvalueDE,
+																value: newupdateValue,
+																providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+															}]
+														};
+
+														DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+														})
+													}
+													else {
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+												}
+												}
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+							}
+							else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+
+												var rowEventDate = new Date(event.eventDate);
+
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'N9YnWLhO5YT') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+
+
+
+												}
+											})
+
+											if ($scope.currentEvent.N9YnWLhO5YT != undefined && $scope.currentEvent.kvJqqfeRl1f == undefined) {
+												cumulativeTotal = cumulativeTotal + $scope.currentEvent.N9YnWLhO5YT;
+												//console.log("cumulativeTotal: " + cumulativeTotal);
+												$scope.currentEvent.kvJqqfeRl1f = cumulativeTotal;
+												var newvalueDE = "kvJqqfeRl1f";
+												var ev = {
+													event: currentEventDetails.event,
+													orgUnit: currentEventDetails.orgUnit,
+													program: currentEventDetails.program,
+													programStage: currentEventDetails.programStage,
+													status: currentEventDetails.status,
+													geometry: currentEventDetails.geometry,
+													assignedUser: currentEventDetails.assignedUser,
+													trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+													dataValues: [{
+														dataElement: newvalueDE,
+														value: cumulativeTotal,
+														providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+													}]
+												};
+
+												DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+												})
+											}
+											else if ($scope.currentEvent.N9YnWLhO5YT == undefined && $scope.currentEvent.kvJqqfeRl1f != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.kvJqqfeRl1f - cumulativeTotal;
+													if (newupdateValue >= 0) {
+														$scope.currentEvent.N9YnWLhO5YT = newupdateValue;
+														var newvalueDE = "N9YnWLhO5YT";
+														var ev = {
+															event: currentEventDetails.event,
+															orgUnit: currentEventDetails.orgUnit,
+															program: currentEventDetails.program,
+															programStage: currentEventDetails.programStage,
+															status: currentEventDetails.status,
+															geometry: currentEventDetails.geometry,
+															assignedUser: currentEventDetails.assignedUser,
+															trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+															dataValues: [{
+																dataElement: newvalueDE,
+																value: newupdateValue,
+																providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+															}]
+														};
+
+														DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+														})
+													}
+													else {
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+												}
+											}
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8")
+							{
+								  var cumulativeTotal = 0.0;
+
+									$.getJSON(selectedEntityUrl,
+									function (json) {		
+									var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'VnHmmfDZRL8') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+																	}
+																	return false;
+																}
+															})
+
+														}
+													}
+												}
+											})
+
+
+											if ($scope.currentEvent.VnHmmfDZRL8 != undefined && $scope.currentEvent.RtnnypERQ6e == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.VnHmmfDZRL8;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.RtnnypERQ6e = cumulativeTotal;													
+													var newvalueDE = "RtnnypERQ6e";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.VnHmmfDZRL8 == undefined && $scope.currentEvent.RtnnypERQ6e != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.RtnnypERQ6e - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.VnHmmfDZRL8 = newupdateValue;
+													var newvalueDE = "VnHmmfDZRL8";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+												}
+											}
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'bsOhL5gMiA2') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);		
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)			
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+												}
+											})
+
+											if ($scope.currentEvent.bsOhL5gMiA2 != undefined && $scope.currentEvent.OPqPDJfrEUN == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.bsOhL5gMiA2;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.OPqPDJfrEUN = cumulativeTotal;													
+													var newvalueDE = "OPqPDJfrEUN";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.bsOhL5gMiA2 == undefined && $scope.currentEvent.OPqPDJfrEUN != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.OPqPDJfrEUN - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.bsOhL5gMiA2 = newupdateValue;
+													var newvalueDE = "bsOhL5gMiA2";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {
+									var cumulativeTotal = 0;					
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'lOl69tQ4SsN') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)				
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+												}
+											})
+
+											if ($scope.currentEvent.lOl69tQ4SsN != undefined && $scope.currentEvent.BNT0ilAPFNl == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.lOl69tQ4SsN;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.BNT0ilAPFNl = cumulativeTotal;													
+													var newvalueDE = "BNT0ilAPFNl";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.lOl69tQ4SsN == undefined && $scope.currentEvent.BNT0ilAPFNl != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.BNT0ilAPFNl - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.lOl69tQ4SsN = newupdateValue;
+													var newvalueDE = "lOl69tQ4SsN";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {
+									var cumulativeTotal = 0;					
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'YWT49rK48Kv') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																	}
+																	return false;
+																}
+															})
+
+														}
+													}
+												}
+											})
+
+											if ($scope.currentEvent.YWT49rK48Kv != undefined && $scope.currentEvent.uhU5B4ocDC1 == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.YWT49rK48Kv;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.uhU5B4ocDC1 = cumulativeTotal;													
+													var newvalueDE = "uhU5B4ocDC1";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.YWT49rK48Kv == undefined && $scope.currentEvent.uhU5B4ocDC1 != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.uhU5B4ocDC1 - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.YWT49rK48Kv = newupdateValue;
+													var newvalueDE = "YWT49rK48Kv";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D")
+							{
+								
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'Avuy4qMx47D') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+												}
+											})
+
+
+											if ($scope.currentEvent.Avuy4qMx47D != undefined && $scope.currentEvent.yYIhA11EREJ == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.Avuy4qMx47D;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.yYIhA11EREJ = cumulativeTotal;													
+													var newvalueDE = "yYIhA11EREJ";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.Avuy4qMx47D == undefined && $scope.currentEvent.yYIhA11EREJ != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.yYIhA11EREJ - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.Avuy4qMx47D = newupdateValue;
+													var newvalueDE = "Avuy4qMx47D";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8" )
+							{					
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'XE0l3snpzH8') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+												}
+											})
+
+											if ($scope.currentEvent.XE0l3snpzH8 != undefined && $scope.currentEvent.mcxOOfFJcZV == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.XE0l3snpzH8;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.mcxOOfFJcZV = cumulativeTotal;													
+													var newvalueDE = "mcxOOfFJcZV";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.XE0l3snpzH8 == undefined && $scope.currentEvent.mcxOOfFJcZV != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.mcxOOfFJcZV - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.XE0l3snpzH8 = newupdateValue;
+													var newvalueDE = "XE0l3snpzH8";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE")
+							{						
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'kL42B2XHokE') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+
+												}
+											}
+												}
+											})
+
+											if ($scope.currentEvent.kL42B2XHokE != undefined && $scope.currentEvent.TBgmaE3JciI == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.kL42B2XHokE;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.TBgmaE3JciI = cumulativeTotal;													
+													var newvalueDE = "TBgmaE3JciI";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+
+											else if ($scope.currentEvent.kL42B2XHokE == undefined && $scope.currentEvent.TBgmaE3JciI != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.TBgmaE3JciI - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.kL42B2XHokE = newupdateValue;
+													var newvalueDE = "kL42B2XHokE";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8")
+							{
+							
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {		
+										var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+										if (enrollmentsjson.enrollments != undefined) {
+
+											if (enrollmentsjson.enrollments[0].events.length > 0) {
+
+												$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+													var rowEventDate = new Date(event.eventDate);
+													if (event.programStage == 'mRDg7F9tAZH') {
+														if (rowEventDate < currentEventDate) {
+															if (currentEvent != event.event) {
+																$.each(event.dataValues, function (s, dataValue) {
+																	var dataElement = dataValue.dataElement;
+																	if (dataElement == 'xp2cVKbT7z8') {
+																		if (dataValue.value != undefined) {
+																			cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																			//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																			row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																		}
+																		return false;
+																	}
+																})
+															}
+														}
+													}
+												})
+
+											if ($scope.currentEvent.xp2cVKbT7z8 != undefined && $scope.currentEvent.a1ov5sK29nL == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.xp2cVKbT7z8;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.a1ov5sK29nL = cumulativeTotal;													
+													var newvalueDE = "a1ov5sK29nL";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.xp2cVKbT7z8 == undefined && $scope.currentEvent.a1ov5sK29nL != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.a1ov5sK29nL - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.xp2cVKbT7z8 = newupdateValue;
+													var newvalueDE = "xp2cVKbT7z8";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+											}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {		
+										var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+										if (enrollmentsjson.enrollments != undefined) {
+
+											if (enrollmentsjson.enrollments[0].events.length > 0) {
+												$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+													var rowEventDate = new Date(event.eventDate);
+													if (event.programStage == 'mRDg7F9tAZH') {
+														if (rowEventDate < currentEventDate) {
+															if (currentEvent != event.event) {
+																$.each(event.dataValues, function (s, dataValue) {
+																	var dataElement = dataValue.dataElement;
+																	if (dataElement == 'A3h8GTMv3CK') {
+																		if (dataValue.value != undefined) {
+																			cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																			//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																			row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)				
+																		}
+																		return false;
+																	}
+																})
+
+															}
+														}
+													}
+												})
+
+											if ($scope.currentEvent.A3h8GTMv3CK != undefined && $scope.currentEvent.rBeV3HB0EFq == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.A3h8GTMv3CK;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.rBeV3HB0EFq = cumulativeTotal;													
+													var newvalueDE = "rBeV3HB0EFq";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.A3h8GTMv3CK == undefined && $scope.currentEvent.rBeV3HB0EFq != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.rBeV3HB0EFq - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.A3h8GTMv3CK = newupdateValue;
+													var newvalueDE = "A3h8GTMv3CK";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+											}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+								
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'jfJfoWAp5xb') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+
+												}
+											}
+												}
+											})
+
+											if ($scope.currentEvent.jfJfoWAp5xb != undefined && $scope.currentEvent.N7sbBOolKo3 == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.jfJfoWAp5xb;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.N7sbBOolKo3 = cumulativeTotal;													
+													var newvalueDE = "N7sbBOolKo3";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.jfJfoWAp5xb == undefined && $scope.currentEvent.N7sbBOolKo3 != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.N7sbBOolKo3 - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.jfJfoWAp5xb = newupdateValue;
+													var newvalueDE = "jfJfoWAp5xb";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {
+										var cumulativeTotal = 0;
+										var enrollmentsjson = json;
+										if (enrollmentsjson.enrollments != undefined) {
+
+											if (enrollmentsjson.enrollments[0].events.length > 0) {
+
+												$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+													var rowEventDate = new Date(event.eventDate);
+													if (event.programStage == 'mRDg7F9tAZH') {
+														if (rowEventDate < currentEventDate) {
+															if (currentEvent != event.event) {
+																$.each(event.dataValues, function (s, dataValue) {
+																	var dataElement = dataValue.dataElement;
+																	if (dataElement == 'Pg1qZvjwNLd') {
+																		if (dataValue.value != undefined) {
+																			cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																			//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																			row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																		}
+																		return false;
+																	}
+																})
+															}
+														}
+
+													}
+												})
+
+											if ($scope.currentEvent.Pg1qZvjwNLd != undefined && $scope.currentEvent.nTtZL79a1SI == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.Pg1qZvjwNLd;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.nTtZL79a1SI = cumulativeTotal;													
+													var newvalueDE = "nTtZL79a1SI";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.Pg1qZvjwNLd == undefined && $scope.currentEvent.nTtZL79a1SI != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.nTtZL79a1SI - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.Pg1qZvjwNLd = newupdateValue;
+													var newvalueDE = "Pg1qZvjwNLd";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+
+												}
+											}
+
+
+
+
+
+											}
+										}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi")
+							{
+								
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'Vg7NPVpmPvi') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+
+												}
+											}
+												}
+											})
+
+											if ($scope.currentEvent.Vg7NPVpmPvi != undefined && $scope.currentEvent.PDXITHc6Vyg == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.Vg7NPVpmPvi;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.PDXITHc6Vyg = cumulativeTotal;													
+													var newvalueDE = "PDXITHc6Vyg";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.Vg7NPVpmPvi == undefined && $scope.currentEvent.PDXITHc6Vyg != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.PDXITHc6Vyg - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.Vg7NPVpmPvi = newupdateValue;
+													var newvalueDE = "Vg7NPVpmPvi";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU")
+							{					
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													if (rowEventDate < currentEventDate) {
+														if (currentEvent != event.event) {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'TlyT82eTiFU') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+
+												}
+											}
+												}
+											})
+
+											if ($scope.currentEvent.TlyT82eTiFU != undefined && $scope.currentEvent.mNjfJCZsWeo == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.TlyT82eTiFU;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.mNjfJCZsWeo = cumulativeTotal;													
+													var newvalueDE = "mNjfJCZsWeo";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.TlyT82eTiFU == undefined && $scope.currentEvent.mNjfJCZsWeo != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.mNjfJCZsWeo - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.TlyT82eTiFU = newupdateValue;
+													var newvalueDE = "TlyT82eTiFU";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+
+										}
+									}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {
+										var cumulativeTotal = 0;
+										var enrollmentsjson = json;
+										if (enrollmentsjson.enrollments != undefined) {
+
+											if (enrollmentsjson.enrollments[0].events.length > 0) {
+												$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+													var rowEventDate = new Date(event.eventDate);
+													if (event.programStage == 'mRDg7F9tAZH') {
+														if (rowEventDate < currentEventDate) {
+															if (currentEvent != event.event) {
+																$.each(event.dataValues, function (s, dataValue) {
+																	var dataElement = dataValue.dataElement;
+																	if (dataElement == 'SnGNuVm0fbD') {
+																		if (dataValue.value != undefined) {
+																			cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																			//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																			row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+																		}
+																		return false;
+																	}
+																})
+															}
+														}
+													}
+												})
+
+
+											if ($scope.currentEvent.SnGNuVm0fbD != undefined && $scope.currentEvent.xR90dTvK9UO == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.SnGNuVm0fbD;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.xR90dTvK9UO = cumulativeTotal;													
+													var newvalueDE = "xR90dTvK9UO";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.SnGNuVm0fbD == undefined && $scope.currentEvent.xR90dTvK9UO != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.xR90dTvK9UO - cumulativeTotal;
+													if (newupdateValue >= 0)
+													{
+													$scope.currentEvent.SnGNuVm0fbD = newupdateValue;
+													var newvalueDE = "SnGNuVm0fbD";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: newupdateValue,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+													})
+												}
+												else 
+													{
+														$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+														$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+														$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+
+
+
+
+												}
+											}
+
+
+
+
+
+											}
+										}
+									})
+
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+							}
+							
+							//New DE - 05/07/2021
+							else if (row.cells[3] != undefined && row.id == "row-UTdQahMcNQj") {								
+								$.getJSON(selectedEntityUrl,
+									function (json) {					
+									var enrollmentsjson = json;
+									var cumulativeTotal = 0;
+									if (enrollmentsjson.enrollments != undefined) {										
+										if (enrollmentsjson.enrollments[0].events.length > 0) {											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												//console.log("eventDate: " + event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													//console.log( rowEventDate < currentEventDate);
+													if (rowEventDate < currentEventDate) {
+														//console.log("currentEvent: " + currentEvent);
+														//console.log("event.event: " + event.event);
+														if (currentEvent != event.event) {
+															//console.log("rowEventDate: " + rowEventDate);
+															//console.log("currentEventDate: " + currentEventDate);
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'UTdQahMcNQj') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+
+																		
+
+
+
+
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+
+												}
+
+
+
+
+											})
+
+											if ($scope.currentEvent.UTdQahMcNQj != undefined && $scope.currentEvent.BNTe3GMCSKF == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.UTdQahMcNQj;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.BNTe3GMCSKF = cumulativeTotal;													
+													var newvalueDE = "BNTe3GMCSKF";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.UTdQahMcNQj == undefined && $scope.currentEvent.BNTe3GMCSKF != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.BNTe3GMCSKF - cumulativeTotal;
+													if (newupdateValue >= 0) {
+														$scope.currentEvent.UTdQahMcNQj = newupdateValue;
+														var newvalueDE = "UTdQahMcNQj";
+														var ev = {
+															event: currentEventDetails.event,
+															orgUnit: currentEventDetails.orgUnit,
+															program: currentEventDetails.program,
+															programStage: currentEventDetails.programStage,
+															status: currentEventDetails.status,
+															geometry: currentEventDetails.geometry,
+															assignedUser: currentEventDetails.assignedUser,
+															trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+															dataValues: [{
+																dataElement: newvalueDE,
+																value: newupdateValue,
+																providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+															}]
+														};
+
+														DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+														})
+													}
+													else {
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+												}
+											}
+
+
+										}
+									}
+									})
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+							}
+							else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J") {								
+								$.getJSON(selectedEntityUrl,
+									function (json) {					
+									var enrollmentsjson = json;
+									var cumulativeTotal = 0;
+									if (enrollmentsjson.enrollments != undefined) {										
+										if (enrollmentsjson.enrollments[0].events.length > 0) {											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												var rowEventDate = new Date(event.eventDate);
+												//console.log("eventDate: " + event.eventDate);
+												if (event.programStage == 'mRDg7F9tAZH') {
+													//console.log( rowEventDate < currentEventDate);
+													if (rowEventDate < currentEventDate) {
+														//console.log("currentEvent: " + currentEvent);
+														//console.log("event.event: " + event.event);
+														if (currentEvent != event.event) {
+															//console.log("rowEventDate: " + rowEventDate);
+															//console.log("currentEventDate: " + currentEventDate);
+															$.each(event.dataValues, function (s, dataValue) {
+																var dataElement = dataValue.dataElement;
+																if (dataElement == 'JoFnbRQT66J') {
+																	if (dataValue.value != undefined) {
+																		cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+																		//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																		row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';
+
+																		
+
+
+
+
+																	}
+																	return false;
+																}
+															})
+														}
+													}
+
+												}
+
+
+
+
+											})
+
+											if ($scope.currentEvent.JoFnbRQT66J != undefined && $scope.currentEvent.aRgVJNx0zUo == undefined) 
+											{
+												cumulativeTotal =  cumulativeTotal + $scope.currentEvent.JoFnbRQT66J;
+												//console.log("cumulativeTotal: "+ cumulativeTotal );
+												$scope.currentEvent.aRgVJNx0zUo = cumulativeTotal;													
+													var newvalueDE = "aRgVJNx0zUo";
+													var ev = {
+														event: currentEventDetails.event,
+														orgUnit: currentEventDetails.orgUnit,
+														program: currentEventDetails.program,
+														programStage: currentEventDetails.programStage,
+														status: currentEventDetails.status,
+														geometry: currentEventDetails.geometry,
+														assignedUser: currentEventDetails.assignedUser,
+														trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+														dataValues: [{
+															dataElement: newvalueDE,
+															value: cumulativeTotal,
+															providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+														}]
+													};
+
+													DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+													})							
+											}
+											else if ($scope.currentEvent.JoFnbRQT66J == undefined && $scope.currentEvent.aRgVJNx0zUo != undefined) {
+												if (cumulativeTotal >= 0) {
+													var newupdateValue = $scope.currentEvent.aRgVJNx0zUo - cumulativeTotal;
+													if (newupdateValue >= 0) {
+														$scope.currentEvent.JoFnbRQT66J = newupdateValue;
+														var newvalueDE = "JoFnbRQT66J";
+														var ev = {
+															event: currentEventDetails.event,
+															orgUnit: currentEventDetails.orgUnit,
+															program: currentEventDetails.program,
+															programStage: currentEventDetails.programStage,
+															status: currentEventDetails.status,
+															geometry: currentEventDetails.geometry,
+															assignedUser: currentEventDetails.assignedUser,
+															trackedEntityInstance: currentEventDetails.trackedEntityInstance,
+															dataValues: [{
+																dataElement: newvalueDE,
+																value: newupdateValue,
+																providedElsewhere: currentEventDetails.providedElsewhere[newvalueDE] ? true : false
+															}]
+														};
+
+														DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+														})
+													}
+													else {
+														alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+													}
+												}
+											}
+
+
+										}
+									}
+									})
+								/*
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+								*/
+								$scope.currentEventOriginal = angular.copy($scope.currentEvent);
+								$scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+								$rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+							}
+			})		
+				
+			//03/08/2020 - edit here for adding totals - end here
+			
+
+
+
+
+
+
+
+
+
+
                         });
                     });
                 });
@@ -1766,9 +4121,5114 @@ trackerCapture.controller('DataEntryController',
                     //Run rules on updated data:
                     $scope.executeRules();
                 }
+         		
+			//03/08/2020 - edit here for adding totals - start here
+			
+			var currentEventDetails = $scope.currentEvent;
+			var value = currentEventDetails[prStDe.dataElement.id];
+			//console.log(value);
+			//var cumulativeTotal = 0;
+			//var selectedDataElement = prStDe.dataElement.id;
+			//console.log($scope);			
+			var selectedEntityid =  $scope.selectedEntity.trackedEntityInstance;			
+			var selectedEntityUrl = '../api/trackedEntityInstances/'+selectedEntityid + '?paging=false&fields=enrollments[events]&program=JRuLW57woOB&programStatus=ACTIVE';
+			
+			//var table =  document.getElementsByClassName("Table")[0];			
+			//console.log(prStDe);
+			//console.log(currentEventDetails);	
+
+            //var table =  document.getElementsByClassName("Table")[0];			
+			//console.log(prStDe);
+			//console.log(currentEventDetails);				
+			var currentEventDate = new Date(eventToSave.eventDate);
+
+
+            $('#TableCaptureForm tr').each(function (i, row) {
+                //console.log('row id: '+ row.id);								
+                //console.log("row.cells[3] : "+ row.cells[3] );	
+                //console.log("row.id : "+ row.id );	  
+                if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7" && 'OdcXvW9sRW7' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.BupjOLROGnk = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "BupjOLROGnk";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "BupjOLROGnk";
+                        $scope.currentEvent.BupjOLROGnk = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
 
-            });
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7" && 'BupjOLROGnk' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.OdcXvW9sRW7 = newupdateValue;
+                                            //console.log($scope);
+
+                                            var newvalueDE = "OdcXvW9sRW7";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.BupjOLROGnk = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "BupjOLROGnk";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.BupjOLROGnk = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "BupjOLROGnk";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5" && 'sheYRpw3hy5' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.hiqwZ04mgyv = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "hiqwZ04mgyv";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "hiqwZ04mgyv";
+                        $scope.currentEvent.hiqwZ04mgyv = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5" && 'hiqwZ04mgyv' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.sheYRpw3hy5 = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "sheYRpw3hy5";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.hiqwZ04mgyv = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "hiqwZ04mgyv";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.hiqwZ04mgyv = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "hiqwZ04mgyv";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT" && 'N9YnWLhO5YT' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.kvJqqfeRl1f = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "kvJqqfeRl1f";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "kvJqqfeRl1f";
+                        $scope.currentEvent.kvJqqfeRl1f = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT" && 'kvJqqfeRl1f' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.N9YnWLhO5YT = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "N9YnWLhO5YT";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.kvJqqfeRl1f = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "kvJqqfeRl1f";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.kvJqqfeRl1f = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "kvJqqfeRl1f";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8" && 'VnHmmfDZRL8' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.RtnnypERQ6e = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "RtnnypERQ6e";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "RtnnypERQ6e";
+                        $scope.currentEvent.RtnnypERQ6e = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8" && 'RtnnypERQ6e' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.VnHmmfDZRL8 = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "VnHmmfDZRL8";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.RtnnypERQ6e = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "RtnnypERQ6e";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.RtnnypERQ6e = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "RtnnypERQ6e";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2" && 'bsOhL5gMiA2' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.OPqPDJfrEUN = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "OPqPDJfrEUN";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "OPqPDJfrEUN";
+                        $scope.currentEvent.OPqPDJfrEUN = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2" && 'OPqPDJfrEUN' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.bsOhL5gMiA2 = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "bsOhL5gMiA2";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.OPqPDJfrEUN = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "OPqPDJfrEUN";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.OPqPDJfrEUN = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "OPqPDJfrEUN";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN" && 'lOl69tQ4SsN' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.BNT0ilAPFNl = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "BNT0ilAPFNl";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "BNT0ilAPFNl";
+                        $scope.currentEvent.BNT0ilAPFNl = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN" && 'BNT0ilAPFNl' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.lOl69tQ4SsN = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "lOl69tQ4SsN";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.BNT0ilAPFNl = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "BNT0ilAPFNl";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+
+
+
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.BNT0ilAPFNl = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "BNT0ilAPFNl";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv" && 'YWT49rK48Kv' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.uhU5B4ocDC1 = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "uhU5B4ocDC1";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "uhU5B4ocDC1";
+                        $scope.currentEvent.uhU5B4ocDC1 = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv" && 'uhU5B4ocDC1' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.YWT49rK48Kv = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "YWT49rK48Kv";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.uhU5B4ocDC1 = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "uhU5B4ocDC1";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+
+
+
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.uhU5B4ocDC1 = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "uhU5B4ocDC1";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D" && 'Avuy4qMx47D' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.yYIhA11EREJ = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "yYIhA11EREJ";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "yYIhA11EREJ";
+                        $scope.currentEvent.yYIhA11EREJ = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D" && 'yYIhA11EREJ' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.Avuy4qMx47D = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "Avuy4qMx47D";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.yYIhA11EREJ = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "yYIhA11EREJ";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.yYIhA11EREJ = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "yYIhA11EREJ";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8" && 'XE0l3snpzH8' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.mcxOOfFJcZV = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "mcxOOfFJcZV";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "mcxOOfFJcZV";
+                        $scope.currentEvent.mcxOOfFJcZV = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8" && 'mcxOOfFJcZV' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.XE0l3snpzH8 = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "XE0l3snpzH8";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.mcxOOfFJcZV = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "mcxOOfFJcZV";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+
+
+
+
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.mcxOOfFJcZV = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "mcxOOfFJcZV";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE" && 'kL42B2XHokE' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.TBgmaE3JciI = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "TBgmaE3JciI";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "TBgmaE3JciI";
+                        $scope.currentEvent.TBgmaE3JciI = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE" && 'TBgmaE3JciI' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.kL42B2XHokE = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "kL42B2XHokE";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.TBgmaE3JciI = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "TBgmaE3JciI";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.TBgmaE3JciI = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "TBgmaE3JciI";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8" && 'xp2cVKbT7z8' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.a1ov5sK29nL = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "a1ov5sK29nL";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "a1ov5sK29nL";
+                        $scope.currentEvent.a1ov5sK29nL = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8" && 'a1ov5sK29nL' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.xp2cVKbT7z8 = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "xp2cVKbT7z8";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.a1ov5sK29nL = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "a1ov5sK29nL";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.a1ov5sK29nL = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "a1ov5sK29nL";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK" && 'A3h8GTMv3CK' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.rBeV3HB0EFq = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "rBeV3HB0EFq";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "rBeV3HB0EFq";
+                        $scope.currentEvent.rBeV3HB0EFq = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK" && 'rBeV3HB0EFq' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.A3h8GTMv3CK = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "A3h8GTMv3CK";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.rBeV3HB0EFq = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "rBeV3HB0EFq";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.rBeV3HB0EFq = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "rBeV3HB0EFq";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb" && 'jfJfoWAp5xb' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.N7sbBOolKo3 = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "N7sbBOolKo3";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "N7sbBOolKo3";
+                        $scope.currentEvent.N7sbBOolKo3 = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
 
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb" && 'N7sbBOolKo3' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.jfJfoWAp5xb = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "jfJfoWAp5xb";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.N7sbBOolKo3 = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "N7sbBOolKo3";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.N7sbBOolKo3 = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "N7sbBOolKo3";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd" && 'Pg1qZvjwNLd' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.nTtZL79a1SI = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "nTtZL79a1SI";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "nTtZL79a1SI";
+                        $scope.currentEvent.nTtZL79a1SI = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+                else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd" && 'nTtZL79a1SI' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.Pg1qZvjwNLd = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "Pg1qZvjwNLd";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.nTtZL79a1SI = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "nTtZL79a1SI";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.nTtZL79a1SI = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "nTtZL79a1SI";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi" && 'Vg7NPVpmPvi' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.PDXITHc6Vyg = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "PDXITHc6Vyg";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "PDXITHc6Vyg";
+                        $scope.currentEvent.PDXITHc6Vyg = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi" && 'PDXITHc6Vyg' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.Vg7NPVpmPvi = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "Vg7NPVpmPvi";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.PDXITHc6Vyg = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "PDXITHc6Vyg";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.PDXITHc6Vyg = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "PDXITHc6Vyg";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+
+                }
+
+
+                else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU" && 'TlyT82eTiFU' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.mNjfJCZsWeo = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "mNjfJCZsWeo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "mNjfJCZsWeo";
+                        $scope.currentEvent.mNjfJCZsWeo = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU" && 'mNjfJCZsWeo' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.TlyT82eTiFU = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "TlyT82eTiFU";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+
+                                            $scope.currentEvent.mNjfJCZsWeo = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "mNjfJCZsWeo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+
+                        $scope.currentEvent.mNjfJCZsWeo = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "mNjfJCZsWeo";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD" && 'SnGNuVm0fbD' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.xR90dTvK9UO = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "xR90dTvK9UO";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "xR90dTvK9UO";
+                        $scope.currentEvent.xR90dTvK9UO = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+                else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD" && 'xR90dTvK9UO' == prStDe.dataElement.id)
+                //else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD")
+                {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.SnGNuVm0fbD = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "SnGNuVm0fbD";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                        else 
+                                        {
+                                            
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");
+                                            $scope.currentEvent.xR90dTvK9UO = oldValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "xR90dTvK9UO";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                            
+                                        }
+
+
+
+                                    }
+                                }
+                            })
+                    }
+                    else {							
+                                            
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.xR90dTvK9UO = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "xR90dTvK9UO";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+
+                }
+
+
+                //new DE - 05/07/2021
+                else if (row.cells[3] != undefined && row.id == "row-UTdQahMcNQj" && 'UTdQahMcNQj' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.BNTe3GMCSKF = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "BNTe3GMCSKF";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "BNTe3GMCSKF";
+                        $scope.currentEvent.BNTe3GMCSKF = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-UTdQahMcNQj" && 'BNTe3GMCSKF' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.UTdQahMcNQj = newupdateValue;
+                                            //console.log($scope);
+
+                                            var newvalueDE = "UTdQahMcNQj";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.BNTe3GMCSKF = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "BNTe3GMCSKF";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.BNTe3GMCSKF = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "BNTe3GMCSKF";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }                
+                /* 19/10/2021 - bug  --- starts here
+                if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7" && 'OdcXvW9sRW7' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.aRgVJNx0zUo = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        $scope.currentEvent.aRgVJNx0zUo = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    
+                }
+                ends here --- 19/10/2021 - bug */
+                else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J" && 'aRgVJNx0zUo' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.JoFnbRQT66J = newupdateValue;
+                                            //console.log($scope);
+
+                                            var newvalueDE = "JoFnbRQT66J";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+                
+                
+
+                else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J" && 'JoFnbRQT66J' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.aRgVJNx0zUo = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        $scope.currentEvent.aRgVJNx0zUo = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J" && 'aRgVJNx0zUo' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.JoFnbRQT66J = newupdateValue;
+                                            //console.log($scope);
+                                            var newvalueDE = "JoFnbRQT66J";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                //New DE - 05/07/2021
+                else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J" && 'JoFnbRQT66J' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.aRgVJNx0zUo = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        $scope.currentEvent.aRgVJNx0zUo = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+
+                /*
+                
+                else if (row.cells[3] != undefined && row.id == "row-JoFnbRQT66J" && 'aRgVJNx0zUo' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.JoFnbRQT66J = newupdateValue;
+                                            //console.log($scope);
+
+                                            var newvalueDE = "JoFnbRQT66J";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "aRgVJNx0zUo";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.aRgVJNx0zUo = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "aRgVJNx0zUo";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    
+                }
+
+                */
+
+
+                
+                else if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7" && 'OdcXvW9sRW7' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var cumulativeTotal = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                cumulativeTotal = 1.0 * cumulativeTotal + (dataValue.value) * 1.0;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })														
+                                                }
+
+                                                //}
+                                            }
+                                        })
+
+                                        if (cumulativeTotal > 0) {
+                                            $scope.currentEvent.BupjOLROGnk = cumulativeTotal;
+                                            //console.log($scope);
+                                            var newvalueDE = "BupjOLROGnk";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: cumulativeTotal,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })
+                                        }
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        console.log("value: " + value);
+                        var newvalueDE = "BupjOLROGnk";
+                        $scope.currentEvent.BupjOLROGnk = '';
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: value,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+                else if (row.cells[3] != undefined && row.id == "row-UTdQahMcNQj" && 'BNTe3GMCSKF' == prStDe.dataElement.id) {
+                    if (value != null) {
+                        console.log("value: " + value);
+                        $.getJSON(selectedEntityUrl,
+                            function (json) {
+                                var enrollmentsjson = json;
+                                var newupdateValue = 0;
+                                if (enrollmentsjson.enrollments != undefined) {
+                                    if (enrollmentsjson.enrollments[0].events.length > 0) {
+                                        $.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+                                            if (event.programStage == 'mRDg7F9tAZH') {
+                                                var rowEventDate = new Date(event.eventDate);
+                                                //if (eventToSave.event != event.event ){												
+                                                if (rowEventDate < currentEventDate) {
+                                                    $.each(event.dataValues, function (s, dataValue) {
+                                                        var dataElement = dataValue.dataElement;
+                                                        if (dataElement == prStDe.dataElement.id) {
+                                                            if (dataValue.value != undefined) {
+                                                                var previousCumulativeTotal = row.cells[3].firstChild.innerHTML;
+                                                                if (previousCumulativeTotal == undefined) {
+                                                                    previousCumulativeTotal = 0;
+                                                                }
+                                                                newupdateValue = (dataValue.value) * 1.0 - 1.0 * previousCumulativeTotal;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    })
+
+                                                }
+                                                //}
+                                            }
+                                        })
+
+                                        if (newupdateValue >= 0) {
+                                            $scope.currentEvent.UTdQahMcNQj = newupdateValue;
+                                            //console.log($scope);
+
+                                            var newvalueDE = "UTdQahMcNQj";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: newupdateValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })													
+                                        }
+                                        else 
+                                        {
+                                            alert("ERROR: Cumulative total cannot be less than previous update cumulative total.");	
+                                            
+                                            $scope.currentEvent.BNTe3GMCSKF = oldValue;
+                                            ////console.log($scope);
+                                            var newvalueDE = "BNTe3GMCSKF";
+                                            var ev = {
+                                                event: eventToSave.event,
+                                                orgUnit: eventToSave.orgUnit,
+                                                program: eventToSave.program,
+                                                programStage: eventToSave.programStage,
+                                                status: eventToSave.status,
+                                                geometry: eventToSave.geometry,
+                                                assignedUser: eventToSave.assignedUser,
+                                                trackedEntityInstance: eventToSave.trackedEntityInstance,
+                                                dataValues: [{
+                                                    dataElement: newvalueDE,
+                                                    value: oldValue,
+                                                    providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                                                }]
+                                            };
+
+                                            DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                                            })								
+                                            
+                                        }
+
+                                    }
+                                }
+                            })
+                    }
+                    else {
+                        alert("ERROR: Cumulative total cannot changed to an empty value.");
+                        $scope.currentEvent.BNTe3GMCSKF = oldValue;
+                        //console.log($scope);
+                        var newvalueDE = "BNTe3GMCSKF";
+                        var ev = {
+                            event: eventToSave.event,
+                            orgUnit: eventToSave.orgUnit,
+                            program: eventToSave.program,
+                            programStage: eventToSave.programStage,
+                            status: eventToSave.status,
+                            geometry: eventToSave.geometry,
+                            assignedUser: eventToSave.assignedUser,
+                            trackedEntityInstance: eventToSave.trackedEntityInstance,
+                            dataValues: [{
+                                dataElement: newvalueDE,
+                                value: oldValue,
+                                providedElsewhere: eventToSave.providedElsewhere[newvalueDE] ? true : false
+                            }]
+                        };
+
+                        DHIS2EventFactory.updateForSingleValue(ev).then(function (response) {
+
+                        })
+                    }
+                    $scope.currentEventOriginal = angular.copy($scope.currentEvent);
+                    $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
+                    $rootScope.$broadcast('tei-report-widget', { events: $scope.allEventsSorted });
+                    /*
+                    var el = angular.element(row);
+                    var scope = el.scope();
+                    var $injector = el.injector();
+                    $injector.invoke(function ($compile) {
+                        $compile(el)(scope)
+                    })
+                    */
+                }
+            })		
+   		
+    //03/08/2020 - edit here for adding totals - end here
+    
+
+
+
+
+
+
+            });        
         }
     };
 
@@ -1938,13 +9398,20 @@ trackerCapture.controller('DataEntryController',
             NotificationService.showNotifcationDialog(headerText, bodyText);
             return;
         }
-        var newNote = {value: $scope.note.value};
-            
+
+        var newNote = {value: $scope.note.value, storedDate: today, displayDate: today, storedBy: storedBy};
+        
+        UsersService.getByQuery(storedBy).then( function(users) {
+            if(users.length === 1) {
+                newNote.storedBy = users[0].firstName + ' ' + users[0].lastName;
+            }
+        });   
+
         if (angular.isUndefined($scope.currentEvent.notes)) {
-            $scope.currentEvent.notes = [{value: newNote.value, storedDate: today, displayDate: today, storedBy: storedBy}];
+            $scope.currentEvent.notes = [newNote];
         }
         else {
-            $scope.currentEvent.notes.splice(0, 0, {value: newNote.value, storedDate: today, displayDate: today, storedBy: storedBy});
+            $scope.currentEvent.notes.splice(0, 0, newNote);
         }
 
         var e = {event: $scope.currentEvent.event,
@@ -1952,7 +9419,7 @@ trackerCapture.controller('DataEntryController',
             programStage: $scope.currentEvent.programStage,
             orgUnit: $scope.currentEvent.orgUnit,
             trackedEntityInstance: $scope.currentEvent.trackedEntityInstance,
-            notes: [newNote]
+            notes: [{value: newNote.value}]
         };
 
         DHIS2EventFactory.updateForNote(e).then(function (data) {
@@ -2489,7 +9956,7 @@ trackerCapture.controller('DataEntryController',
                     }
                 }
 
-                CurrentSelection.setSelectedTeiEvents();
+            CurrentSelection.setSelectedTeiEvents($scope.allEventsSorted);
                 
                 broadcastDataEntryControllerData();
                 
@@ -3547,4 +11014,4 @@ trackerCapture.controller('DataEntryController',
             $scope.eventTableOptionsArr[$scope.eventTableOptions[key].sort] = $scope.eventTableOptions[key];
         }
     }
-});
+});
\ No newline at end of file
diff --git a/components/dataentry/new-event-controller.js b/components/dataentry/new-event-controller.js
index 21295a1ec..8a7bebe74 100644
--- a/components/dataentry/new-event-controller.js
+++ b/components/dataentry/new-event-controller.js
@@ -220,6 +220,47 @@ trackerCapture.controller('EventCreationController',
         $scope.orgUnitError =  false;
         
         var newEvents = {events: []};
+
+            /********************
+			25/09/2020 - Get last Update Date and set the value of adding new event - start
+			********************/
+			var newEvent;
+			var reportDate = new Date();   
+			reportDate.setDate(reportDate.getDate());		  
+			var dd = reportDate.getDate();  
+			var mm = reportDate.getMonth() + 1;
+			var yyyy = reportDate.getFullYear();
+			if (dd < 10) {
+			dd = '0' + dd;
+			}
+			if (mm < 10) {
+			mm = '0' + mm;
+			}
+
+			var minutes = reportDate.getMinutes();
+			var hours = reportDate.getHours();
+
+			if (hours < 10) {
+				hours = '0' + hours;
+			}
+
+			if (minutes < 10) {
+					minutes = '0' + minutes;
+			}
+			var timeNow = hours + ":" + minutes;
+			var reportDate = yyyy + '-'+ mm + '-' + dd + 'T'+ timeNow;
+			var eventlastupdatedDateUid = "eszSkeX2wzN";
+			var userIdUid = "LFi3vm9dd5A";
+
+			var SessionStorageService = angular.element('body').injector().get('SessionStorageService');
+			var settings = SessionStorageService.get('USER_PROFILE');	
+			var usernameCurrent = settings.userCredentials.username.toUpperCase();		
+
+			/********************
+			25/09/2020 - Get last Update Date and set the value of adding new event - end
+			********************/	
+
+            /*
         var newEvent = {
             trackedEntityInstance: dummyEvent.trackedEntityInstance,
             program: dummyEvent.program,
@@ -230,6 +271,44 @@ trackerCapture.controller('EventCreationController',
             dataValues: [],
             status: 'ACTIVE'
         };
+
+        */
+
+        if (dummyEvent.programStage == "mRDg7F9tAZH")
+			{	       
+	        newEvent = {
+	            trackedEntityInstance: dummyEvent.trackedEntityInstance,
+	            program: dummyEvent.program,
+	            programStage: dummyEvent.programStage,
+	            enrollment: dummyEvent.enrollment,
+	            orgUnit: dummyEvent.orgUnit,
+				notes: [],
+				//origin dataValues assigned - replaced 25/09/2020
+				//dataValues: [],
+				//25/09/2020 - default event last update date 
+				dataValues: [{"dataElement": eventlastupdatedDateUid, "value": reportDate},
+							 {"dataElement": userIdUid, "value": usernameCurrent}],	
+	            status: 'ACTIVE'
+			};
+				
+			
+			}
+			else 
+			{
+				newEvent = {
+					trackedEntityInstance: dummyEvent.trackedEntityInstance,
+					program: dummyEvent.program,
+					programStage: dummyEvent.programStage,
+					enrollment: dummyEvent.enrollment,
+					orgUnit: dummyEvent.orgUnit,
+					notes: [],
+					//origin dataValues assigned - replaced 25/09/2020
+					//dataValues: [],
+					//25/09/2020 - default event last update date 
+					dataValues: [{"dataElement": eventlastupdatedDateUid, "value": reportDate}],	
+					status: 'ACTIVE'
+				};
+			}
         
         if ($scope.model.selectedStage.periodType) {
             if( $scope.isNewEvent ){
@@ -265,6 +344,685 @@ trackerCapture.controller('EventCreationController',
             if (response && response.response && response.response.importSummaries[0].status === 'SUCCESS') {
                 newEvent.event = response.response.importSummaries[0].reference;
                 $modalInstance.close({dummyEvent: dummyEvent, ev: newEvent});
+
+                		
+			//03/08/2020 - edit here for adding totals - end here
+			
+            var currentEventDetails = $scope.currentEvent;
+			var cumulativeTotal = 0;				
+			var selectedEntityid =  $scope.selectedEntity.trackedEntityInstance;			
+			var selectedEntityUrl = '../api/trackedEntityInstances/'+selectedEntityid + '?paging=false&fields=enrollments[events]&program=JRuLW57woOB&programStatus=ACTIVE';
+            									
+			$('#TableCaptureForm tr').each(function (i, row) {				
+							//console.log('row id: '+ row.id);
+							if (row.cells[3] != undefined && row.id == "row-OdcXvW9sRW7") {								
+								$.getJSON(selectedEntityUrl,
+									function (json) {					
+									var enrollmentsjson = json;
+									var cumulativeTotal = 0;
+									if (enrollmentsjson.enrollments != undefined) {										
+										if (enrollmentsjson.enrollments[0].events.length > 0) {											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'OdcXvW9sRW7') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+							}
+							else if (row.cells[3] != undefined && row.id == "row-sheYRpw3hy5")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'sheYRpw3hy5') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)* 1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';				
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-N9YnWLhO5YT")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'N9YnWLhO5YT') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';				
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-VnHmmfDZRL8")
+							{
+								  var cumulativeTotal = 0.0;
+
+									$.getJSON(selectedEntityUrl,
+									function (json) {		
+									var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'VnHmmfDZRL8') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-bsOhL5gMiA2")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'bsOhL5gMiA2') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);		
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)			
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-lOl69tQ4SsN")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {
+									var cumulativeTotal = 0;					
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'lOl69tQ4SsN') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)				
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-YWT49rK48Kv")
+							{
+									$.getJSON(selectedEntityUrl,
+									function (json) {
+									var cumulativeTotal = 0;					
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'YWT49rK48Kv') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Avuy4qMx47D")
+							{
+								
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'Avuy4qMx47D') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-XE0l3snpzH8" )
+							{							
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'XE0l3snpzH8') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-kL42B2XHokE")
+							{						
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+									var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'kL42B2XHokE') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-xp2cVKbT7z8")
+							{
+							
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {		
+										var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'xp2cVKbT7z8') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-A3h8GTMv3CK")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {		
+										var cumulativeTotal = 0;			
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'A3h8GTMv3CK') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);	
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)				
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+								
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-jfJfoWAp5xb")
+							{
+
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'jfJfoWAp5xb') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Pg1qZvjwNLd")
+							{
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'Pg1qZvjwNLd') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-Vg7NPVpmPvi")
+							{
+								
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'Vg7NPVpmPvi') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+							}
+							else if (row.cells[3] != undefined && row.id == "row-TlyT82eTiFU")
+							{							
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'TlyT82eTiFU') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+
+
+							}
+
+							else if (row.cells[3] != undefined && row.id == "row-SnGNuVm0fbD")
+							{							
+								$.getJSON(selectedEntityUrl,
+									function (json) {	
+										var cumulativeTotal = 0;				
+									var enrollmentsjson = json;
+									if (enrollmentsjson.enrollments != undefined) {
+												
+										if (enrollmentsjson.enrollments[0].events.length > 0) {
+											
+											$.each(enrollmentsjson.enrollments[0].events, function (i, event) {
+												if (event.programStage == 'mRDg7F9tAZH') {
+													$.each(event.dataValues, function (s, dataValue) {
+														var dataElement = dataValue.dataElement;
+														if (dataElement == 'SnGNuVm0fbD') {
+															if (dataValue.value != undefined) {
+																cumulativeTotal = 1.0*cumulativeTotal + (dataValue.value)*1.0;
+																//console.log('event: ' + event.event +'  dataValue: ' + dataValue.value);
+																row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)					
+															}
+															return false;
+														}
+													})
+												}
+											})
+										}
+									}
+									})
+
+								//row.cells[3].innerHTML = '<p style="margin-bottom:.0001pt; padding:0cm 5.4pt 0cm 5.4pt">' + cumulativeTotal + '</p>';	//console.log(row.cells[3].innerHTML)
+								var el = angular.element(row);
+								var scope = el.scope();
+								var $injector = el.injector();
+								$injector.invoke(function ($compile) {
+									$compile(el)(scope)
+								})
+							}
+			})		
+				
+			//03/08/2020 - edit here for adding totals - end here
+			
+
+            
+
             } else {
                 $scope.eventCreationForm.submitted = false;
             }
diff --git a/components/home/home-controller.js b/components/home/home-controller.js
index 35eea747c..56854db9d 100644
--- a/components/home/home-controller.js
+++ b/components/home/home-controller.js
@@ -40,7 +40,7 @@ trackerCapture.controller('HomeController',function(
                 shouldReset: false,
                 disabled: true,
                 onPostLoad: function(){
-                    $rootScope.$broadcast('registrationWidget', {registrationMode: 'REGISTRATION'});
+                    $rootScope.$broadcast('registrationWidget', {registrationMode: 'REGISTRATION', generateAttributes: true});
                }
             },
             lists: {
diff --git a/components/home/search/search-controller.js b/components/home/search/search-controller.js
index 46b6af8c3..707d19fe4 100644
--- a/components/home/search/search-controller.js
+++ b/components/home/search/search-controller.js
@@ -230,14 +230,18 @@ trackerCapture.controller('SearchController',function(
             }
         }
 
-        var openTei = function(tei, fromAudit){
+        var openTei = function(tei, fromAudit, programOwners){
             if($scope.searchingForRelatedTei) {
                 $rootScope.$broadcast('assignRelationshipTei', tei);
             } else {
-                $location.path('/dashboard').search({tei: tei.id,
-                    program: $scope.base.selectedProgramForSearch ? $scope.base.selectedProgramForSearch.id: null,
-                    ou: $scope.selectedOrgUnit.id, 
-                    fromAudit: fromAudit});
+                AccessUtils.withinUserHierarchy(programOwners[0].ownerOrgUnit).then(function(response) {
+                    $location.path('/dashboard').search({tei: tei.id,
+                        program: $scope.base.selectedProgramForSearch ? $scope.base.selectedProgramForSearch.id: null,
+                        ou: response ? programOwners[0].ownerOrgUnit : $scope.selectedOrgUnit.id,
+                        fromAudit: fromAudit});
+                }).catch(function(error) {
+                    console.log("error opening TEI from search modal: ", error);
+                });
             }
         }
 
@@ -309,6 +313,7 @@ trackerCapture.controller('SearchController',function(
 
             return $modal.open({
                 templateUrl: 'components/home/search/result-modal.html',
+                windowClass: 'modal-full-window',
                 controller: function($scope,$modalInstance, TEIGridService,OrgUnitFactory, orgUnit, res, refetchDataFn, internalService, canOpenRegistration, TEIService, NotificationService)
                 {
                     $scope.existingDuplicates = res.existingDuplicates;
@@ -384,7 +389,7 @@ trackerCapture.controller('SearchController',function(
                     $scope.openTei = function(tei){
                         if(internalService.base.selectedProgramForSearch && internalService.base.selectedProgramForSearch.id){
                             TEIService.getWithProgramData(tei.id, internalService.base.selectedProgramForSearch.id, internalService.base.optionSets, internalService.base.attributesById).then(function(resultTei){
-                                $modalInstance.close({ action: "OPENTEI", tei: tei, fromAudit: true});
+                                $modalInstance.close({ action: "OPENTEI", tei: tei, programOwners: resultTei.programOwners, fromAudit: true});
                             }, function(error){
                                 if(error && !error.auditDismissed && error.data && error.data.message){
                                     var headerText = $translate.instant('open_tei_error');
@@ -443,7 +448,7 @@ trackerCapture.controller('SearchController',function(
                 var def = $q.defer();
                 def.resolve();
                 if(res.action === "OPENTEI"){
-                    openTei(res.tei, res.fromAudit);
+                    openTei(res.tei, res.fromAudit, res.programOwners);
                 }else if(res.action === "OPENREGISTRATION")
                 {
                     var registrationPrefill = getRegistrationPrefill(searchGroup);
diff --git a/components/notes/notes-controller.js b/components/notes/notes-controller.js
index b67a4ee16..705bfe70d 100644
--- a/components/notes/notes-controller.js
+++ b/components/notes/notes-controller.js
@@ -9,9 +9,10 @@ trackerCapture.controller('NotesController',
                 CurrentSelection,
                 NotificationService,
                 SessionStorageService,
-                orderByFilter) {
+                orderByFilter,
+                UsersService) {
     var userProfile = SessionStorageService.get('USER_PROFILE');
-    var storedBy = userProfile && userProfile.username ? userProfile.username : '';
+    var storedBy = userProfile && userProfile.userCredentials && userProfile.userCredentials.username ? userProfile.userCredentials.username : '';
 
     var today = DateUtils.getToday();
     
@@ -28,12 +29,21 @@ trackerCapture.controller('NotesController',
             if (!angular.isUndefined($scope.selectedEnrollment.notes)) {
                 $scope.selectedEnrollment.notes = orderByFilter($scope.selectedEnrollment.notes, '-storedDate');
                 angular.forEach($scope.selectedEnrollment.notes, function (note) {
+                    $scope.updateNoteWithRealName(note);
                     note.displayDate = DateUtils.formatFromApiToUser(note.storedDate);
                     note.storedDate = DateUtils.formatToHrsMins(note.storedDate);
                 });
             }
         }
     });
+
+    $scope.updateNoteWithRealName = function(note) {
+        UsersService.getByQuery(note.storedBy).then( function(users) {
+            if(users.length === 1) {
+                note.storedBy = users[0].firstName + ' ' + users[0].lastName;
+            }
+        }); 
+    }
        
     $scope.addNote = function(){
         if(!$scope.note.value){
@@ -41,14 +51,16 @@ trackerCapture.controller('NotesController',
             return;
         }
 
-        var newNote = {value: $scope.note.value};
+        var newNote = {value: $scope.note.value, storedDate: DateUtils.formatFromUserToApi(today), displayDate: today, storedBy: storedBy};
+
+        $scope.updateNoteWithRealName(newNote);
 
         if(angular.isUndefined( $scope.selectedEnrollment.notes) ){
-            $scope.selectedEnrollment.notes = [{value: newNote.value, storedDate: DateUtils.formatFromUserToApi(today), displayDate: today, storedBy: storedBy}];
+            $scope.selectedEnrollment.notes = [newNote];
 
         }
         else{
-            $scope.selectedEnrollment.notes.splice(0,0,{value: newNote.value, storedDate: DateUtils.formatFromUserToApi(today),displayDate: today, storedBy: storedBy});
+            $scope.selectedEnrollment.notes.splice(0,0,newNote);
         }
 
         var e = angular.copy($scope.selectedEnrollment);
@@ -56,7 +68,7 @@ trackerCapture.controller('NotesController',
         if(e.incidentDate){
             e.incidentDate = DateUtils.formatFromUserToApi(e.incidentDate);
         }
-        e.notes = [newNote];
+        e.notes = [{value: newNote.value}];
         EnrollmentService.updateForNote(e).then(function(){
             $scope.clear();
         });
diff --git a/components/profile/profile-controller.js b/components/profile/profile-controller.js
index a7742fca4..3f23c7fe1 100644
--- a/components/profile/profile-controller.js
+++ b/components/profile/profile-controller.js
@@ -46,8 +46,10 @@ trackerCapture.controller('ProfileController',
         listenToBroadCast();
     });
 
-    $scope.$watch('widget.useAsTopBar', function(event, args){
-        listenToBroadCast();
+    $scope.$watch('widget.useAsTopBar', function(newValue, oldValue){
+        if (newValue !== oldValue) {
+            listenToBroadCast();
+        }
     });
     
     //listen to changes in enrollment editing
diff --git a/components/registration/default-registration-form.html b/components/registration/default-registration-form.html
index 8ec6130b6..2b5caad53 100644
--- a/components/registration/default-registration-form.html
+++ b/components/registration/default-registration-form.html
@@ -401,5 +401,8 @@
                 </div>
             </ng-form>            
         </td>
-    </tr>           
+        <td ng-if="uninitializedGeneratedAttribute(attribute)">
+            <button type="button" class="btn btn-default" ng-click="fetchGeneratedAttribute(attribute)">{{'generate' | translate}}</span>
+        </td>
+    </tr>
 </table>
diff --git a/components/registration/duplicate-modal.html b/components/registration/duplicate-modal.html
index 57ab209dd..ef8019c66 100644
--- a/components/registration/duplicate-modal.html
+++ b/components/registration/duplicate-modal.html
@@ -13,7 +13,7 @@ <h3>{{translateWithTEAName('tracked_entity_attributes_already_existing_header',a
     </span>
     <div class="modal-search-bottom-buttons">
         <button class="btn btn-default" data-ng-click="cancel()">{{'back'| translate}}</button>
-        <button type="button" class="btn btn-primary" ng-click="openTei(gridData.rows.own[0])">{{'Open'| translate}}</button>
+        <button type="button" class="btn btn-primary" ng-click="openTei(gridData.rows.own[0])">{{'open'| translate}}</button>
     </div>     
 
 </div>
\ No newline at end of file
diff --git a/components/registration/registration-controller.js b/components/registration/registration-controller.js
index 34c6987d3..453b65c64 100644
--- a/components/registration/registration-controller.js
+++ b/components/registration/registration-controller.js
@@ -41,8 +41,8 @@ trackerCapture.controller('RegistrationController',
     $scope.today = DateUtils.getToday();
     $scope.trackedEntityForm = null;
     $scope.customRegistrationForm = null;    
-    $scope.selectedTei = {};
-    $scope.tei = {};    
+    $scope.selectedTei = {};       // Attribute values in the current form
+    $scope.apiFormattedTei = {};   // API formatted version of $scope.selectedTei; see $scope.registerEntity(...) for details
     $scope.warningMessages = [];
     $scope.hiddenFields = [];    
     $scope.assignedFields = [];
@@ -151,6 +151,9 @@ trackerCapture.controller('RegistrationController',
         }else if(currentTet){
             $scope.trackedEntityTypes.selected = $scope.trackedEntityTypes.writable.find(function(t) { return t.id === currentTet });
             $scope.setTrackedEntityType();
+        } else if($location.search().tracked_entity_type) {
+            $scope.trackedEntityTypes.selected = $scope.trackedEntityTypes.writable.find(function(t) { return t.id === $location.search().tracked_entity_type });
+            $scope.setTrackedEntityType();
         }
     }
 
@@ -213,7 +216,7 @@ trackerCapture.controller('RegistrationController',
             getProgramRules();
 
             if ($scope.registrationMode === 'REGISTRATION') {
-                $scope.getAttributes($scope.registrationMode);
+                $scope.getAttributes($scope.registrationMode, false);
             }
         }
         loadTrackedEntityTypes().then(function(){
@@ -239,13 +242,13 @@ trackerCapture.controller('RegistrationController',
     //listen to modes of registration
     $scope.$on('registrationWidget', function (event, args) {
         $scope.selectedTei = {};
-        $scope.tei = {};
+        $scope.apiFormattedTei = {};
         $scope.registrationMode = args.registrationMode;
         $scope.orgUnitNames = CurrentSelection.getOrgUnitNames();
 
         if ($scope.registrationMode !== 'REGISTRATION') {
             $scope.selectedTei = args.selectedTei || {};
-            $scope.tei = angular.copy(args.selectedTei);
+            $scope.apiFormattedTei = angular.copy(args.selectedTei);
 
             
         }
@@ -260,7 +263,7 @@ trackerCapture.controller('RegistrationController',
                 }
                 for(var key in $scope.registrationPrefill){
                     if($scope.attributesById[key]){
-                        $scope.tei[key] = $scope.selectedTei[key] = $scope.registrationPrefill[key];
+                        $scope.apiFormattedTei[key] = $scope.selectedTei[key] = $scope.registrationPrefill[key];
                         if($scope.searchConfig){
                             var groups = $scope.searchConfig.searchGroupsByAttributeId[key];
                             if(groups){
@@ -284,14 +287,14 @@ trackerCapture.controller('RegistrationController',
 
         }
 
-        $scope.teiOriginal = angular.copy($scope.tei);
-        $scope.teiPreviousValues = angular.copy($scope.tei);
+        $scope.teiOriginal = angular.copy($scope.apiFormattedTei);
+        $scope.teiPreviousValues = angular.copy($scope.apiFormattedTei);
 
         if ($scope.registrationMode === 'PROFILE') {
             $scope.selectedEnrollment = args.enrollment ? args.enrollment : {};
         }
 
-        $scope.getAttributes($scope.registrationMode);
+        $scope.getAttributes($scope.registrationMode, args.generateAttributes);
 
         if ($scope.selectedProgram && $scope.selectedProgram.id) {
             getProgramRules().then( function (rules) {
@@ -300,7 +303,7 @@ trackerCapture.controller('RegistrationController',
         }
     });
 
-    $scope.getAttributes = function (_mode) {
+    $scope.getAttributes = function (_mode, generateAttributes) {
         var mode = _mode ? _mode : 'ENROLLMENT';
         $scope.customRegistrationFormExists = false;
         $scope.customDataEntryForm = null;
@@ -310,10 +313,17 @@ trackerCapture.controller('RegistrationController',
             $scope.selectedEnrollment.coordinate = $scope.selectedEnrollment.coordinate ? $scope.selectedEnrollment.coordinate : {};
         }
 
+        var trackedEntityType = $scope.trackedEntityTypes.selected;
+
         if($scope.selectedProgram){
+            if (!trackedEntityType) {
+                trackedEntityType = $scope.selectedProgram.trackedEntityType;
+            }
             AttributesFactory.getByProgram($scope.selectedProgram).then(function (atts) {
                 $scope.attributes = TEIGridService.generateGridColumns(atts, null, false).columns;
-                fetchGeneratedAttributes();
+                if (generateAttributes) {
+                    fetchGeneratedAttributes();
+                }
                 if ($scope.selectedProgram && $scope.selectedProgram.id) {
                     if ($scope.selectedProgram.dataEntryForm && $scope.selectedProgram.dataEntryForm.htmlCode) {
                         $scope.customRegistrationFormExists = true;
@@ -361,7 +371,6 @@ trackerCapture.controller('RegistrationController',
             });
         }
 
-        var trackedEntityType = $scope.trackedEntityTypes.selected || $scope.selectedProgram.trackedEntityType;
         if(trackedEntityType){
             AttributesFactory.getByTrackedEntityType(trackedEntityType).then(function (atts) {
                 $scope.teTypeAttributesById = {};
@@ -371,8 +380,10 @@ trackerCapture.controller('RegistrationController',
                 
                 if(!$scope.selectedProgram){
                     $scope.attributes = TEIGridService.generateGridColumns(atts, null, false).columns;
+                    if (generateAttributes) {
+                        fetchGeneratedAttributes();
+                    }
                 }
-                fetchGeneratedAttributes();
             });
         }
 
@@ -381,24 +392,32 @@ trackerCapture.controller('RegistrationController',
 
     var fetchGeneratedAttributes = function() {
         angular.forEach($scope.attributes, function(att) {
-            if (att.generated && !$scope.selectedTei[att.id]) {
-                AttributeUtils.generateUniqueValue(att.id, $scope.selectedTei, $scope.selectedProgram, $scope.selectedOrgUnit).then(function (data) {
-                    if (data && data.status === "ERROR") {
-                        NotificationService.showNotifcationDialog($translate.instant("error"), data.message);
-                        $scope.model.autoGeneratedAttFailed = true;
-                    } else {
-                        if (att.valueType === "NUMBER") {
-                            $scope.selectedTei[att.id] = Number(data);
-                        } else {
-                            $scope.selectedTei[att.id] = data;
-                        }
-                        $scope.model.autoGeneratedAttFailed = false;
-                    }
-                });
-            }
+            $scope.fetchGeneratedAttribute(att);
         });
     };
 
+    $scope.fetchGeneratedAttribute = function(att) {
+        if (att.generated && !$scope.selectedTei[att.id]) {
+            AttributeUtils.generateUniqueValue(att.id, $scope.selectedTei, $scope.selectedProgram, $scope.selectedOrgUnit).then(function (data) {
+                if (data && data.status === "ERROR") {
+                    NotificationService.showNotifcationDialog($translate.instant("error"), data.message);
+                    $scope.model.autoGeneratedAttFailed = true;
+                } else {
+                    if (att.valueType === "NUMBER") {
+                        $scope.selectedTei[att.id] = Number(data);
+                    } else {
+                        $scope.selectedTei[att.id] = data;
+                    }
+                    $scope.model.autoGeneratedAttFailed = false;
+                }
+            });
+        }
+    }
+
+    $scope.uninitializedGeneratedAttribute = function(att) {
+        return att.generated && !$scope.selectedTei[att.id];
+    }
+
     var goToDashboard = function (destination, teiId) {
         //reset form
         $scope.selectedTei = {};
@@ -424,7 +443,7 @@ trackerCapture.controller('RegistrationController',
             var bodyText =  $translate.instant("registration_complete");
             NotificationService.showNotifcationDialog(headerText, bodyText);
             $scope.selectedTei = {};
-            $scope.tei = {};
+            $scope.apiFormattedTei = {};
             $scope.currentEvent = {};
             $timeout(function() {
                 $rootScope.$broadcast('registrationWidget', {registrationMode: 'REGISTRATION'});
@@ -432,7 +451,7 @@ trackerCapture.controller('RegistrationController',
         }
     };
 
-    var reloadProfileWidget = function () {
+    var updateCurrentSelection = function() {
         var selections = CurrentSelection.get();
         CurrentSelection.set({
             tei: $scope.selectedTei,
@@ -441,11 +460,15 @@ trackerCapture.controller('RegistrationController',
             pr: $scope.selectedProgram,
             prNames: selections.prNames,
             prStNames: selections.prStNames,
-            enrollments: selections.enrollments,
+            enrollments: $scope.selectedTei.enrollments,
             selectedEnrollment: $scope.selectedEnrollment,
             optionSets: selections.optionSets,
             orgUnit: selections.orgUnit
         });
+    }
+
+    var reloadProfileWidget = function () {
+        updateCurrentSelection();
         $timeout(function () {
             $rootScope.$broadcast('profileWidget', {});
         }, 200);
@@ -461,7 +484,7 @@ trackerCapture.controller('RegistrationController',
     };
 
     $scope.$on('changeOrgUnit', function (event, args) {
-        $scope.tei.orgUnit = args.orgUnit;
+        $scope.apiFormattedTei.orgUnit = args.orgUnit;
     });
 
     var performRegistration = function (destination) {
@@ -471,36 +494,46 @@ trackerCapture.controller('RegistrationController',
 
         //Temp fix for not being able to save images with attribute.value = "" or null.
         var tempAttributes = [];
-        angular.forEach($scope.tei.attributes, function (attribute) {
+        angular.forEach($scope.apiFormattedTei.attributes, function (attribute) {
             if(attribute.value !== '' && attribute.value != null ) {
                 tempAttributes.push(attribute);
             }
         });
 
-        $scope.tei.attributes = tempAttributes;
+        $scope.apiFormattedTei.attributes = tempAttributes;
+
+        $scope.returnUrl;
+        if ( $location.search().returnUrl ) {
+            $scope.returnUrl = $location.search().returnUrl;
+        }
 
-        RegistrationService.registerOrUpdate($scope.tei, $scope.optionSets, $scope.attributesById, $scope.selectedEnrollment.program).then(function (regResponse) {
+        RegistrationService.registerOrUpdate($scope.apiFormattedTei, $scope.optionSets, $scope.attributesById, $scope.selectedEnrollment.program).then(function (regResponse) {
             var reg = regResponse.response.responseType ==='ImportSummaries' ? regResponse.response.importSummaries[0] : regResponse.response.responseType === 'ImportSummary' ? regResponse.response : {};
             if (reg.status === 'SUCCESS') {
-                $scope.tei.trackedEntityInstance = reg.reference;
+                $scope.apiFormattedTei.trackedEntityInstance = reg.reference;
                 
                 if ($scope.registrationMode === 'PROFILE') {
                     reloadProfileWidget();
                     $rootScope.$broadcast('teiupdated', {});
                     $scope.model.savingRegistration = false;
                     if(destination === 'newOrgUnit'){
-                        $scope.selectedEnrollment.orgUnit = $scope.tei.orgUnit;
+                        $scope.selectedEnrollment.orgUnit = $scope.apiFormattedTei.orgUnit;
                         EnrollmentService.update($scope.selectedEnrollment);
                         selection.load();
-                        $location.path('/').search({program: $scope.selectedProgram.id});                 
+                        if($scope.returnUrl) {
+                            $location.path(atob(returnUrl));
+                        } else {
+                            $location.path('/').search({program: $scope.selectedProgram.id}); 
+                        }
                     }
                 }
                 else {
+                    updateCurrentSelection();
                     if ($scope.selectedProgram) {
 
                         //enroll TEI
                         var enrollment = {};
-                        enrollment.trackedEntityInstance = $scope.tei.trackedEntityInstance;
+                        enrollment.trackedEntityInstance = $scope.apiFormattedTei.trackedEntityInstance;
                         enrollment.program = $scope.selectedProgram.id;
                         enrollment.status = 'ACTIVE';
                         enrollment.orgUnit = $scope.selectedOrgUnit.id;
@@ -515,19 +548,19 @@ trackerCapture.controller('RegistrationController',
                             if(enrollmentResponse) {
                                 var en = enrollmentResponse.response;
                                 if (en.status === 'SUCCESS') {
+                                    TEIService.flushCachedTei();
                                     if($scope.registrationMode !== 'ENROLLMENT') {
                                         $scope.model.savingRegistration = false;
                                     }
                                     enrollment.enrollment = en.importSummaries[0].reference;
-                                    $scope.selectedEnrollment = enrollment;
-                                    var avilableEvent = $scope.currentEvent && $scope.currentEvent.event ? $scope.currentEvent : null;
-                                    var dhis2Events = EventUtils.autoGenerateEvents($scope.tei.trackedEntityInstance, $scope.selectedProgram, $scope.selectedOrgUnit, enrollment, avilableEvent);
+                                    var availableEvent = $scope.currentEvent && $scope.currentEvent.event ? $scope.currentEvent : null;
+                                    var dhis2Events = EventUtils.autoGenerateEvents($scope.apiFormattedTei.trackedEntityInstance, $scope.selectedProgram, $scope.selectedOrgUnit, enrollment, availableEvent);
                                     if (dhis2Events.events.length > 0) {
                                         DHIS2EventFactory.create(dhis2Events).then(function () {
-                                            notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                                            notifyRegistrtaionCompletion(destination, $scope.apiFormattedTei.trackedEntityInstance);
                                         });
                                     } else {
-                                        notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                                        notifyRegistrtaionCompletion(destination, $scope.apiFormattedTei.trackedEntityInstance);
                                     }
                                 }
                                 else {
@@ -540,13 +573,13 @@ trackerCapture.controller('RegistrationController',
                         });
                     }
                     else {
-                        notifyRegistrtaionCompletion(destination, $scope.tei.trackedEntityInstance);
+                        notifyRegistrtaionCompletion(destination, $scope.apiFormattedTei.trackedEntityInstance);
                         $scope.model.savingRegistration = false;
                     }
                 }
             }
             else {//update/registration has failed
-                var headerText = $scope.tei && $scope.tei.trackedEntityInstance ? $translate.instant('update_error') :
+                var headerText = $scope.apiFormattedTei && $scope.apiFormattedTei.trackedEntityInstance ? $translate.instant('update_error') :
                                  $translate.instant('registration_error');
                 var bodyText = regResponse.message;
                 NotificationService.showNotifcationDialog(headerText, bodyText);
@@ -642,25 +675,26 @@ trackerCapture.controller('RegistrationController',
         //form is valid, continue the registration
         //get selected entity
         if (!$scope.selectedTei.trackedEntityInstance) {
-            $scope.selectedTei.trackedEntityType = $scope.tei.trackedEntityType = $scope.selectedProgram && $scope.selectedProgram.trackedEntityType && $scope.selectedProgram.trackedEntityType.id ? $scope.selectedProgram.trackedEntityType.id : $scope.trackedEntityTypes.selected.id;
-            $scope.selectedTei.orgUnit = $scope.tei.orgUnit = $scope.selectedOrgUnit.id;
-            $scope.selectedTei.attributes = $scope.tei.attributes = [];
+            $scope.selectedTei.trackedEntityType = $scope.apiFormattedTei.trackedEntityType = $scope.selectedProgram && $scope.selectedProgram.trackedEntityType && $scope.selectedProgram.trackedEntityType.id ? $scope.selectedProgram.trackedEntityType.id : $scope.trackedEntityTypes.selected.id;
+            $scope.selectedTei.orgUnit = $scope.apiFormattedTei.orgUnit = $scope.selectedOrgUnit.id;
+            $scope.selectedTei.attributes = $scope.apiFormattedTei.attributes = [];
         }
-        $scope.tei.geometry = $scope.selectedTei.geometry;
+        $scope.apiFormattedTei.featureType = $scope.selectedTei.featureType;
+        $scope.apiFormattedTei.geometry = $scope.selectedTei.geometry;
         //get tei attributes and their values
         //but there could be a case where attributes are non-mandatory and
         //registration form comes empty, in this case enforce at least one value
-        var result = RegistrationService.processForm($scope.tei, $scope.selectedTei, $scope.teiOriginal, $scope.attributesById);
+        var result = RegistrationService.processForm($scope.apiFormattedTei, $scope.selectedTei, $scope.teiOriginal, $scope.attributesById);
         $scope.formEmpty = result.formEmpty;
-        $scope.tei = result.tei;
+        $scope.apiFormattedTei = result.tei;
 
         if ($scope.formEmpty) {//registration form is empty
             NotificationService.showNotifcationDialog($translate.instant("error"), $translate.instant("form_is_empty_fill_at_least_one"));
             return;
         }
-        if(!destination && $scope.tei) {
-            TEIService.getRelationships($scope.tei.trackedEntityInstance).then(function(result) {
-                $scope.tei.relationships = result;
+        if(!destination && $scope.apiFormattedTei) {
+            TEIService.getRelationships($scope.apiFormattedTei.trackedEntityInstance).then(function(result) {
+                $scope.apiFormattedTei.relationships = result;
                 performRegistration(destination);
             });
         } else {
@@ -685,23 +719,25 @@ trackerCapture.controller('RegistrationController',
 
         if ($scope.selectedProgram && $scope.selectedProgram.id) {
             var eventExists = $scope.currentEvent && $scope.currentEvent.event;
+            var enrollment = $scope.selectedEnrollment && $scope.selectedEnrollment.orgUnit ? $scope.selectedEnrollment : null;
             var evs = null;
             if( eventExists ){
                 evs = {all: [], byStage: {}};
                 evs.all = [$scope.currentEvent];
                 evs.byStage[$scope.currentStage.id] = [$scope.currentEvent];
             }
-            
-            TrackerRulesExecutionService.executeRules(
+            if (eventExists || enrollment) {
+                TrackerRulesExecutionService.executeRules(
                 $scope.allProgramRules, 
                 eventExists ? $scope.currentEvent : 'registration', 
                 evs,
                 $scope.prStDes, 
                 $scope.attributesById,
                 $scope.selectedTei, 
-                $scope.selectedEnrollment, 
+                enrollment,
                 $scope.optionSets, 
                 flag);
+            }
         }
     };
 
@@ -839,7 +875,7 @@ trackerCapture.controller('RegistrationController',
             $scope.errorMessages = {};
             $scope.hiddenSections = [];
 
-            var effectResult = TrackerRulesExecutionService.processRuleEffectAttribute(args.event, $scope.selectedTei, $scope.tei, $scope.currentEvent, {}, $scope.currentEvent, $scope.attributesById, $scope.prStDes,$scope.optionSets, $scope.optionGroupsById);
+            var effectResult = TrackerRulesExecutionService.processRuleEffectAttribute(args.event, $scope.selectedTei, $scope.apiFormattedTei, $scope.currentEvent, {}, $scope.currentEvent, $scope.attributesById, $scope.prStDes,$scope.optionSets, $scope.optionGroupsById);
             $scope.selectedTei = effectResult.selectedTei;
             $scope.currentEvent = effectResult.currentEvent;
             $scope.hiddenFields = effectResult.hiddenFields;
@@ -940,7 +976,7 @@ trackerCapture.controller('RegistrationController',
     };
 
     $scope.cancelRegistrationWarning = function (cancelFunction, inDashboard) {
-        var result = RegistrationService.processForm($scope.tei, $scope.selectedTei, $scope.teiOriginal, $scope.attributesById);
+        var result = RegistrationService.processForm($scope.apiFormattedTei, $scope.selectedTei, $scope.teiOriginal, $scope.attributesById);
         var prStDe;
         if (!result.formChanged) {
             if ($scope.currentStage &&  $scope.currentStage.programStageDataElements) {
@@ -1393,4 +1429,4 @@ trackerCapture.controller('RegistrationController',
     var showTetRegistrationButtons = function(){
         return $scope.trackedEntityTypes.selected && $scope.attributes && $scope.attributes.length > 3;
     }
-});
\ No newline at end of file
+});
diff --git a/components/report/overdue-events-controller.js b/components/report/overdue-events-controller.js
index 7d251ae81..5a5aa2424 100644
--- a/components/report/overdue-events-controller.js
+++ b/components/report/overdue-events-controller.js
@@ -92,58 +92,52 @@ trackerCapture.controller('OverdueEventsController',
     });    
     
     $scope.generateReport = function(){
-        
+
         if($scope.model.selectedProgram && $scope.selectedOuMode){
-            
+
             $scope.reportFinished = false;
-            $scope.reportStarted = true;            
+            $scope.reportStarted = true;
             $scope.overdueEvents = [];
-            
-            EventReportService.getEventReport($scope.selectedOrgUnit.id, $scope.selectedOuMode, $scope.model.selectedProgram.id, null, null, 'ACTIVE','OVERDUE', $scope.pager).then(function(data){                
+
+            EventReportService.getEventReport($scope.selectedOrgUnit.id, $scope.selectedOuMode, $scope.model.selectedProgram.id, null, null, 'ACTIVE','OVERDUE', $scope.pager).then(function(data){
                 if( data ) {
-                    if( data.pager ){
-                        $scope.pager = data.pager;
+                    if (data.eventRows) {
                         $scope.pager.toolBarDisplay = 5;
+                        $scope.pager.recordsCount = data.eventRows.length;
 
-                        Paginator.setPage($scope.pager.page);
-                        Paginator.setPageCount($scope.pager.pageCount);
-                        Paginator.setPageSize($scope.pager.pageSize);
-                        Paginator.setItemCount($scope.pager.total);                    
-                    }
-
-                    angular.forEach(data.eventRows, function(row){
-                        var overdueEvent = {};                    
-                        angular.forEach(row.attributes, function(att){
-                            if( att.attribute && $scope.attributesById[att.attribute] ){
-                                att.value = CommonUtils.formatDataValue(null, att.value, $scope.attributesById[att.attribute], $scope.optionSets, 'USER');                
-                            }
-                            overdueEvent[att.attribute] = att.value;                        
-                        });
+                        angular.forEach(data.eventRows, function(row){
+                            var overdueEvent = {};
+                            angular.forEach(row.attributes, function(att){
+                                if( att.attribute && $scope.attributesById[att.attribute] ){
+                                    att.value = CommonUtils.formatDataValue(null, att.value, $scope.attributesById[att.attribute], $scope.optionSets, 'USER');
+                                }
+                                overdueEvent[att.attribute] = att.value;
+                            });
 
-                        overdueEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
-                        overdueEvent.event = row.event;
-                        overdueEvent.eventName = $scope.programStages[row.programStage].displayName;
-                        overdueEvent.orgUnitName = row.orgUnitName;                    
-                        overdueEvent.followup = row.followup;
-                        overdueEvent.program = row.program;
-                        overdueEvent.programStage = row.programStage;
-                        overdueEvent.trackedEntityInstance = row.trackedEntityInstance;
-                        $scope.overdueEvents.push(overdueEvent);
-
-                    });
+                            overdueEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
+                            overdueEvent.event = row.event;
+                            overdueEvent.eventName = $scope.programStages[row.programStage].displayName;
+                            overdueEvent.orgUnitName = row.orgUnitName;
+                            overdueEvent.followup = row.followup;
+                            overdueEvent.program = row.program;
+                            overdueEvent.programStage = row.programStage;
+                            overdueEvent.trackedEntityInstance = row.trackedEntityInstance;
+                            $scope.overdueEvents.push(overdueEvent);
 
+                        });
+                    }
                     //sort overdue events by their due dates - this is default
                     if(!$scope.sortColumn.id){                                      
                         $scope.sortGrid({id: 'dueDate', displayName: $translate.instant('due_date'), valueType: 'DATE', displayInListNoProgram: false, showFilter: false, show: true});
                         $scope.reverse = false;
                     }
-                }                
+                }
                 $scope.reportFinished = true;
-                $scope.reportStarted = false;                
+                $scope.reportStarted = false;
             });
         }
-    };    
-    
+    };
+
     $scope.generateGridHeader = function(){
         
         if (angular.isObject($scope.model.selectedProgram)){
@@ -268,17 +262,19 @@ trackerCapture.controller('OverdueEventsController',
         return TEIGridService.getHeader($scope.gridColumns);
     };
     
-    $scope.jumpToPage = function(){
+    $scope.onGetPage = function(page){
+        $scope.pager.page = page;
         $scope.generateReport();
     };
-    
-    $scope.resetPageSize = function(){
-        $scope.pager.page = 1;        
+
+    $scope.onChangePageSize = function(newPageSize){
+        $scope.pager.page = 1;
+        $scope.pager.pageSize = newPageSize;
         $scope.generateReport();
     };
-    
-    $scope.getPage = function(page){    
-        $scope.pager.page = page;
+
+    $scope.onChangePage = function(newPage){
+        $scope.pager.page = newPage;
         $scope.generateReport();
     };
 });
\ No newline at end of file
diff --git a/components/report/overdue-events.html b/components/report/overdue-events.html
index 6990103f7..1231f54c2 100644
--- a/components/report/overdue-events.html
+++ b/components/report/overdue-events.html
@@ -112,6 +112,9 @@
                 <div class="alert alert-warning vertical-spacing">
                     {{'no_data_found'| translate}}
                 </div>
+                <div class="hideInPrint">
+                    <serverside-paginator-performant/>
+                </div>
             </div>    
             <div ng-switch-default>
                 <!-- report begins -->
@@ -231,7 +234,9 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!--<serverside-paginator></serverside-paginator>-->
+                    <div class="hideInPrint" ng-if="pager">
+                        <serverside-paginator-performant/>
+                    </div>
                 </div>
 
                 <!-- report ends -->
diff --git a/components/report/program-statistics-controller.js b/components/report/program-statistics-controller.js
index 28ead12ab..1b7dc6034 100644
--- a/components/report/program-statistics-controller.js
+++ b/components/report/program-statistics-controller.js
@@ -64,11 +64,17 @@ trackerCapture.controller('ProgramStatisticsController',
         };
     };
 
+    $scope.limitExceeded = function(entries) {
+        return entries > reportEntriesLimit;        
+    }
+
     $scope.generateReport = function(program, report, ouMode){
         
         $scope.model.selectedProgram = program;
         $scope.report = report;
         $scope.selectedOuMode = ouMode;
+        $scope.enrollmentsReceived = 0;
+        $scope.eventsReceived = 0;
 
         //check for form validity
         $scope.outerForm.submitted = true;        
@@ -83,13 +89,15 @@ trackerCapture.controller('ProgramStatisticsController',
         $scope.enrollments = {active: 0, completed: 0, cancelled: 0};
         $scope.enrollmentList = [];
         EnrollmentService.getByStartAndEndDate($scope.model.selectedProgram.id,
-                                        $scope.selectedOrgUnit.id, 
+                                        $scope.selectedOrgUnit.id,
                                         $scope.selectedOuMode.name,
-                                        DateUtils.formatFromUserToApi($scope.report.startDate), 
-                                        DateUtils.formatFromUserToApi($scope.report.endDate)).then(function(data){
+                                        DateUtils.formatFromUserToApi($scope.report.startDate),
+                                        DateUtils.formatFromUserToApi($scope.report.endDate),
+                                        reportEntriesLimit + 1).then(function(data){
 
             if( data ) {
-                $scope.totalEnrollment = data.enrollments.length;                                
+                $scope.enrollmentsReceived = data.enrollments.length;
+                $scope.totalEnrollment = $scope.enrollmentsReceived;
                 angular.forEach(data.enrollments, function(en){
                     $scope.enrollmentList[en.enrollment] = en;
                     if(en.status === 'ACTIVE'){
@@ -107,9 +115,15 @@ trackerCapture.controller('ProgramStatisticsController',
                                         {key: 'Active', y: $scope.enrollments.active},
                                         {key: 'Cancelled', y: $scope.enrollments.cancelled}];
 
-                DHIS2EventFactory.getByOrgUnitAndProgram($scope.selectedOrgUnit.id, $scope.selectedOuMode.name, $scope.model.selectedProgram.id, null, null).then(function(data){
+                DHIS2EventFactory.getByOrgUnitAndProgram($scope.selectedOrgUnit.id,
+                                            $scope.selectedOuMode.name,
+                                            $scope.model.selectedProgram.id,
+                                            DateUtils.formatFromUserToApi($scope.report.startDate),
+                                            DateUtils.formatFromUserToApi($scope.report.endDate),
+                                            reportEntriesLimit + 1).then(function(data){
                     
                     if( data ) {
+                        $scope.eventsReceived = data.length;
                         $scope.dhis2Events = {completed: 0, active: 0, skipped: 0, overdue: 0, ontime: 0};
                         $scope.totalEvents = 0;
                         angular.forEach(data, function(ev){
@@ -149,5 +163,5 @@ trackerCapture.controller('ProgramStatisticsController',
             $scope.dataReady = true; 
             
         });
-    };    
-});
\ No newline at end of file
+    };
+});
diff --git a/components/report/program-statistics.html b/components/report/program-statistics.html
index ad607e107..d69907e5d 100644
--- a/components/report/program-statistics.html
+++ b/components/report/program-statistics.html
@@ -33,7 +33,8 @@ <h2>{{'program_statistics_report'| translate}}</h2>
         <div class="row col-sm-12">
             <div class="col-sm-6 align-center">
                 <h2>{{'enrollment_stats' | translate}}</h2>
-                <nvd3-pie-chart
+                <div ng-if="enrollmentsReceived===0"> {{'mo_matching_data' | translate}} </div>
+                <nvd3-pie-chart ng-if="!limitExceeded(enrollmentsReceived)" class="empty-event-container"
                     data="enrollmentStat"
                     id="enrollmentChart"
                     width="350"
@@ -44,10 +45,12 @@ <h2>{{'enrollment_stats' | translate}}</h2>
                     tooltips="true">
                         <svg height="200"></svg>
                 </nvd3-pie-chart>
+                <div ng-if="limitExceeded(enrollmentsReceived)" class="alert alert-warning">{{'too_many_items_report' | translate}}</div>
             </div>
             <div class="col-sm-6 align-center">
                 <h2>{{'event_stats' | translate}}</h2>
-                <nvd3-pie-chart
+                <div ng-if="totalEvents===0"> {{'mo_matching_data' | translate}} </div>
+                <nvd3-pie-chart ng-if="!limitExceeded(eventsReceived)" class="empty-event-container"
                     data="eventStat"
                     id="eventChart"
                     width="350"
@@ -58,7 +61,8 @@ <h2>{{'event_stats' | translate}}</h2>
                     tooltips="true">
                         <svg height="200"></svg>
                 </nvd3-pie-chart>
+                <div ng-if="limitExceeded(eventsReceived)" class="alert alert-warning">{{'too_many_items_report' | translate}}</div>
             </div>
-        </div>        
+        </div>
     </div>    
 </div>
\ No newline at end of file
diff --git a/components/report/program-summary-controller.js b/components/report/program-summary-controller.js
index 3f4bdb832..eccaa7398 100644
--- a/components/report/program-summary-controller.js
+++ b/components/report/program-summary-controller.js
@@ -10,11 +10,12 @@ trackerCapture.controller('ProgramSummaryController',
                 ProgramFactory,
                 CurrentSelection,
                 MetaDataFactory,
-                EventReportService) {    
+                EventReportService) {
     $scope.today = DateUtils.getToday();
     
     $scope.ouModes = [{name: 'SELECTED'}, {name: 'CHILDREN'}, {name: 'DESCENDANTS'}, {name: 'ACCESSIBLE'}];         
     $scope.selectedOuMode = $scope.ouModes[0];
+    $scope.pager = { pageSize: reportEntriesLimit + 1, page: 1 };
     $scope.report = {};
     $scope.model = {};
     
@@ -75,7 +76,11 @@ trackerCapture.controller('ProgramSummaryController',
             });            
         }
     });
-    
+
+    $scope.ngSwitchParameter = function() {
+        return $scope.eventRows.length > reportEntriesLimit ? -1 : $scope.teiList.length;
+    }
+
     $scope.generateReport = function(program, report, ouMode){
         
         $scope.model.selectedProgram = program;
@@ -90,6 +95,7 @@ trackerCapture.controller('ProgramSummaryController',
         
         $scope.reportStarted = true;
         $scope.dataReady = false;
+        $scope.eventRows = [];
             
         AttributesFactory.getByProgram($scope.model.selectedProgram).then(function(atts){
             $scope.model.selectedProgram.attributesById = {};
@@ -112,6 +118,7 @@ trackerCapture.controller('ProgramSummaryController',
             $scope.teiList = [];
             
             if( data && data.eventRows ){
+                $scope.eventRows = data.eventRows;
                 angular.forEach(data.eventRows, function(ev){
                     if(ev.trackedEntityInstance){
                         var stage = $scope.stagesById[ev.programStage];
diff --git a/components/report/program-summary.html b/components/report/program-summary.html
index 541210ab8..90d671555 100644
--- a/components/report/program-summary.html
+++ b/components/report/program-summary.html
@@ -30,18 +30,23 @@ <h2>{{'program_summary_report'| translate}}</h2>
     </form>    
     <img src="../images/ajax-loader-bar.gif" ng-if="!dataReady && reportStarted"/>
     <div ng-if="dataReady">
-        <div ng-switch="teiList.length">                    
+        <div ng-switch="ngSwitchParameter()">
             <div ng-switch-when="undefined">
                 <div class="alert alert-warning vertical-spacing">
                     {{'no_data_found'| translate}}
                 </div>
             </div>
-            <div ng-switch-when="0">  
+            <div ng-switch-when="0">
                 <div class="alert alert-warning vertical-spacing">
                     {{'no_data_found'| translate}}
                 </div>
-            </div>    
-            <div ng-switch-default> 
+            </div>
+            <div ng-switch-when="-1">
+                <div class="alert alert-warning vertical-spacing">
+                    {{'too_many_items_report'| translate}}
+                </div>
+            </div>
+            <div ng-switch-default>
 
                 <!-- report begins -->
                 <div class="vertical-spacing">
diff --git a/components/report/upcoming-events-controller.js b/components/report/upcoming-events-controller.js
index 31036cd72..4f80cb545 100644
--- a/components/report/upcoming-events-controller.js
+++ b/components/report/upcoming-events-controller.js
@@ -77,60 +77,55 @@ trackerCapture.controller('UpcomingEventsController',
     });
     
     $scope.generateReport = function(){
-        
+
         //check for form validity
-        $scope.outerForm.submitted = true;        
+        $scope.outerForm.submitted = true;
         if( $scope.outerForm.$invalid || !$scope.model.selectedProgram){
             return false;
         }
-        
+
         $scope.reportFinished = false;
-        $scope.reportStarted = true;        
-        
+        $scope.reportStarted = true;
+
         $scope.upcomingEvents = [];
-        EventReportService.getEventReport($scope.selectedOrgUnit.id, 
-                                        $scope.selectedOuMode, 
-                                        $scope.model.selectedProgram.id, 
-                                        DateUtils.formatFromUserToApi($scope.report.startDate), 
-                                        DateUtils.formatFromUserToApi($scope.report.endDate), 
+        EventReportService.getEventReport($scope.selectedOrgUnit.id,
+                                        $scope.selectedOuMode,
+                                        $scope.model.selectedProgram.id,
+                                        DateUtils.formatFromUserToApi($scope.report.startDate),
+                                        DateUtils.formatFromUserToApi($scope.report.endDate),
                                         'ACTIVE',
-                                        'SCHEDULE', 
-                                        $scope.pager).then(function(data){            
+                                        'SCHEDULE',
+                                        $scope.pager).then(function(data){
             if( data ) {
-                if( data.pager ){
-                    $scope.pager = data.pager;
+                if (data.eventRows) {
                     $scope.pager.toolBarDisplay = 5;
+                    $scope.pager.recordsCount = data.eventRows.length;
 
-                    Paginator.setPage($scope.pager.page);
-                    Paginator.setPageCount($scope.pager.pageCount);
-                    Paginator.setPageSize($scope.pager.pageSize);
-                    Paginator.setItemCount($scope.pager.total);                    
-                }
-
-                angular.forEach(data.eventRows, function(row){
-                    var upcomingEvent = {};
-                    angular.forEach(row.attributes, function(att){
-                        if( att.attribute && $scope.attributesById[att.attribute] ){
-                            att.value = CommonUtils.formatDataValue(null, att.value, $scope.attributesById[att.attribute], $scope.optionSets, 'USER');                
-                        }
-                        upcomingEvent[att.attribute] = att.value;                        
-                    });
+                    angular.forEach(data.eventRows, function(row){
+                        var upcomingEvent = {};
+                        angular.forEach(row.attributes, function(att){
+                            if( att.attribute && $scope.attributesById[att.attribute] ){
+                                att.value = CommonUtils.formatDataValue(null, att.value, $scope.attributesById[att.attribute], $scope.optionSets, 'USER');
+                            }
+                            upcomingEvent[att.attribute] = att.value;
+                        });
 
-                    upcomingEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
-                    upcomingEvent.event = row.event;
-                    upcomingEvent.eventName = $scope.programStages[row.programStage].displayName;                    
-                    upcomingEvent.orgUnitName = row.orgUnitName; 
-                    upcomingEvent.followup = row.followup;
-                    upcomingEvent.program = row.program;
-                    upcomingEvent.programStage = row.programStage;
-                    upcomingEvent.trackedEntityInstance = row.trackedEntityInstance;                
-                    upcomingEvent.created = DateUtils.formatFromApiToUser(row.registrationDate);;
-                    $scope.upcomingEvents.push(upcomingEvent);
+                        upcomingEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
+                        upcomingEvent.event = row.event;
+                        upcomingEvent.eventName = $scope.programStages[row.programStage].displayName;
+                        upcomingEvent.orgUnitName = row.orgUnitName;
+                        upcomingEvent.followup = row.followup;
+                        upcomingEvent.program = row.program;
+                        upcomingEvent.programStage = row.programStage;
+                        upcomingEvent.trackedEntityInstance = row.trackedEntityInstance;
+                        upcomingEvent.created = DateUtils.formatFromApiToUser(row.registrationDate);
+                        $scope.upcomingEvents.push(upcomingEvent);
 
-                });
+                    });
+                }
 
                 //sort upcoming events by their due dates - this is default
-                if(!$scope.sortColumn.id){                                      
+                if(!$scope.sortColumn.id){
                     $scope.sortGrid({id: 'dueDate', displayName: $translate.instant('due_date'), valueType: 'DATE', displayInListNoProgram: false, showFilter: false, show: true});
                     $scope.reverse = false;
                 }
@@ -140,7 +135,7 @@ trackerCapture.controller('UpcomingEventsController',
             $scope.reportStarted = false;
         });
     };
-    
+
     $scope.generateGridHeader = function(){
         
         if (angular.isObject($scope.model.selectedProgram)){
@@ -298,20 +293,22 @@ trackerCapture.controller('UpcomingEventsController',
         return TEIGridService.getHeader($scope.gridColumns);
     };
     
-    $scope.jumpToPage = function(){
+    $scope.onGetPage = function(page){
+        $scope.pager.page = page;
         $scope.generateReport();
     };
-    
-    $scope.resetPageSize = function(){
-        $scope.pager.page = 1;        
+
+    $scope.onChangePageSize = function(newPageSize){
+        $scope.pager.page = 1;
+        $scope.pager.pageSize = newPageSize;
         $scope.generateReport();
     };
-    
-    $scope.getPage = function(page){    
-        $scope.pager.page = page;
+
+    $scope.onChangePage = function(newPage){
+        $scope.pager.page = newPage;
         $scope.generateReport();
     };
-    
+
     $scope.interacted = function(field) {
         var status = false;
         if(field){            
diff --git a/components/report/upcoming-events.html b/components/report/upcoming-events.html
index d8b5946c8..06f0563be 100644
--- a/components/report/upcoming-events.html
+++ b/components/report/upcoming-events.html
@@ -174,6 +174,9 @@
                 <div class="alert alert-warning vertical-spacing">
                     {{'no_data_found'| translate}}
                 </div>
+                <div class="hideInPrint">
+                    <serverside-paginator-performant/>
+                </div>
             </div>    
             <div ng-switch-default>
                 <!-- report begins -->
@@ -278,7 +281,9 @@
                             </tr>
                         </tbody>        
                     </table>
-                    <!--<serverside-paginator></serverside-paginator>-->
+                    <div class="hideInPrint" ng-if="pager">
+                        <serverside-paginator-performant/>
+                    </div>
                 </div>
                 <!-- report ends -->
             </div>
diff --git a/components/teiadd/tei-add-controller.js b/components/teiadd/tei-add-controller.js
index 51be9201f..2ced3206a 100644
--- a/components/teiadd/tei-add-controller.js
+++ b/components/teiadd/tei-add-controller.js
@@ -551,7 +551,6 @@ trackerCapture.controller('TEIAddController',
     $scope.addRelationship = function () {
         if ($scope.addingRelationship) {
             if ($scope.mainTei && $scope.teiForRelationship && $scope.relationship.selected) {
-                var tei = angular.copy($scope.mainTei);
 
                 var relationship = { from: {trackedEntityInstance: {} }, to: {trackedEntityInstance: {}}};
 
@@ -560,39 +559,33 @@ trackerCapture.controller('TEIAddController',
                 relationship.from.trackedEntityInstance.trackedEntityInstance = $scope.selectedConstraints.currentTei === 'fromConstraint' ? $scope.mainTei.trackedEntityInstance : $scope.teiForRelationship.id;
                 relationship.to.trackedEntityInstance.trackedEntityInstance = $scope.selectedConstraints.currentTei === 'toConstraint' ? $scope.mainTei.trackedEntityInstance : $scope.teiForRelationship.id;
 
-                tei.relationships.push(relationship);
-
-                TEIService.update(tei, $scope.optionSets, $scope.attributesById).then(function (response) {
-                    var relationshipResponse = response && response.response && response.response.relationships;
-                    var importSummary = null;
-                    angular.forEach(relationshipResponse.importSummaries, function(importSummaryCandidate){
-                        if( importSummaryCandidate.status === "SUCCESS" && importSummaryCandidate.importCount.imported === 1 )
+                TEIService.saveRelationship(relationship).then(function (response) {
+                    if(response && response.response && response.response.importSummaries && response.response.importSummaries.length == 1){
+                        var importSummary = response.response.importSummaries[0];
+                        if (importSummary.status !== 'SUCCESS') {//update has failed
+                            var message = $translate.instant("saving_relationship_failed_conflicts");
+                            var conflictMessage = importSummary.description;
+                            NotificationService.showNotifcationDialog($translate.instant("saving_relationship_failed"), message +": "+conflictMessage);
+                            return;
+                        }
+                        else
                         {
-                            importSummary = importSummaryCandidate;
+                            relationship.relationshipName = $scope.relationship.selected.displayName;
+                            relationship.relationship = importSummary.reference;
+        
+                            if ($scope.mainTei.relationships) {
+                                $scope.mainTei.relationships.push(relationship);
+                            }
+                            else {
+                                $scope.mainTei.relationships = [relationship];
+                            }
+        
+                            $modalInstance.close($scope.mainTei.relationships);
                         }
-                    });
-                    if(!importSummary){
+                    } else {
                         NotificationService.showNotifcationDialog($translate.instant("unknown_error"), $translate.instant("unknown_error"));
                         return;
                     }
-                    if (importSummary && importSummary.status !== 'SUCCESS') {//update has failed
-                        var message = $translate.instant("saving_relationship_failed_conflicts");
-                        var conflictMessage = importSummary.description;
-                        NotificationService.showNotifcationDialog($translate.instant("saving_relationship_failed"), message +": "+conflictMessage);
-                        return;
-                    }
-
-                    relationship.relationshipName = $scope.relationship.selected.displayName;
-                    relationship.relationship = importSummary.reference;
-
-                    if ($scope.mainTei.relationships) {
-                        $scope.mainTei.relationships.push(relationship);
-                    }
-                    else {
-                        $scope.mainTei.relationships = [relationship];
-                    }
-
-                    $modalInstance.close($scope.mainTei.relationships);
                 });
             }
             else {
diff --git a/core/tracker-capture.js b/core/tracker-capture.js
index e6b601f83..07d80a122 100644
--- a/core/tracker-capture.js
+++ b/core/tracker-capture.js
@@ -26,6 +26,7 @@ var trackedEntityAttributeIds = [];
 var batchSize = 50;
 var programBatchSize = 50;
 var hasAllAccess = false;
+const reportEntriesLimit = 300;
 
 dhis2.tc.store = null;
 dhis2.tc.metaDataCached = dhis2.tc.metaDataCached || false;
@@ -352,7 +353,7 @@ function getBatchPrograms( programs, batch )
     $.ajax( {
         url: DHIS2URL + '/programs.json',
         type: 'GET',
-        data: 'fields=*,dataEntryForm[*],relatedProgram[id,displayName],relationshipType[id,displayName],featureType,trackedEntityType[id,displayName],categoryCombo[id,displayName,isDefault,categories[id,displayName,categoryOptions[id,displayName,organisationUnits[id]]]],organisationUnits[id,displayName],userRoles[id,displayName],programStages[*,dataEntryForm[*],programStageSections[id,displayName,description,sortOrder,dataElements[id]],programStageDataElements[*,dataElement[*,optionSet[id]]]],programTrackedEntityAttributes[*,trackedEntityAttribute[id,unique,orgunitScope]],minAttributesRequiredToSearch,maxTeiCountToReturn&paging=false&filter=id:in:' + ids
+        data: 'restrictToCaptureScope=true&fields=*,dataEntryForm[*],relatedProgram[id,displayName],relationshipType[id,displayName],featureType,trackedEntityType[id,displayName],categoryCombo[id,displayName,isDefault,categories[id,displayName,categoryOptions[id,displayName,organisationUnits[id]]]],organisationUnits[id,displayName],userRoles[id,displayName],programStages[*,dataEntryForm[*],programStageSections[id,displayName,description,sortOrder,dataElements[id]],programStageDataElements[*,dataElement[*,optionSet[id]]]],programTrackedEntityAttributes[*,trackedEntityAttribute[id,unique,orgunitScope]],minAttributesRequiredToSearch,maxTeiCountToReturn&paging=false&filter=id:in:' + ids
     }).done( function( response ){
 
         if(response.programs){
diff --git a/i18n/i18n_app.properties b/i18n/i18n_app.properties
index 724394fc0..2e5636d1f 100644
--- a/i18n/i18n_app.properties
+++ b/i18n/i18n_app.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
 not_yet_enrolled_enrollment=No enrollment exists.
 no_active_enrollment_exists=No active enrollment exist for the selected program
 no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 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
@@ -205,6 +206,7 @@ registered_data=Registered data
 no_value=No value
 no_data_found=No data found
 no_data=No data
+mo_matching_data=No data matching your search criteria
 data_exists=Data exists
 data_registerd=No data registered
 no_visit_made=No visit made
@@ -352,6 +354,7 @@ advanced_search=Advanced search
 profile=Profile
 applications=Apps
 more_applications=More apps
+manage=Manage
 settings=Settings
 account=Account
 help=Help
@@ -575,6 +578,7 @@ top_bar_settings=Top bar settings
 show=Show
 sort_order=Sort order
 activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
 remove_widget=Remove widget?
 remove_widget_info=You are about to remove a widget. Do you want to proceed?
 lock_default_layout=Lock layout for all users
diff --git a/i18n/i18n_app_ar.properties b/i18n/i18n_app_ar.properties
index 055af8373..cfba69634 100644
--- a/i18n/i18n_app_ar.properties
+++ b/i18n/i18n_app_ar.properties
@@ -7,7 +7,7 @@ registering_unit=\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u
 program=\u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c
 tracked_entity=\u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
 tracked_entity_instance=\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
-tracked_entity_attribute=\u062e\u0627\u0635\u064a\u0629 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
+tracked_entity_attribute=\u0633\u0645\u0629 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u0639\u0642\u0628
 select_or_search=\u0627\u0644\u062a\u062d\u062f\u064a\u062f \u0623\u0648 \u0627\u0644\u0628\u062d\u062b \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629
 please_select=\u0631\u062c\u0627\u0621\u064b \u0627\u062e\u062a\u0631
 please_select_a_program=\u0631\u062c\u0627\u0621\u064b \u0627\u062e\u062a\u0631 \u0628\u0631\u0646\u0627\u0645\u062c\u0627\u064b
@@ -23,11 +23,12 @@ not_yet_enrolled_data_entry=\u063a\u064a\u0631 \u0645\u0633\u062c\u0644 \u062d\u
 not_yet_enrolled_enrollment=\u063a\u064a\u0631 \u0645\u0633\u062c\u0644 \u062d\u062a\u0649 \u0627\u0644\u0644\u0622\u0646 . \u0631\u062c\u0627\u0621\u064b \u0633\u062c\u0644
 no_active_enrollment_exists=\u0644\u0627 \u064a\u0648\u062c\u062f \u062a\u0633\u062c\u064a\u0644 \u0646\u0634\u0637 \u0644\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0627\u0644\u0645\u062d\u062f\u062f
 no_active_enrollments_exist=\u0644\u0627 \u064a\u0648\u062c\u062f \u062a\u0633\u062c\u064a\u0644 \u0646\u0634\u0637
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 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
 no_notes_exist=\u0644\u0627 \u062a\u0648\u062c\u062f \u0645\u0644\u0627\u062d\u0638\u0627\u062a
-event=\u0627\u0644\u062d\u062f\u062b
+event=\u062d\u062f\u062b
 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\u062d\u062f\u062f
@@ -57,9 +58,9 @@ latitude_longitude_required=\u064a\u062c\u0628 \u0623\u0646 \u062a\u0643\u0648\u
 future_date_not_allowed=\u063a\u064a\u0631 \u0645\u0633\u0645\u0648\u062d \u0628\u0625\u0636\u0627\u0641\u0629 \u062a\u0627\u0631\u064a\u062e \u0641\u064a \u0627\u0644\u0645\u0633\u062a\u0642\u0628\u0644
 option_required=\u064a\u062c\u0628 \u062a\u062d\u062f\u064a\u062f \u0642\u064a\u0645\u0629 \u0645\u0646 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0646\u0633\u062f\u0644\u0629
 bool_required=\u064a\u062c\u0628 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0627\u0644\u0642\u064a\u0645\u0629 \u0645\u0646\u0637\u0642\u064a\u0629
-name=\u0627\u0644\u0627\u0633\u0645
+name=\u0627\u0644\u0625\u0633\u0645
 filter=\u0639\u0627\u0645\u0644 \u0627\u0644\u062a\u0635\u0641\u064a\u0629
-search=\u0627\u0644\u0628\u062d\u062b
+search=\u0628\u062d\u062b
 _search=\u0627\u0628\u062d\u062b
 search_by_name=\u0627\u0644\u0628\u062d\u062b \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0627\u0633\u0645
 search_by_data_element=\u0627\u0644\u0628\u062d\u062b \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
@@ -67,7 +68,7 @@ search_by_attribute=\u0627\u0644\u0628\u062d\u062b \u0628\u0627\u0633\u062a\u062
 search_for=\u0627\u0628\u062d\u062b \u0639\u0646
 type_your_search_criteria_here=\u062f\u0648\u0650\u0646 \u0645\u0639\u0627\u064a\u064a\u0631 \u0627\u0644\u0628\u062d\u062b \u0647\u0646\u0627
 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
+in_progress=\u0642\u064a\u062f \u0627\u0644\u062a\u0642\u062f\u0645
 registered_entities=\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
@@ -83,7 +84,7 @@ next=\u0627\u0644\u062a\u0627\u0644\u064a
 last=\u0627\u0644\u0623\u062e\u064a\u0631
 go_to_dashboard=\u0627\u0630\u0647\u0628 \u0627\u0644\u0649 \u0644\u0648\u062d\u0629 \u0627\u0644\u0639\u062f\u0627\u062f\u0627\u062a
 go=\u0627\u0646\u062a\u0642\u0627\u0644
-find=\u0628\u062d\u062b
+find=\u0625\u064a\u062c\u0627\u062f
 edit=\u062a\u0639\u062f\u064a\u0644
 edit_profile=\u062a\u0639\u062f\u064a\u0644 \u0645\u0644\u0641 \u0627\u0644\u062a\u0639\u0631\u064a\u0641
 tracker_associate=Tracker associate
@@ -94,15 +95,15 @@ history=\u062a\u0627\u0631\u064a\u062e
 canceled=\u0645\u0644\u063a\u064a
 delete=\u062d\u0630\u0641
 deleted=\u0645\u062d\u0630\u0648\u0641
-remove=\u0625\u0632\u0627\u0644\u0629
+remove=\u0625\u0632\u0644\u0629
 entity=\u0643\u064a\u0627\u0646
 clear=\u0645\u0633\u062d
 add=\u0625\u0636\u0627\u0641\u0629
 add_note=\u0623\u0636\u0641 \u0645\u0644\u0627\u062d\u0638\u0629
 search_note=\u0627\u0628\u062d\u062b \u0639\u0646 \u0645\u0644\u0627\u062d\u0638\u0627\u062a
-your_note_here=\u0633\u062c\u0644 \u0645\u0644\u0627\u062d\u0638\u0627\u062a\u0643 \u0647\u0646\u0627
+your_note_here=\u0627\u062f\u062e\u0644 \u0645\u0644\u0627\u062d\u0638\u0627\u062a\u0643 \u0647\u0646\u0627
 phone_number=\u0631\u0642\u0645 \u0627\u0644\u0647\u0627\u062a\u0641
-your_sms_message_here=\u0633\u062c\u0644 \u0631\u0633\u0627\u0644\u062a\u0643 \u0627\u0644\u0642\u0635\u064a\u0631\u0629 \u0647\u0646\u0627
+your_sms_message_here=\u0627\u062f\u062e\u0644 \u0631\u0633\u0627\u0644\u062a\u0643 \u0627\u0644\u0642\u0635\u064a\u0631\u0629 \u0647\u0646\u0627
 your_email_message_here=\u0627\u062f\u062e\u0644 \u0628\u0631\u064a\u062f\u0643 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0647\u0646\u0627
 sms_send_status=\u062d\u0627\u0644\u0629 \u0627\u0644\u0625\u0631\u0633\u0627\u0644 \u0644\u0644\u0631\u0633\u0627\u0644\u0629 \u0627\u0644\u0642\u0635\u064a\u0631\u0629
 send=\u0625\u0631\u0633\u0627\u0644
@@ -143,9 +144,9 @@ other_programs=\u0628\u0631\u0627\u0645\u062c \u0623\u062e\u0631\u0649
 search_for_dashboard=\u0627\u0628\u062d\u062b \u0639\u0646 \u0639\u0646\u0627\u0635\u0631 \u0644\u0648\u062d\u0629 \u0627\u0644\u0639\u062f\u0627\u062f\u0627\u062a
 dashboard=\u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a
 home=\u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629
-back=\u0644\u0644\u062e\u0644\u0641
+back=\u0627\u0644\u062e\u0644\u0641
 enrollment=\u0627\u0644\u062a\u0633\u062c\u064a\u0644
-enrolling_orgunit=\u0627\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629 \u0627\u0644\u0645\u0633\u062c\u0644\u0629
+enrolling_orgunit=\u0627\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629 \u0627\u0644\u062a\u064a \u062a\u0645 \u0641\u064a\u0647\u0627 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 delete_enrollment=\u0627\u0644\u063a\u0650 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 cancel_enrollment=\u0627\u0644\u063a \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 complete_enrollment=\u0627\u0643\u0645\u0644 \u0627\u0644\u062a\u0633\u062c\u0628\u0644
@@ -153,12 +154,12 @@ reopen_enrollment=\u0625\u0639\u0627\u062f\u0629 \u0641\u062a\u062d \u0627\u0644
 activate_enrollment=\u062a\u0646\u0634\u064a\u0637 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 deactivate_enrollment=\u0627\u0644\u063a\u0627\u0621 \u062a\u0646\u0634\u064a\u0637 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 enrollment_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
-incident_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
-notes=\u0645\u0644\u0627\u062d\u0638\u0627\u062a
+incident_date=\u062a\u0627\u0631\u064a\u062e \u0648\u0642\u0648\u0639 \u0627\u0644\u062d\u062f\u062b
+notes=\u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0627\u062a
 relationship=\u0627\u0644\u0639\u0644\u0627\u0642\u0629
 relationshipTo=\u0627\u0644\u0639\u0644\u0627\u0642\u0627\u062a \u0627\u0644\u0635\u0627\u062f\u0631\u0629
 relationshipFrom=\u0627\u0644\u0639\u0644\u0627\u0642\u0627\u062a \u0627\u0644\u0648\u0627\u0631\u062f\u0629
-relationships=\u0639\u0644\u0627\u0642\u0627\u062a
+relationships=\u0627\u0644\u0639\u0644\u0627\u0642\u0627\u062a
 add_relationship=\u0627\u0636\u0641 \u0639\u0644\u0627\u0642\u0629
 a_is_to_b=\u0623 \u0647\u064a \u0644\u0640 \u0628
 b_is_to_a=\u0628 \u0647\u064a \u0644\u0640 \u0623
@@ -193,7 +194,7 @@ overdue_events_description=\u0627\u0635\u062f\u0631 \u0644\u0627\u0626\u062d\u06
 enrollment_stats=\u0627\u062d\u0635\u0627\u0626\u064a\u0627\u062a \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 event_stats=\u0627\u062d\u0635\u0627\u0626\u064a\u0627\u062a \u0627\u0644\u062d\u062f\u062b
 upcoming_event=\u0627\u0644\u062d\u062f\u062b \u0627\u0644\u062a\u0627\u0644\u064a
-legend=\u0634\u0631\u0648\u062d\u0627\u062a
+legend=\u0645\u0641\u0627\u062a\u064a\u062d \u0625\u064a\u0636\u0627\u062d\u064a\u0629
 event_color_legend=\u0645\u0627\u0630\u0627 \u062a\u0639\u0646\u064a \u0627\u0644\u0623\u0644\u0648\u0627\u0646
 report=\u0627\u0644\u062a\u0642\u0631\u064a\u0631
 _report=\u062a\u0642\u0631\u064a\u0631
@@ -203,8 +204,9 @@ unmark_for_followup=\u0627\u062d\u0630\u0641 \u0645\u0646 \u0627\u0644\u0645\u06
 only_marked_for_followup=\u0641\u0642\u0637 \u0627\u0634\u0650\u0631 \u0639\u0644\u064a\u0647 \u0645\u0646 \u0623\u062c\u0644 \u0627\u0644\u0645\u0644\u062d\u0642
 registered_data=\u0642\u064a\u0645\u0629 \u0645\u0633\u062c\u0644\u0629
 no_value=\u0644\u0627 \u062a\u0648\u062c\u062f \u0642\u064a\u0645\u0629
-no_data_found=\u0644\u0645 \u062a\u0648\u062c\u062f \u0628\u064a\u0627\u0646\u0627\u062a
+no_data_found=\u0644\u0645 \u064a\u062a\u0645 \u0625\u064a\u062c\u0627\u062f \u0628\u064a\u0627\u0646\u0627\u062a
 no_data=\u0644\u0627 \u062a\u0648\u062c\u062f \u0628\u064a\u0627\u0646\u0627\u062a
+mo_matching_data=No data matching your search criteria
 data_exists=\u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0645\u062a\u0648\u0627\u062c\u062f\u0629
 data_registerd=\u0644\u0627 \u062a\u0648\u062c\u062f \u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0633\u062c\u0644\u0629
 no_visit_made=\u0644\u0627 \u062a\u0648\u062c\u062f \u0632\u064a\u0627\u0631\u0627\u062a \u062a\u0627\u0645\u0629
@@ -224,8 +226,8 @@ ACCESSIBLE=\u0627\u0644\u0643\u0644 \u064a\u0645\u0643\u0646 \u0627\u0644\u0648\
 data_element=\u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
 value=\u0627\u0644\u0642\u064a\u0645\u0629
 provided_elsewhere=\u0645\u0632\u0648\u062f\u0629 \u0628\u0645\u0643\u0627\u0646 \u0622\u062e\u0631
-expand=\u0648\u0633\u0650\u0639\\u0645\u062f\u0650\u062f
-collapse=\u0627\u0646\u0647\u064a\u0627\u0631
+expand=\u062a\u0648\u0633\u064a\u0639
+collapse=\u0644\u0645\u0644\u0645\u0629
 show_hide_columns=\u0625\u0638\u0647\u0627\u0631/\u0625\u062e\u0641\u0627\u0621 \u0627\u0644\u0623\u0639\u0645\u062f\u0629
 select_columns_to_show=\u062a\u062d\u062f\u064a\u062f \u0623\u0639\u0645\u062f\u0629 \u0644\u0644\u0625\u0638\u0647\u0627\u0631
 show_hide_widgets=\u0627\u0638\u0647\u0631\\u0627\u062e\u0641\u0650 \u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0627\u0644\u0645\u0635\u063a\u0631\u0629
@@ -247,7 +249,7 @@ xml=XML
 list_programs=\u0627\u062f\u0631\u062c \u0627\u0644\u0628\u0631\u0627\u0645\u062c
 program_stage=\u0645\u0631\u062d\u0644\u0629 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c
 due_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0627\u0633\u062a\u062d\u0642\u0627\u0642
-event_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062d\u062f\u062b
+event_date=\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062d\u062f\u062b
 report_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0642\u0631\u064a\u0631
 enable_rescheduling=\u062a\u0645\u0643\u064a\u0646 \u0627\u0639\u0627\u062f\u0629 \u0627\u0644\u062c\u062f\u0648\u0644\u0629
 disable_rescheduling=\u0639\u062f\u0645 \u062a\u0645\u0643\u064a\u0646 \u0627\u0639\u0627\u062f\u0629 \u0627\u0644\u062c\u062f\u0648\u0644\u0629
@@ -263,17 +265,17 @@ scheduling_messaging=\u0627\u0644\u062c\u062f\u0648\u0644\u0629 \u0648 \u0627\u0
 not_yet_enrolled_scheduling=\u063a\u064a\u0631 \u0645\u0633\u062c\u0644 \u0627\u0644\u0649 \u0627\u0644\u0644\u0622\u0646 . \u0627\u0644\u062c\u062f\u0648\u0644\u0629 \u063a\u064a\u0631 \u0645\u0645\u0643\u0646\u0629
 schedule_details=\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u062c\u062f\u0648\u0644
 no_event_to_schedule=\u0644\u0627 \u062a\u0648\u062c\u062f \u0623\u062d\u062f\u0627\u062b \u0644\u062c\u062f\u0648\u0644\u062a\u0647\u0627
-enroll=\u0633\u062c\u064d\u0644
+enroll=\u062a\u0633\u062c\u064a\u0644
 new_enrollment=\u062a\u0633\u062c\u0628\u0644 \u062c\u062f\u064a\u062f
 start_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0628\u062f\u0627\u064a\u0629
 end_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0646\u0647\u0627\u064a\u0629
 from=\u0645\u0646
-to=\u0627\u0644\u0649
+to=\u0625\u0644\u0649
 exact_date=\u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062f\u0642\u064a\u0642
 exact_value=\u0627\u0644\u0642\u064a\u0645\u0629 \u0627\u0644\u062f\u0642\u064a\u0642\u0629
 EQ=\u0645\u062a\u0633\u0627\u0648\u064a\u0627\u0646  \u0645\u062a\u0633\u0627\u0648\u064a\u0648\u0646
 GT=\u0623\u0643\u0628\u0631 \u0645\u0646
-GE=>\=
+GE=\u0623\u0643\u0628\u0631 \u0645\u0646 \u0623\u0648 \u064a\u0633\u0627\u0648\u064a
 LT=\u0623\u0635\u063a\u0631 \u0645\u0646
 LE=\u0623\u0642\u0644 \u0645\u0646 \u0627\u0644\u0645\u0633\u0627\u0648\u064a
 NE=\u063a\u064a\u0631 \u0645\u0633\u0627\u0648\u064d
@@ -308,7 +310,7 @@ tracker_associate_error=Error in tracker associate assignment
 searching_error=\u062e\u0637\u0623 \u0628\u062d\u062b
 form_invalid=\u0627\u0644\u0646\u0645\u0648\u0630\u062c \u063a\u064a\u0631 \u0635\u0627\u0644\u062d. \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u062d\u0642\u0642 \u0645\u0646 \u0627\u0644\u062d\u0642\u0648\u0644 \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629.
 no_entity_for_tracker_associate_attribute=\u062a\u062d\u062a\u0648\u064a \u0627\u0644\u0633\u0645\u0629 \u0627\u0644\u0645\u062d\u062f\u062f\u0629 \u0639\u0644\u0649 \u0643\u064a\u0627\u0646 \u0645\u062a\u062a\u0628\u0639 \u063a\u064a\u0631 \u0635\u0627\u0644\u062d
-errors=\u0627\u062e\u0637\u0627\u0621
+errors=\u0623\u062e\u0637\u0627\u0621
 error=\u062e\u0637\u0623
 warning=\u062a\u062d\u0630\u064a\u0631
 success=\u0646\u062c\u0627\u062d
@@ -329,17 +331,17 @@ delete_relationship=\u062d\u0630\u0641 \u0627\u0644\u0639\u0644\u0627\u0642\u062
 can_not_delete_relationship=\u0644\u0627 \u064a\u0645\u0643\u0646 \u062d\u0630\u0641 \u0627\u0644\u0639\u0644\u0627\u0642\u0629 \u0628\u0633\u0628\u0628 \u0627\u0641\u062a\u0642\u0627\u0631 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0648\u0635\u0648\u0644 \u0644\u0644\u0643\u062a\u0627\u0628\u0629.
 go_back=\u0631\u062c\u0648\u0639
 cancel=\u0625\u0644\u063a\u0627\u0621
-are_you_sure_to_delete_relationship=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0627\u0644\u0639\u0644\u0627\u0642\u0629\u061f
+are_you_sure_to_delete_relationship=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u0639\u0644\u0627\u0642\u0629\u061f
 are_you_sure_to_delete_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062d\u0630\u0641 \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629 \u061f
-would_you_like_to_complete_enrollment=\u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0643\u0645\u0627\u0644 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062d\u0627\u0644\u064a
+would_you_like_to_complete_enrollment=\u0647\u0644 \u062a\u0631\u064a\u062f \u062a\u062d\u062f\u064a\u062f \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062d\u0627\u0644\u064a \u0643\u0645\u0643\u062a\u0645\u0644\u061f
 are_you_sure_to_complete_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0643\u0645\u0627\u0644 \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629 \u061f
-are_you_sure_to_deactivate_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0627\u0644\u063a\u0627\u0621 \u062a\u0646\u0634\u064a\u0637 \u0627\u0644\u0633\u062c\u0644 \u0627\u0644\u0645\u062d\u062f\u062f\u061f
-are_you_sure_to_activate_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u062a\u0646\u0634\u064a\u0637 \u0627\u0644\u0633\u062c\u0644 \u0627\u0644\u0645\u062d\u062f\u062f\u061f
-are_you_sure_to_reopen_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0625\u0639\u0627\u062f\u0629 \u0641\u062a\u062d \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629\u061f
+are_you_sure_to_deactivate_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u063a\u0627\u0621 \u062a\u0646\u0634\u064a\u0637 \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629\u061f
+are_you_sure_to_activate_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062a\u0646\u0634\u064a\u0637 \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629\u061f
+are_you_sure_to_reopen_enrollment=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0625\u0639\u0627\u062f\u0629 \u0641\u062a\u062d \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u0629\u061f
 are_you_sure_to_delete_event=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062d\u0630\u0641 \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062e\u062a\u0627\u0631 \u061f
 are_you_sure_to_delete_event_with_audit=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062d\u062f\u062f\u061f \u0633\u064a\u0624\u062f\u064a \u0647\u0630\u0627 \u0623\u064a\u0636\u064b\u0627 \u0625\u0644\u0649 \u0625\u0632\u0627\u0644\u0629 \u062c\u0645\u064a\u0639 \u0642\u064a\u0645 \u0627\u0644\u062a\u062f\u0642\u064a\u0642 \u0630\u0627\u062a \u0627\u0644\u0635\u0644\u0629.
 are_you_sure_to_complete_event=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0643\u0645\u0627\u0644 \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062e\u062a\u0627\u0631 \u061f
-please_fix_errors_before_completing=\u064a\u064f\u0631\u062c\u0649 \u0645\u0631\u0627\u062c\u0639\u0629 \u0648\u0625\u0635\u0644\u0627\u062d \u0627\u0644\u0623\u062e\u0637\u0627\u0621 \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0642\u0628\u0644 \u0625\u0643\u0645\u0627\u0644 \u0627\u0644\u062d\u062f\u062b:
+please_fix_errors_before_completing=\u064a\u064f\u0631\u062c\u0649 \u0645\u0631\u0627\u062c\u0639\u0629 \u0648\u0625\u0635\u0644\u0627\u062d \u0627\u0644\u062e\u0637\u0623 (\u0627\u0644\u0623\u062e\u0637\u0627\u0621) \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0642\u0628\u0644 \u0625\u0643\u0645\u0627\u0644 \u0627\u0644\u062d\u062f\u062b:
 are_you_sure_to_incomplete_event=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0639\u062f\u0645 \u0627\u0643\u0645\u0627\u0644 \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062e\u062a\u0627\u0631 \u061f
 are_you_sure_to_skip_event=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062a\u062e\u0637\u064a \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062e\u062a\u0627\u0631 \u061f
 are_you_sure_to_unskip_event=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u062c\u062f\u0648\u0644\u0629 \u0627\u0644\u062d\u062f\u062b \u0627\u0644\u0645\u062e\u062a\u0627\u0631 \u0644\u0644\u0633\u0627\u0628\u0642 \u061f
@@ -349,9 +351,10 @@ will_delete_all_data_associated=\u0633\u064a\u0624\u062f\u064a \u0647\u0630\u062
 more=\u0645\u0632\u064a\u062f
 under_construction=\u0645\u0627\u0632\u0627\u0644 \u0642\u064a\u062f \u0627\u0644\u0627\u0646\u0634\u0627\u0621
 advanced_search=\u0628\u062d\u062b \u0645\u062a\u0642\u062f\u0645
-profile=\u0645\u0644\u0641 \u0627\u0644\u062a\u0639\u0631\u064a\u0641
+profile=\u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a
 applications=\u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a
 more_applications=\u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a
+manage=Manage
 settings=\u0627\u0644\u0625\u0639\u062f\u0627\u062f\u0627\u062a
 account=\u0627\u0644\u062d\u0633\u0627\u0628
 help=\u0645\u0633\u0627\u0639\u062f\u0629
@@ -392,23 +395,23 @@ active_enrollment=\u0641\u0642\u0637 \u0627\u0644\u062a\u064a \u0644\u062f\u064a
 cancelled_enrollment=\u0641\u0642\u0637 \u0627\u0644\u062a\u064a \u0644\u062f\u064a\u0647\u0627 \u062a\u0633\u062c\u064a\u0644 \u062a\u0645 \u0627\u0644\u063a\u0627\u0621\u0647
 completed_enrollment=\u0641\u0642\u0637 \u0627\u0644\u062a\u064a \u0644\u062f\u064a\u0647\u0627 \u062a\u0633\u062c\u064a\u0644 \u0645\u0643\u062a\u0645\u0644
 filter_events=\u062a\u0635\u0641\u064a\u0629 \u0627\u0644\u0623\u062d\u062f\u0627\u062b
-list_events=\u0633\u0631\u062f \u0643\u0627\u0641\u0629 \u0627\u0644\u0623\u062d\u062f\u0627\u062b
+list_events=\u0633\u0631\u062f \u062c\u0645\u064a\u0639 \u0627\u0644\u0623\u062d\u062f\u0627\u062b
 prev_period=\u0627\u0644\u0641\u062a\u0631\u0627\u062a \u0627\u0644\u0633\u0627\u0628\u0642\u0629
 nxt_period=\u0627\u0644\u0641\u062a\u0631\u0627\u062a \u0627\u0644\u062a\u0627\u0644\u064a\u0629
 period=\u0627\u0644\u0641\u062a\u0631\u0629 \u0627\u0644\u0632\u0645\u0646\u064a\u0629
-jan=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-feb=\u0634\u0628\u0627\u0637
-mar=\u0622\u0630\u0627\u0631
-apr=\u0646\u064a\u0633\u0627\u0646
-may=\u0623\u064a\u0627\u0631
-jun=\u062d\u0632\u064a\u0631\u0627\u0646
-jul=\u062a\u0645\u0648\u0632
-aug=\u0622\u0628
-sep=\u0623\u064a\u0644\u0648\u0644
-oct=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-nov=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-dec=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-week=Week
+jan=\u064a\u0646\u0627\u064a\u0631
+feb=\u0641\u0628\u0631\u0627\u064a\u0631
+mar=\u0645\u0627\u0631\u0633
+apr=\u0627\u0628\u0631\u064a\u0644
+may=\u0645\u0627\u064a\u0648
+jun=\u064a\u0648\u0646\u064a\u0648
+jul=\u064a\u0648\u0644\u064a\u0648
+aug=\u0627\u063a\u0633\u0637\u0633
+sep=\u0633\u0628\u062a\u0645\u0628\u0631
+oct=\u0627\u0643\u062a\u0648\u0628\u0631
+nov=\u0646\u0648\u0641\u0645\u0628\u0631
+dec=\u062f\u064a\u0633\u0645\u0628\u0631
+week=\u0623\u0633\u0628\u0648\u0639
 save_layout_as_default=\u062a\u0645 \u062d\u0641\u0638 \u062a\u062e\u0637\u064a\u0637 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0643\u0623\u0641\u062a\u0631\u0627\u0636\u064a
 reset_layout=\u0625\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u062a\u062e\u0637\u064a\u0637 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a
 is_expected_to_be=\u0645\u0646 \u0627\u0644\u0645\u062a\u0648\u0642\u0639 \u0623\u0646 \u064a\u0643\u0648\u0646
@@ -431,12 +434,12 @@ custom_form_has_invalid_attribute=\u064a\u0648\u062c\u062f \u0641\u064a \u0627\u
 custom_form_has_invalid_dataelement=\u064a\u0648\u062c\u062f \u0639\u0646\u0635\u0631 \u0628\u064a\u0627\u0646\u0627\u062a \u063a\u064a\u0631 \u0635\u0627\u0644\u062d \u0641\u064a \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0645\u062e\u0635\u0635.
 events_today_persons=\u0641\u0642\u0637 \u0623\u062d\u062f\u0627\u062b \u0647\u0630\u0627 \u0627\u0644\u064a\u0648\u0645
 section_has_no_dataelements=\u0644\u0627 \u064a\u062d\u062a\u0648\u064a \u0627\u0644\u0642\u0633\u0645 \u0639\u0644\u0649 \u0639\u0646\u0627\u0635\u0631 \u0628\u064a\u0627\u0646\u0627\u062a
-section=\u0627\u0644\u0642\u0633\u0645
+section=\u0642\u0633\u0645
 display_mode=\u0648\u0636\u0639 \u0627\u0644\u0639\u0631\u0636
 tracker_capture_display_mode=Tracker capture display mode
 events_today_all=\u0643\u0644 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0627\u0644\u064a\u0648\u0645
 events_today_completeoractive=\u0625\u0643\u0645\u0627\u0644 \u0623\u0648 \u062a\u0646\u0634\u064a\u0637
-events_today_skipped=\u062a\u0645 \u0627\u0644\u062a\u062e\u0637\u064a
+events_today_skipped=\u0627\u0644\u062a\u064a \u062a\u0645 \u062a\u062e\u0637\u064a\u0647\u0627
 events_today_scheduled=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
 multiple_records_warning=\u062a\u0645 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0633\u062c\u0644\u0627\u062a \u0645\u062a\u0639\u062f\u062f\u0629. \u064a\u0631\u062c\u0649 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0623\u0643\u062b\u0631 \u062a\u062d\u062f\u064a\u062f\u0627.
 result=\u0627\u0644\u0646\u062a\u064a\u062c\u0629
@@ -448,7 +451,7 @@ click_to_edit_view_complete_notes=\u0625\u0646\u0642\u0631 \u0644\u0640 \u062a\u
 complete_and_exit =\u0625\u0643\u0645\u0627\u0644 \u0648\u062e\u0631\u0648\u062c
 are_you_sure_to_cancel_editing=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0625\u0644\u063a\u0627\u0621 \u062a\u062d\u0631\u064a\u0631 \u0647\u0630\u0627 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0634\u062e\u0635\u064a\u061f
 are_you_sure_to_cancel_registration=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0627\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0625\u0644\u063a\u0627\u0621 \u0647\u0630\u0627 \u0627\u0644\u062a\u0633\u062c\u064a\u0644\u061f
-schedule=\u0627\u0644\u062c\u062f\u0648\u0644 \u0627\u0644\u0632\u0645\u0646\u064a
+schedule=\u0627\u0644\u0645\u062c\u062f\u0648\u0644\u0629 \u0632\u0645\u0646\u064a\u0627\u064b
 scheduled_date=\u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0645\u0642\u0631\u0631
 show_new_event_menu=\u0625\u0638\u0647\u0627\u0631 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0627\u0644\u062c\u062f\u064a\u062f\u0629
 no_stages_available=\u062c\u0645\u064a\u0639 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0627\u0644\u0645\u062a\u0648\u0642\u0639\u0629 \u0645\u0648\u062c\u0648\u062f\u0629 \u0645\u0633\u0628\u0642\u0627\u064b\u060c \u0648\u0644\u0627 \u064a\u0645\u0643\u0646 \u0625\u0646\u0634\u0627\u0621 \u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0623\u062d\u062f\u0627\u062b.
@@ -478,19 +481,19 @@ modifiedBy=\u062a\u0645 \u0627\u0644\u062a\u0639\u062f\u064a\u0644 \u0628\u0648\
 audit_history_unavailable=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u062f\u0642\u064a\u0642 \u063a\u064a\u0631 \u0645\u062a\u0648\u0641\u0631
 delete_error_audit=\u062a\u0639\u0630\u0631 \u062d\u0630\u0641 \u0627\u0644\u062d\u062f\u062b \u0644\u0623\u0646\u0647 \u064a\u062d\u062a\u0648\u064a \u0639\u0644\u0649 \u0633\u062c\u0644 \u062a\u062f\u0642\u064a\u0642.
 are_you_sure_to_remove=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0645\u0646 \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u062d\u0630\u0641\u061f
-completed_label=\u0645\u0643\u062a\u0645\u0644
+completed_label=\u0627\u0644\u0645\u0643\u062a\u0645\u0644\u0629
 stage_completed=\u0627\u0644\u062d\u062f\u062b \u0645\u0643\u062a\u0645\u0644
 stage_completed_label=\u0625\u0643\u062a\u0645\u0627\u0644 \u0627\u0644\u0643\u0644
 executed=\u0645\u064f\u0646\u064e\u0641\u064e\u0630
-executed_label=\u0641\u062a\u062d
+executed_label=\u0645\u0641\u062a\u0648\u062d
 stage_executed=\u0627\u0644\u062d\u062f\u062b \u0645\u0641\u062a\u0648\u062d \u0644\u0644\u0625\u062f\u062e\u0627\u0644
 stage_executed_label=Open found
 ontime=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
 ontime_label=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
 stage_ontime=\u062a\u0645\u062a \u0627\u0644\u062c\u062f\u0648\u0644\u0629 \u0627\u0644\u0632\u0645\u0646\u064a\u0629 \u0644\u0644\u062d\u062f\u062b
 stage_ontime_label=Scheduled found
-overdue=\u0645\u062a\u0623\u062e\u0631
-overdue_label=\u0645\u062a\u0623\u062e\u0631
+overdue=\u0627\u0644\u0645\u062a\u0623\u062e\u0631\u0629
+overdue_label=\u0627\u0644\u0645\u062a\u0623\u062e\u0631\u0629
 stage_overdue=\u0627\u0644\u062d\u062f\u062b \u0645\u062a\u0623\u062e\u0631
 stage_overdue_label=\u0648\u062c\u062f \u0645\u062a\u0623\u062e\u0631\u0627\u062a
 skipped=\u062d\u062f\u062b \u062a\u0645 \u062a\u062e\u0637\u064a\u0647
@@ -510,7 +513,7 @@ fill_all_category_options=Please fill all category options
 description=\u0627\u0644\u0648\u0635\u0641
 url=\u0639\u0646\u0648\u0627\u0646 URL
 not_available=\u063a\u064a\u0631 \u0645\u062a\u0648\u0641\u0631
-attribute=\u0627\u0644\u062e\u0627\u0635\u064a\u0629
+attribute=\u0627\u0644\u0633\u0645\u0629
 data_entry=\u0625\u062f\u062e\u0627\u0644 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
 invalid_coordinate_format=\u0635\u064a\u063a\u0629 \u0627\u0644\u0625\u062d\u062f\u0627\u062b\u064a\u0629 \u063a\u064a\u0631 \u0635\u0627\u0644\u062d\u0629
 latitude_longitude_format=\u062e\u0637 \u0627\u0644\u0637\u0648\u0644\u060c \u062e\u0637 \u0627\u0644\u0639\u0631\u0636
@@ -521,7 +524,7 @@ attribute_category_selection=Attribute category selection
 event_filter=\u062a\u0635\u0641\u064a\u0629 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u062d\u0633\u0628 \u0642\u064a\u0645\u0629 \u0639\u0646\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0623\u0648 \u0627\u0633\u0645 \u0627\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629 \u0623\u0648 \u0627\u0644\u0645\u0631\u062d\u0644\u0629
 validation_errors=\u0627\u0644\u0623\u062e\u0637\u0627\u0621 \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u0629 \u062d\u0627\u0644\u064a\u0627\u064b \u0641\u064a \u0627\u0644\u0646\u0645\u0648\u0630\u062c:
 validation_warnings=\u0643\u0646 \u0639\u0644\u0649 \u0628\u064a\u0646\u0629 \u0645\u0646 \u0647\u0630\u0647 \u0627\u0644\u062a\u062d\u0630\u064a\u0631\u0627\u062a:
-openstreetmap=OpenStreetMap
+openstreetmap=\u062e\u0631\u064a\u0637\u0629 OpenStreet
 googlemap=\u062e\u0631\u0627\u0626\u0637 \u062c\u0648\u062c\u0644
 missing_google_map_api_key=\u0645\u0641\u062a\u0627\u062d API \u0644\u062e\u0631\u0627\u0626\u0637 \u062c\u0648\u062c\u0644 \u0645\u0641\u0642\u0648\u062f. \u064a\u0645\u0643\u0646 \u062a\u0647\u064a\u0626\u062a\u0647 \u0645\u0646 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0646\u0638\u0627\u0645 (\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0648\u0635\u0648\u0644).
 missing_mapzen_search_api_key=\u0645\u0641\u062a\u0627\u062d API \u0644\u0644\u0628\u062d\u062b \u0639\u0628\u0631 Mapzen \u063a\u064a\u0631 \u0645\u062a\u0648\u0641\u0631. \u064a\u0645\u0643\u0646 \u062a\u0647\u064a\u0626\u062a\u0647 \u0645\u0646 \u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0646\u0638\u0627\u0645 (\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0648\u0635\u0648\u0644).
@@ -530,7 +533,7 @@ email=\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\
 email_address=\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a
 wrong_email=\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0639\u0646\u0648\u0627\u0646 \u0628\u0631\u064a\u062f \u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0635\u0627\u0644\u062d
 email_subject=\u0627\u0644\u0645\u0648\u0636\u0648\u0639
-message=\u0631\u0633\u0627\u0644\u0629
+message=\u0627\u0644\u0631\u0633\u0627\u0644\u0629
 gridColumns_fetch_failed=\u0641\u0634\u0644 \u062c\u0644\u0628 \u0623\u0639\u0645\u062f\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0644\u0639\u0631\u0636\u0647\u0627
 gridColumns_invalid=\u0623\u0639\u0645\u062f\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0627\u0644\u062a\u064a \u062a\u0645 \u0627\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u064a\u0647\u0627 \u0645\u0646 \u0627\u0644\u062e\u0627\u062f\u0645 \u063a\u064a\u0631 \u0635\u0627\u0644\u062d\u0629
 dasboard_layout_saving_failed=\u0641\u0634\u0644 \u0641\u064a \u062d\u0641\u0638 \u062a\u062e\u0637\u064a\u0637 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a
@@ -542,7 +545,7 @@ failed_to_update_event=\u0641\u0634\u0644 \u0641\u064a \u062a\u062d\u062f\u064a\
 failed_to_send_message=\u0641\u0634\u0644 \u0641\u064a \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0631\u0633\u0627\u0644\u0629
 file_missing=\u0627\u0644\u0645\u0644\u0641 \u0645\u0641\u0642\u0648\u062f
 file_upload_failed=\u0641\u0634\u0644 \u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0645\u0644\u0641
-missing_file_identifier= File identifier is missing
+missing_file_identifier= \u0645\u0639\u0631\u0641 \u0627\u0644\u0645\u0644\u0641 \u0645\u0641\u0642\u0648\u062f
 unsupported_value_type=\u0646\u0648\u0639 \u0627\u0644\u0642\u064a\u0645\u0629 \u063a\u064a\u0631 \u0645\u062f\u0639\u0648\u0645
 event_date_out_of_range=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0627\u062e\u062a\u064a\u0627\u0631 \u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0645\u062d\u062f\u062f. \u0639\u062f\u062f \u0623\u064a\u0627\u0645 \u0627\u0646\u062a\u0647\u0627\u0621 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u062a\u0645 \u062a\u062c\u0627\u0648\u0632\u0647\u0627 \u0645\u0642\u0627\u0631\u0646\u0629 \u0628\u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0630\u064a \u062a\u0645 \u0627\u062e\u062a\u064a\u0627\u0631\u0647
 date_out_of_ou_period=\u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0644\u064a\u0633 \u0636\u0645\u0646 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0628\u062f\u0621 \u0648\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0627\u0646\u062a\u0647\u0627\u0621 \u0644\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629.
@@ -560,7 +563,7 @@ onetime_referral=\u0625\u062d\u0627\u0644\u0629 \u0644\u0645\u0631\u0629 \u0648\
 are_you_sure_you_want_to_move_permanently=\u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u064a\u062f \u0646\u0642\u0644 \u0627\u0644\u0645\u0631\u064a\u0636 \u0628\u0634\u0643\u0644 \u062f\u0627\u0626\u0645\u061f
 ok=\u0645\u0648\u0627\u0641\u0642
 can_not_add_new_enrollment=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0625\u0636\u0627\u0641\u0629 \u062a\u0633\u062c\u064a\u0644 \u062c\u062f\u064a\u062f \u0644\u0623\u0646 \u0647\u0630\u0627 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u064a\u0633\u0645\u062d \u0628\u062a\u0633\u062c\u064a\u0644 \u0648\u0627\u062d\u062f \u0641\u0642\u0637.
-switch_compare_form=\u0627\u0644\u0625\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0645\u0642\u0627\u0631\u0646\u0629
+switch_compare_form=\u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0645\u0642\u0627\u0631\u0646\u0629
 switch_default_form=\u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a
 switch_tabel_form=\u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0627\u0644\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062c\u062f\u0648\u0644\u064a
 url_format=http(s)://
@@ -575,6 +578,7 @@ top_bar_settings=\u0625\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0634\u
 show=\u0625\u0638\u0647\u0627\u0631
 sort_order=\u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0641\u0631\u0632
 activate_top_bar=\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0634\u0631\u064a\u0637 \u0627\u0644\u0639\u0644\u0648\u064a
+use_as_top_bar=Use as top bar
 remove_widget=Remove widget?
 remove_widget_info=\u0623\u0646\u062a \u0639\u0644\u0649 \u0648\u0634\u0643 \u0625\u0632\u0627\u0644\u0629 \u0623\u062f\u0627\u0629. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0644\u0645\u062a\u0627\u0628\u0639\u0629\u061f
 lock_default_layout=\u0642\u0641\u0644 \u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u062a\u062e\u0637\u064a\u0637 \u0639\u0644\u0649 \u0643\u0644 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646
@@ -583,11 +587,11 @@ upload_image=\u062a\u062d\u0645\u064a\u0644
 please_select_an_image=[\u064a\u0631\u062c\u0649 \u062a\u062d\u062f\u064a\u062f \u0635\u0648\u0631\u0629]
 all=\u0627\u0644\u062c\u0645\u064a\u0639
 ALL=\u0627\u0644\u062c\u0645\u064a\u0639
-completed=\u0645\u0643\u062a\u0645\u0644
+completed=\u0627\u0644\u0645\u0643\u062a\u0645\u0644\u0629
 active=\u0641\u0639\u0627\u0644
 cancelled=\u062a\u0645 \u0627\u0644\u0625\u0644\u063a\u0627\u0621
 enrollment_status=\u062d\u0627\u0644\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
-go_to_registration=\u0627\u0644
+go_to_registration=\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 tracked_entity_instance_search_results_header=\u0646\u062a\u0627\u0626\u062c \u0628\u062d\u062b {trackedEntityTypeName}
 tracked_entity_instance_search_matches_description=\u0625\u0630\u0627 \u0644\u0645 \u064a\u0643\u0646 \u0623\u064a \u0645\u0646 \u0627\u0644\u062a\u0637\u0627\u0628\u0642\u0627\u062a \u0623\u0639\u0644\u0627\u0647 \u0647\u0648 {trackedEntityTypeName} \u0627\u0644\u0630\u064a \u062a\u0628\u062d\u062b \u0639\u0646\u0647 \u060c \u0641\u0627\u062e\u062a\u0631 "\u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u0633\u062c\u064a\u0644".
 tracked_entity_instance_unique_found_header=\u062a\u0645 \u0627\u064a\u062c\u0627\u062f {trackedEntityTypeName}
@@ -598,21 +602,21 @@ no_tracked_entity_instance_found_go_to_registration_description=\u0644\u0645 \u0
 tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} \u0645\u0648\u062c\u0648\u062f\u0629 \u0645\u0633\u0628\u0642\u0627\u064b
 tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} \u0645\u0648\u062c\u0648\u062f\u0629 \u0645\u0633\u0628\u0642\u0627\u064b\u060c \u0644\u0640 {trackedEntityTypeName} \u0622\u062e\u0631\u060c \u0647\u0644 \u062a\u0631\u064a\u062f \u0641\u062a\u062d {trackedEntityTypeName}\u061f
 possible_duplicates_found=\u062a\u0645 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u062a\u0643\u0631\u0627\u0631\u0627\u062a \u0645\u062d\u062a\u0645\u0644\u0629.
-view_x_candidates=View {count} candidates
-view_candidate=View candidate
+view_x_candidates=\u0639\u0631\u0636 {count} \u0645\u0631\u0634\u062d\u064b\u0627
+view_candidate=\u0639\u0631\u0636 \u0627\u0644\u0645\u0631\u0634\u062d
 matching_tracked_entity_instance_register_description=\u0627\u0646\u0642\u0631 \u0644\u0641\u062a\u062d \u0623\u064a {trackedEntityTypeName} \u0645\u062a\u0637\u0627\u0628\u0642 \u0623\u0648 \u0627\u0644\u0631\u062c\u0648\u0639 \u0648\u0625\u0646\u0647\u0627\u0621 \u0627\u0644\u062a\u0633\u062c\u064a\u0644.
 review_possible_duplicates_before_registration=\u0631\u0627\u062c\u0639 \u0627\u0644\u062a\u0643\u0631\u0627\u0631\u0627\u062a \u0627\u0644\u0645\u062d\u062a\u0645\u0644\u0629 \u0642\u0628\u0644 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 review_possible_duplicates_description=\u0627\u0641\u062a\u062d \u0623\u064a\u0627\u064b \u0645\u0646 \u0627\u0644\u0645\u0631\u0634\u062d\u064a\u0646 \u0643\u062a\u0643\u0631\u0627\u0631 \u0623\u0639\u0644\u0627\u0647 \u060c \u0623\u0648 \u0627\u0646\u0642\u0631 \u0644\u0644\u062a\u0633\u062c\u064a\u0644 \u0628\u0627\u0633\u0645 {trackedEntityTypeName} \u062c\u062f\u064a\u062f
 register_new_tracked_entity_instance=\u062a\u0633\u062c\u064a\u0644 {trackedEntityTypeName} \u062c\u062f\u064a\u062f
 large_number_of_search_results_warning=\u062a\u0645 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0639\u062f\u062f \u0643\u0628\u064a\u0631 \u0645\u0646 \u0627\u0644\u062a\u0637\u0627\u0628\u0642\u0627\u062a. \u064a\u0631\u062c\u0649 \u0627\u0644\u0631\u062c\u0648\u0639 \u0648\u062a\u0646\u0642\u064a\u062d \u0645\u0639\u0627\u064a\u064a\u0631 \u0627\u0644\u0628\u062d\u062b \u0627\u0644\u062e\u0627\u0635\u0629 \u0628\u0643 \u0623\u0648 \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u062a\u0633\u062c\u064a\u0644.
 too_many_search_results=\u0627\u0644\u0643\u062b\u064a\u0631 \u0645\u0646 \u0646\u062a\u0627\u0626\u062c \u0627\u0644\u0628\u062d\u062b
-open=\u0641\u062a\u062d
+open=\u0645\u0641\u062a\u0648\u062d
 continue=\u0645\u062a\u0627\u0628\u0639\u0629
 no_program_write_access=\u0645\u0637\u0644\u0648\u0628 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0643\u062a\u0627\u0628\u0629 \u0639\u0644\u0649 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0644\u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0631\u0633\u0627\u0626\u0644
 show_all=\u0625\u0638\u0647\u0627\u0631 \u0627\u0644\u0643\u0644
 not_allowed=\u063a\u064a\u0631 \u0645\u0633\u0645\u0648\u062d
 you_do_not_have_the_necessary_authorities_to_delete=\u0644\u064a\u0633 \u0644\u062f\u064a\u0643 \u0627\u0644\u0635\u0644\u0627\u062d\u064a\u0627\u062a \u0627\u0644\u0644\u0627\u0632\u0645\u0629 \u0644\u0644\u062d\u0630\u0641
-this=this
+this=\u0647\u0630\u0627
 delete_failed=\u0641\u0634\u0644 \u0627\u0644\u062d\u0630\u0641
 cannot_delete_this_enrollment_because_it_already_contains_events=\u0644\u0627 \u064a\u0645\u0643\u0646 \u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0644\u0625\u062d\u062a\u0648\u0627\u0621\u0647 \u0639\u0644\u0649 \u0623\u062d\u062f\u0627\u062b. \u064a\u0631\u062c\u0649 \u062d\u0630\u0641 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0642\u0628\u0644 \u062d\u0630\u0641 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 cannot_delete_this_tei_because_it_already_contains_enrollments=\u0644\u0627 \u064a\u0645\u0643\u0646 \u062d\u0630\u0641 \u0646\u0633\u062e\u0629 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639 \u0647\u0630\u0627 \u0644\u0623\u0646\u0647 \u064a\u062d\u062a\u0648\u064a \u0639\u0644\u0649 \u0639\u0645\u0644\u064a\u0627\u062a \u062a\u0633\u062c\u064a\u0644. \u064a\u0631\u062c\u0649 \u062d\u0630\u0641 \u0627\u0644\u062a\u0633\u062c\u064a\u0644\u0627\u062a \u0642\u0628\u0644 \u062d\u0630\u0641 \u0646\u0633\u062e\u0629 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
@@ -624,28 +628,28 @@ stage_write_required=\u0645\u0637\u0644\u0648\u0628 \u0635\u0644\u0627\u062d\u06
 you_need_write_to_program_stage_to_be_able_to_create_event=\u062a\u062d\u062a\u0627\u062c \u0625\u0644\u0649 \u0635\u0644\u0627\u062d\u064a\u0629 \u0627\u0644\u0648\u0635\u0648\u0644 \u0644\u0644\u0643\u062a\u0627\u0628\u0629 \u0644\u0645\u0631\u062d\u0644\u0629 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0647\u0630\u0647 \u0644\u062a\u062a\u0645\u0643\u0646 \u0645\u0646 \u0625\u0646\u0634\u0627\u0621 \u062d\u062f\u062b \u062c\u062f\u064a\u062f
 no_polygon_captured=\u0644\u0645 \u064a\u062a\u0645 \u0627\u0644\u062a\u0642\u0627\u0637 \u0627\u0644\u0645\u0636\u0644\u0639
 polygon_captured=\u062a\u0645 \u0627\u0644\u062a\u0642\u0627\u0637 \u0627\u0644\u0645\u0636\u0644\u0639
-no_geometry_captured=No geometry captured
-geometry=Geometry
-tracked_entity_type=Tracked entity type
+no_geometry_captured=\u0644\u0645 \u064a\u062a\u0645 \u0627\u0644\u062a\u0642\u0627\u0637 \u0623\u064a \u0634\u0643\u0644 \u0647\u0646\u062f\u0633\u064a
+geometry=\u0634\u0643\u0644 \u0647\u0646\u062f\u0633\u064a
+tracked_entity_type=\u0646\u0648\u0639 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
 type=\u0627\u0644\u0646\u0648\u0639
 tracked_entity_type_has_no_attributes=\u0646\u0648\u0639 \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639 \u0644\u064a\u0633 \u0644\u0647 \u0633\u0645\u0627\u062a.
 belongs_to_another_organisation_unit=\u064a\u0646\u062a\u0645\u064a \u0625\u0644\u0649 \u0648\u062d\u062f\u0629 \u062a\u0646\u0638\u064a\u0645\u064a\u0629 \u0623\u062e\u0631\u0649
 please_fill_in_a_reason_for_accessing=\u064a\u0631\u062c\u0649 \u0645\u0644\u0621 \u0633\u0628\u0628 \u0644\u0644\u0648\u0635\u0648\u0644
 your_action_is_being_monitored=Your action is being monitored
-this=this
+this=\u0647\u0630\u0627
 saving_relationship_failed_conflicts=\u0641\u0634\u0644 \u062d\u0641\u0638 \u0627\u0644\u0639\u0644\u0627\u0642\u0629. \u062a\u0639\u0627\u0631\u0636
 saving_relationship_failed=\u0641\u0634\u0644 \u062d\u0641\u0638 \u0627\u0644\u0639\u0644\u0627\u0642\u0629.
 open_tei_error=\u0641\u0634\u0644 \u0641\u062a\u062d TEI
-PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+PROGRAM_ACCESS_CLOSED=\u0644\u0627 \u064a\u0648\u062c\u062f \u0648\u0635\u0648\u0644 \u0625\u0644\u0649 \u0646\u0633\u062e \u0627\u0644\u0643\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0645\u062a\u0639\u0642\u0628\u0629 \u062e\u0627\u0631\u062c \u0648\u062d\u062f\u0627\u062a \u0627\u0644\u062a\u0646\u0638\u064a\u0645 \u0627\u0644\u062a\u064a \u062a\u0645 \u062a\u0639\u064a\u064a\u0646\u0647\u0627 \u0644\u062c\u0645\u0639 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a.
 compare_form_previous=Compare form previous
 compare_form_all=Compare form all
 grid_form=Grid form
 pop_over_form=POP-over form
 failed_to_delete_enrollment=\u0641\u0634\u0644 \u062d\u0630\u0641 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
-enrollment_polygon=Enrollment polygon
-enrollment_point=Enrollment point
-event_polygon=Event polygon
-event_point=Event point
+enrollment_polygon=\u0645\u0636\u0644\u0639 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
+enrollment_point=\u0646\u0642\u0637\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644
+event_polygon=\u0645\u0636\u0644\u0639 \u0627\u0644\u062d\u062f\u062b
+event_point=\u0646\u0642\u0637\u0629 \u0627\u0644\u062d\u062f\u062b
 point_on_map=\u0646\u0642\u0637\u0629 \u0639\u0644\u0649 \u0627\u0644\u062e\u0631\u064a\u0637\u0629
 polygon_on_map=\u0645\u0636\u0644\u0639 \u0639\u0644\u0649 \u0627\u0644\u062e\u0631\u064a\u0637\u0629
 cancel_capturing_polygon=\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062a\u0642\u0627\u0637 \u0627\u0644\u0645\u0636\u0644\u0639
@@ -658,13 +662,13 @@ user_assignment=\u062a\u0639\u064a\u064a\u0646 \u0627\u0644\u0645\u0633\u062a\u0
 specific_users=\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0645\u062d\u062f\u062f\u064a\u0646:
 none=\u0644\u0627 \u0634\u064a\u0621
 any=\u0623\u064a
-no_requirement=No requirement
-the_record_has_is_possible_duplicate=The record has/is possible duplicate
+no_requirement=\u0628\u062f\u0648\u0646 \u0645\u062a\u0637\u0644\u0628\u0627\u062a
+the_record_has_is_possible_duplicate=\u0627\u0644\u0633\u062c\u0644 \u064a\u0645\u0643\u0646 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0645\u0643\u0631\u0631
 flag_possible_duplicate=\u062a\u0639\u0644\u064a\u0645 \u0627\u0644\u062a\u0643\u0631\u0627\u0631 \u0627\u0644\u0645\u062d\u062a\u0645\u0644
 possible_duplicate=\u062a\u0643\u0631\u0627\u0631 \u0645\u062d\u062a\u0645\u0644
 unflag=\u0625\u0632\u0627\u0644\u0629 \u0627\u0644\u0639\u0644\u0627\u0645\u0629
 possible_duplicate_info_start=\u0627\u0644\u062a\u0643\u0631\u0627\u0631 \u0627\u0644\u0645\u062d\u062a\u0645\u0644: \u0647\u0630\u0627
 possible_duplicate_info_end= \u064a\u0643\u0648\u0646\u060c \u0623\u0648 \u0641\u064a\u0647 \u062a\u0643\u0631\u0627\u0631 \u0645\u062d\u062a\u0645\u0644 \u0648\u062a\u0645 \u0648\u0636\u0639 \u0639\u0644\u0627\u0645\u0629 \u0639\u0644\u064a\u0647 \u0644\u0644\u0645\u0631\u0627\u062c\u0639\u0629.
 owned_by=\u0645\u0645\u0644\u0648\u0643 \u0644\u0640 :
-change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+change_date_with_dependency_information=\u0642\u062f \u064a\u062a\u0637\u0644\u0628 \u062a\u062d\u062f\u064a\u062b \u0647\u0630\u0627 \u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0627\u062a\u062e\u0627\u0630 \u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0625\u062c\u0631\u0627\u0621\u0627\u062a \u0645\u0646\u0643. \u062a\u0645\u062a \u062c\u062f\u0648\u0644\u0629 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0641\u064a \u0647\u0630\u0627 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0628\u0646\u0627\u0621\u064b \u0639\u0644\u0649 \u0647\u0630\u0627 \u0627\u0644\u062a\u0627\u0631\u064a\u062e \u060c \u0648 \u0644\u0646 \u062a\u062a\u0645 \u0625\u0639\u0627\u062f\u0629 \u062c\u062f\u0648\u0644\u0629 \u0647\u0630\u0647 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u062a\u0644\u0642\u0627\u0626\u064a\u064b\u0627. \u0647\u0644 \u062a\u0631\u064a\u062f \u0645\u062a\u0627\u0628\u0639\u0629 \u062a\u062d\u062f\u064a\u062b \u0627\u0644\u062a\u0627\u0631\u064a\u062e\u061f
 custom_working_list=Custom working list
diff --git a/i18n/i18n_app_ar_EG.properties b/i18n/i18n_app_ar_EG.properties
new file mode 100644
index 000000000..592fedd7a
--- /dev/null
+++ b/i18n/i18n_app_ar_EG.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Create
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Required
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Name
+filter=Filter
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Jump to page
+page=Page
+first=First
+previous=Previous
+next=Next
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=Find
+edit=Edit
+edit_profile=Edit profile
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Delete
+deleted=deleted
+remove=Remove
+entity=Entity
+clear=Clear
+add=Add
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Complete
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=Status
+event_completed=Event completed?
+details=Click to see details
+_details=Details
+created_by=Registered by
+date=Date
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=Dashboard
+home=Home
+back=Back
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Select
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicators
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Feedback
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=Reports
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=No value
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Organisation unit
+org_unit_scope=Organisation unit scope
+SELECTED=Selected
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Data element
+value=Value
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Close
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=Due date
+event_date=Event date
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Yes
+no=No
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=New
+add_new=Add new
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=Error
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisation unit
+category=Category
+entity_type=Entity type
+save=Save
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Go back
+cancel=Cancel
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Profile
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=Settings
+account=Account
+help=Help
+log_out=Log out
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Period
+jan=\u064a\u0646\u0627\u064a\u0631
+feb=\u0641\u0628\u0631\u0627\u064a\u0631
+mar=\u0645\u0627\u0631\u0633
+apr=\u0627\u0628\u0631\u064a\u0644
+may=\u0645\u0627\u064a\u0648
+jun=\u064a\u0648\u0646\u064a\u0648
+jul=\u064a\u0648\u0644\u064a\u0648
+aug=\u0623\u063a\u0633\u0637\u0633
+sep=\u0633\u0628\u062a\u0645\u0628\u0631
+oct=\u0627\u0643\u062a\u0648\u0628\u0631
+nov=\u0646\u0648\u0641\u0645\u0628\u0631
+dec=\u062f\u064a\u0633\u0645\u0628\u0631
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Main menu
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Description
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=Years
+months=Months
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=All
+ALL=All
+completed=Completed
+active=Active
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=None
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_ar_IQ.properties b/i18n/i18n_app_ar_IQ.properties
new file mode 100644
index 000000000..79e1b0373
--- /dev/null
+++ b/i18n/i18n_app_ar_IQ.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=\u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c
+tracked_entity=Tracked entity
+tracked_entity_instance=\u0646\u0645\u0648\u0630\u062c \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+no_notes_exist=No notes exist
+event=\u0627\u0644\u062d\u062f\u062b
+no_event_is_yet_created=No events are available for data entry. Please create one.
+event_creation=Please create one from below
+not_selected=Not selected
+create=\u0625\u0646\u0634\u0627\u0621
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Required
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=\u0627\u0644\u0627\u0633\u0645
+filter=Filter
+search=\u0627\u0644\u0628\u062d\u062b
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Jump to page
+page=Page
+first=First
+previous=Previous
+next=\u0627\u0644\u062a\u0627\u0644\u064a
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=\u0628\u062d\u062b
+edit=\u062a\u0639\u062f\u064a\u0644
+edit_profile=Edit profile
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=\u062d\u0630\u0641
+deleted=deleted
+remove=\u0625\u0632\u0627\u0644\u0629
+entity=Entity
+clear=\u0645\u0633\u062d
+add=Add
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=\u0645\u0643\u062a\u0645\u0644
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=\u0627\u0644\u062d\u0627\u0644\u0629
+event_completed=Event completed?
+details=Click to see details
+_details=\u0627\u0644\u062a\u0641\u0627\u0635\u064a\u0644
+created_by=Registered by
+date=\u0627\u0644\u062a\u0627\u0631\u064a\u062e
+_date=date
+event_name=Event name
+new_event=\u062d\u062f\u062b \u062c\u062f\u064a\u062f
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=\u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0627\u0644\u0645\u062d\u062f\u062f
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=\u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a
+home=\u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629
+back=Back
+enrollment=\u0627\u0644\u062a\u0633\u062c\u064a\u0644
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
+incident_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=\u0639\u0644\u0627\u0642\u0627\u062a
+add_relationship=\u0627\u0636\u0641 \u0639\u0644\u0627\u0642\u0629
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=\u062a\u062d\u062f\u064a\u062f
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=\u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062a
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u0627\u0644\u062a\u063a\u0630\u064a\u0629 \u0627\u0644\u0631\u0627\u062c\u0639\u0629
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=\u0627\u0644\u062a\u0642\u0627\u0631\u064a\u0631
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=No value
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=\u0627\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629
+org_unit_scope=Organisation unit scope
+SELECTED=\u0645\u062d\u062f\u062f
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Data element
+value=\u0627\u0644\u0642\u064a\u0645\u0629
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=\u0625\u063a\u0644\u0627\u0642
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0627\u0633\u062a\u062d\u0642\u0627\u0642
+event_date=\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062d\u062f\u062b
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=\u0645\u0646
+to=\u0627\u0644\u0649
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=\u0625\u0639\u062c\u0627\u0628
+not_like=Not like
+boolean=Boolean
+yes=\u0646\u0639\u0645
+no=\u0644\u0627
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=\u062c\u062f\u064a\u062f
+add_new=\u0625\u0636\u0627\u0641\u0629 \u062c\u062f\u064a\u062f
+registration=\u0627\u0644\u062a\u0633\u062c\u064a\u0644
+registration_date=Registration date
+register=\u062a\u0633\u062c\u064a\u0644
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=\u0627\u062e\u0637\u0627\u0621
+error=\u062e\u0637\u0623
+warning=\u062a\u062d\u0630\u064a\u0631
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=\u0627\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629
+category=Category
+entity_type=Entity type
+save=\u062d\u0641\u0638
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Go back
+cancel=\u0625\u0644\u063a\u0627\u0621
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u0645\u0644\u0641 \u0627\u0644\u062a\u0639\u0631\u064a\u0641
+applications=\u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a
+more_applications=More apps
+manage=Manage
+settings=Settings
+account=Account
+help=Help
+log_out=Log out
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=\u0636\u0628\u0637 \u0627\u0644\u0625\u062d\u062f\u0627\u062b\u064a\u0629
+coordinate=\u0627\u0644\u0625\u062d\u062f\u0627\u062b\u064a\u0629
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Period
+jan=January
+feb=February
+mar=March
+apr=April
+may=May
+jun=June
+jul=July
+aug=August
+sep=September
+oct=October
+nov=November
+dec=December
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=\u062a\u0645 \u0627\u0644\u062a\u062e\u0637\u064a
+events_today_scheduled=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Main menu
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=\u062a\u0645 \u0627\u0644\u0625\u0646\u0634\u0627\u0621
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=\u0645\u0643\u062a\u0645\u0644
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=\u0641\u062a\u062d
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
+ontime_label=\u062a\u0645\u062a \u062c\u062f\u0648\u0644\u062a\u0647
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=\u0645\u062a\u0623\u062e\u0631
+overdue_label=\u0645\u062a\u0623\u062e\u0631
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=\u0627\u0644\u0648\u0635\u0641
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=\u0627\u0644\u0633\u0646\u0648\u0627\u062a
+months=\u0627\u0644\u0623\u0634\u0647\u0631
+days=\u200f\u200f\u0627\u0644\u0623\u064a\u0627\u0645
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=\u062a\u0631\u062a\u064a\u0628 \u0627\u0644\u0641\u0631\u0632
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=\u0627\u0644\u062c\u0645\u064a\u0639
+ALL=\u0627\u0644\u062c\u0645\u064a\u0639
+completed=\u0645\u0643\u062a\u0645\u0644
+active=\u0641\u0639\u0627\u0644
+cancelled=\u062a\u0645 \u0627\u0644\u0625\u0644\u063a\u0627\u0621
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=\u0641\u062a\u062d
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=\u0625\u0638\u0647\u0627\u0631 \u0627\u0644\u0643\u0644
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0645\u0639\u064a\u0646
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=\u0644\u0627 \u0634\u064a\u0621
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_bn.properties b/i18n/i18n_app_bn.properties
index 572435f88..8eb847c18 100644
--- a/i18n/i18n_app_bn.properties
+++ b/i18n/i18n_app_bn.properties
@@ -1,56 +1,623 @@
-online_notification=\u0987\u09A8\u09CD\u099F\u09BE\u09B0\u09A8\u09C7\u099F \u0986\u099B\u09C7
-offline_notification=\u0987\u09A8\u09CD\u099F\u09BE\u09B0\u09A8\u09C7\u099F \u09A8\u09C7\u0987
-login_failed=\u09B2\u0997\u0987\u09A8 \u09B8\u09AB\u09B2 \u09B9\u09AF\u09BC\u09A8\u09BF. \u0986\u09AA\u09A8\u09BE\u09B0 \u0987\u0989\u099C\u09BE\u09B0 \u0986\u0987\u09A1\u09BF \u098F\u09AC\u0982 \u09AA\u09BE\u09B8\u0993\u09AF\u09BC\u09BE\u09B0\u09CD\u09A1 \u09A0\u09BF\u0995 \u0995\u09B0\u09C7 \u09B2\u09BF\u0996\u09C1\u09A8\u0964
-registering_unit=\u09A8\u09BF\u09AC\u09A8\u09CD\u09A7\u09A8 \u0995\u09C7\u09A8\u09CD\u09A6\u09CD\u09B0
-program=\u09AA\u09CD\u09B0\u09CB\u0997\u09CD\u09B0\u09BE\u09AE
-select_or_search=\u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09A8 \u0995\u09B0\u09C1\u09A8
-please_select=\u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09A8 \u0995\u09B0\u09C1\u09A8
-please_select_a_program=\u09AA\u09CD\u09B0\u09CB\u0997\u09CD\u09B0\u09BE\u09AE \u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09A8 \u0995\u09B0\u09C1\u09A8
-value_must_be_int=\u0985\u09AC\u09B6\u09CD\u09AF\u0987 \u09B8\u0982\u0996\u09CD\u09AF\u09BE \u09B9\u09A4\u09C7 \u09B9\u09AC\u09C7
-search_for=\u0985\u09A8\u09C1\u09B8\u09A8\u09CD\u09A7\u09BE\u09A8
-empty=\u0996\u09BE\u09B2\u09BF
-no_event_exists=\u0995\u09CB\u09A8\u09CB \u09A4\u09A5\u09CD\u09AF \u09A8\u09C7\u0987
-total_number_of_pages=\u09AA\u09C3\u09B7\u09CD\u09A0\u09BE \u09B8\u0982\u0996\u09CD\u09AF\u09BE
-rows_per_page=\u09AA\u09CD\u09B0\u09A4\u09BF \u09AA\u09C3\u09B7\u09CD\u09A0\u09BE\u09B0 \u09B8\u09BE\u09B0\u09BF \u09B8\u0982\u0996\u09CD\u09AF\u09BE
-jump_to_page=\u09AA\u09C3\u09B7\u09CD\u09A0\u09BE\u09AF\u09BC \u09AF\u09BE\u09A8:
-previous=\u09AA\u09C2\u09B0\u09CD\u09AC\u09AC\u09B0\u09CD\u09A4\u09C0
-edit_profile=\u09AA\u09CD\u09B0\u09CB\u09AB\u09BE\u0987\u09B2 \u09B8\u09AE\u09CD\u09AA\u09BE\u09A6\u09A8 \u0995\u09B0\u09C1\u09A8
-deleted=\u09AE\u09C1\u099B\u09C7 \u09AB\u09C7\u09B2\u09BE \u09B9\u09DF\u09C7\u099B\u09C7
-add=\u09AF\u09CB\u0997 \u0995\u09B0\u09C1\u09A8
-incomplete=\u0985\u09B8\u09AE\u09CD\u09AA\u09C2\u09B0\u09CD\u09A3
-status=\u0985\u09AC\u09B8\u09CD\u09A5\u09BE
-date=\u09A4\u09BE\u09B0\u09BF\u0996
-selected_program=\u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09BF\u09A4 \u09AA\u09CD\u09B0\u09CB\u0997\u09CD\u09B0\u09BE\u09AE
-other_programs=\u0985\u09A8\u09CD\u09AF\u09BE\u09A8\u09CD\u09AF \u09AA\u09CD\u09B0\u09CB\u0997\u09CD\u09B0\u09BE\u09AE
-enrollment=\u09A8\u09BF\u09AC\u09A8\u09CD\u09A7\u09A8
-enrolling_orgunit=\u09A8\u09BF\u09AC\u09A8\u09CD\u09A7\u09A8\u09C7\u09B0 \u09B8\u09CD\u09A5\u09BE\u09A8
-enrollment_date=\u09A8\u09BF\u09AC\u09A8\u09CD\u09A7\u09A8\u09C7\u09B0 \u09A4\u09BE\u09B0\u09BF\u0996
-notes=\u09AE\u09A8\u09CD\u09A4\u09AC\u09CD\u09AF
-due_date=\u09A8\u09BF\u09B0\u09CD\u09A7\u09BE\u09B0\u09BF\u09A4 \u09A4\u09BE\u09B0\u09BF\u0996
-report_date=\u09AA\u09B0\u09BF\u09A6\u09B0\u09CD\u09B6\u09A8\u09C7\u09B0 \u09A4\u09BE\u09B0\u09BF\u0996
-yes=\u09B9\u09CD\u09AF\u09BE\u0981
-no=\u09A8\u09BE
-registration_date=\u09B0\u09C7\u099C\u09BF\u09B8\u09CD\u099F\u09CD\u09B0\u09C7\u09B6\u09A8\u09C7\u09B0 \u09A4\u09BE\u09B0\u09BF\u0996
-are_you_sure_to_delete_event=\u0986\u09AA\u09A8\u09BF \u0995\u09BF \u09A8\u09BF\u09B6\u09CD\u099A\u09BF\u09A4 \u0986\u09AA\u09A8\u09BF \u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09BF\u09A4 \u09A1\u09BE\u099F\u09BE \u09AE\u09C1\u099B\u09C7 \u09AB\u09C7\u09B2\u09A4\u09C7 \u099A\u09BE\u09A8?
-are_you_sure_to_incomplete_event=\u0986\u09AA\u09A8\u09BF \u0995\u09BF \u09A8\u09BF\u09B6\u09CD\u099A\u09BF\u09A4 \u0986\u09AA\u09A8\u09BF \u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09BF\u09A4 \u09A4\u09A5\u09CD\u09AF \u09AE\u09C1\u099B\u09C7 \u09AB\u09C7\u09B2\u09A4\u09C7 \u099A\u09BE\u09A8?
-profile=\u09AA\u09CD\u09B0\u09CB\u09AB\u09BE\u0987\u09B2
-inactive=\u09AB\u09B2\u09CB\u0986\u09AA \u09B8\u09AE\u09CD\u09AA\u09A8\u09CD\u09A8?
-no_record_found=\u0995\u09CB\u09A8 \u09B0\u09C7\u0995\u09B0\u09CD\u09A1 \u09AA\u09BE\u0993\u09AF\u09BC\u09BE \u09AF\u09BE\u09AF\u09BC\u09A8\u09BF
-are_you_sure_to_cancel_editing=\u098F\u0987 \u09AA\u09CD\u09B0\u09CB\u09AB\u09BE\u0987\u09B2\u099F\u09BF \u09B8\u09AE\u09CD\u09AA\u09BE\u09A6\u09A8 \u0995\u09B0\u09BE \u09AC\u09BE\u09A6 \u09A6\u09C7\u09AC\u09BE\u09B0 \u09AC\u09BF\u09B7\u09AF\u09BC\u09C7 \u0995\u09BF \u0986\u09AA\u09A8\u09BF \u09A8\u09BF\u09B6\u09CD\u099A\u09BF\u09A4?
-scheduled_date=\u09AA\u09B0\u09AC\u09B0\u09CD\u09A4\u09C0 \u09AD\u09BF\u099C\u09BF\u099F\u09C7\u09B0 \u09A4\u09BE\u09B0\u09BF\u0996
-main_menu=\u09AA\u09CD\u09B0\u09A7\u09BE\u09A8 \u09B8\u09C2\u099A\u09BF
-stage_completed_label=\u09B8\u09AC \u09B8\u09AE\u09CD\u09AA\u09A8\u09CD\u09A8
-stage_executed_label=\u0985\u09B8\u09AE\u09CD\u09AA\u09A8\u09CD\u09A8
-stage_empty=\u0996\u09BE\u09B2\u09BF
-stage_empty_label=\u0996\u09BE\u09B2\u09BF
-no_active_enrollment=\u098F\u0987 \u09AA\u09CD\u09B0\u09CB\u0997\u09CD\u09B0\u09BE\u09AE\u09C7 \u098F\u0996\u09A8\u09CB \u09A8\u09BF\u09AC\u09A8\u09CD\u09A7\u09A8 \u09B9\u09AF\u09BC\u09A8\u09BF\u0964 \u09A1\u09BE\u09A8 \u09A6\u09BF\u0995\u09C7 Add new enrollment \u098F \u0995\u09CD\u09B2\u09BF\u0995 \u0995\u09B0\u09C1\u09A8\u0964 
-data_entry=\u09A4\u09A5\u09CD\u09AF\u09C7\u09B0 \u0985\u09A8\u09CD\u09A4\u09B0\u09CD\u09AD\u09C1\u0995\u09CD\u09A4\u09BF
-completed=\u09B8\u09AE\u09CD\u09AA\u09A8\u09CD\u09A8
-tracked_entity_instance_search_results_header={trackedEntityTypeName} \u0996\u09CB\u0981\u099C\u09BE\u09B0 \u09AB\u09B2\u09BE\u09AB\u09B2
-tracked_entity_instance_search_matches_description=\u09AF\u09A6\u09BF \u0989\u09AA\u09B0\u09C7\u09B0 \u0995\u09C7\u0989 \u0986\u09AA\u09A8\u09BE\u09B0 \u0995\u09BE\u0999\u09CD\u0995\u09CD\u09B7\u09BF\u09A4 {trackedEntityTypeName} \u09B8\u09BE\u09A5\u09C7 \u09AE\u09BF\u09B2 \u09A8\u09BE \u09B9\u09AF\u09BC \u09A4\u09AC\u09C7 \u0986\u09AA\u09A8\u09BF "Go to Registration" \u09A8\u09BF\u09B0\u09CD\u09AC\u09BE\u099A\u09A8 \u0995\u09B0\u09C1\u09A8\u0964
-no_tracked_entity_instance_found_header=\u0995\u09CB\u09A8\u09CB {trackedEntityTypeName} \u09AA\u09BE\u0993\u09AF\u09BC\u09BE \u09AF\u09BE\u09AF\u09BC\u09A8\u09BF
-no_tracked_entity_instance_found_go_to_registration_description=\u0995\u09CB\u09A8\u09CB {trackedEntityTypeName} \u09AA\u09BE\u0993\u09AF\u09BC\u09BE \u09AF\u09BE\u09AF\u09BC\u09A8\u09BF\u0964 \u09A8\u09A4\u09C1\u09A8 \u09B0\u09C7\u099C\u09BF\u09B8\u09CD\u099F\u09CD\u09B0\u09C7\u09B6\u09A8\u09C7\u09B0 \u099C\u09A8\u09CD\u09AF 'Go to registration' \u098F \u0995\u09CD\u09B2\u09BF\u0995 \u0995\u09B0\u09C1\u09A8\u0964
-large_number_of_search_results_warning=\u0985\u09A8\u09C7\u0995\u099C\u09A8\u09C7\u09B0 \u09B8\u09BE\u09A5\u09C7 \u09AE\u09BF\u09B2 \u09AA\u09BE\u0993\u09AF\u09BC\u09BE \u0997\u09BF\u09AF\u09BC\u09C7\u099B\u09C7\u0964 \u0985\u09A8\u09C1\u0997\u09CD\u09B0\u09B9 \u0995\u09B0\u09C7 \u0986\u0997\u09C7\u09B0 \u099C\u09BE\u09AF\u09BC\u0997\u09BE\u09AF\u09BC \u09AB\u09BF\u09B0\u09C7 \u09AF\u09BE\u09A8 \u098F\u09AC\u0982 \u0986\u09B0\u09CB \u0985\u09A8\u09C1\u09B8\u09A8\u09CD\u09A7\u09BE\u09A8\u09C7\u09B0 \u09A4\u09A5\u09CD\u09AF \u09B8\u0982\u09AF\u09CB\u099C\u09A8 \u0995\u09B0\u09C1\u09A8\u0964
+tracker_capture=Tracker capture
+online_notification=\u0987\u09a8\u09cd\u099f\u09be\u09b0\u09a8\u09c7\u099f \u0986\u099b\u09c7
+offline_notification=\u0987\u09a8\u09cd\u099f\u09be\u09b0\u09a8\u09c7\u099f \u09a8\u09c7\u0987
+login_failed=\u09b2\u0997\u0987\u09a8 \u09b8\u09ab\u09b2 \u09b9\u09af\u09bc\u09a8\u09bf. \u0986\u09aa\u09a8\u09be\u09b0 \u0987\u0989\u099c\u09be\u09b0 \u0986\u0987\u09a1\u09bf \u098f\u09ac\u0982 \u09aa\u09be\u09b8\u0993\u09af\u09bc\u09be\u09b0\u09cd\u09a1 \u09a0\u09bf\u0995 \u0995\u09b0\u09c7 \u09b2\u09bf\u0996\u09c1\u09a8\u0964
+tracked_entity_management=Tracked entity management
+registering_unit=\u09a8\u09bf\u09ac\u09a8\u09cd\u09a7\u09a8 \u0995\u09c7\u09a8\u09cd\u09a6\u09cd\u09b0
+program=\u09aa\u09cd\u09b0\u09cb\u0997\u09cd\u09b0\u09be\u09ae
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+tracked_entity_attribute=Tracked entity attribute
+select_or_search=\u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8
+please_select=\u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8
+please_select_a_program=\u09aa\u09cd\u09b0\u09cb\u0997\u09cd\u09b0\u09be\u09ae \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Create
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Required
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=\u0985\u09ac\u09b6\u09cd\u09af\u0987 \u09b8\u0982\u0996\u09cd\u09af\u09be \u09b9\u09a4\u09c7 \u09b9\u09ac\u09c7
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Name
+filter=Filter
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=\u0985\u09a8\u09c1\u09b8\u09a8\u09cd\u09a7\u09be\u09a8
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=\u0996\u09be\u09b2\u09bf
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=\u0995\u09cb\u09a8\u09cb \u09a4\u09a5\u09cd\u09af \u09a8\u09c7\u0987
+total=Total
+total_number_of_pages=\u09aa\u09c3\u09b7\u09cd\u09a0\u09be \u09b8\u0982\u0996\u09cd\u09af\u09be
+rows_per_page=\u09aa\u09cd\u09b0\u09a4\u09bf \u09aa\u09c3\u09b7\u09cd\u09a0\u09be\u09b0 \u09b8\u09be\u09b0\u09bf \u09b8\u0982\u0996\u09cd\u09af\u09be
+jump_to_page=\u09aa\u09c3\u09b7\u09cd\u09a0\u09be\u09af\u09bc \u09af\u09be\u09a8:
+page=Page
+first=First
+previous=\u09aa\u09c2\u09b0\u09cd\u09ac\u09ac\u09b0\u09cd\u09a4\u09c0
+next=Next
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=Find
+edit=Edit
+edit_profile=\u09aa\u09cd\u09b0\u09cb\u09ab\u09be\u0987\u09b2 \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8 \u0995\u09b0\u09c1\u09a8
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Delete
+deleted=\u09ae\u09c1\u099b\u09c7 \u09ab\u09c7\u09b2\u09be \u09b9\u09df\u09c7\u099b\u09c7
+remove=Remove
+entity=Entity
+clear=Clear
+add=\u09af\u09cb\u0997 \u0995\u09b0\u09c1\u09a8
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Complete
+incomplete=\u0985\u09b8\u09ae\u09cd\u09aa\u09c2\u09b0\u09cd\u09a3
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=\u0985\u09ac\u09b8\u09cd\u09a5\u09be
+event_completed=Event completed?
+details=Click to see details
+_details=Details
+created_by=Registered by
+date=\u09a4\u09be\u09b0\u09bf\u0996
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=\u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09bf\u09a4 \u09aa\u09cd\u09b0\u09cb\u0997\u09cd\u09b0\u09be\u09ae
+other_programs=\u0985\u09a8\u09cd\u09af\u09be\u09a8\u09cd\u09af \u09aa\u09cd\u09b0\u09cb\u0997\u09cd\u09b0\u09be\u09ae
+search_for_dashboard=Search for dashboard items
+dashboard=Dashboard
+home=Home
+back=Back
+enrollment=\u09a8\u09bf\u09ac\u09a8\u09cd\u09a7\u09a8
+enrolling_orgunit=\u09a8\u09bf\u09ac\u09a8\u09cd\u09a7\u09a8\u09c7\u09b0 \u09b8\u09cd\u09a5\u09be\u09a8
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=\u09a8\u09bf\u09ac\u09a8\u09cd\u09a7\u09a8\u09c7\u09b0 \u09a4\u09be\u09b0\u09bf\u0996
+incident_date=Incident date
+notes=\u09ae\u09a8\u09cd\u09a4\u09ac\u09cd\u09af
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Select
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicators
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Feedback
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=Reports
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=No value
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Organisation unit
+org_unit_scope=Organisation unit scope
+SELECTED=Selected
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Data element
+value=Value
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Close
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=\u09a8\u09bf\u09b0\u09cd\u09a7\u09be\u09b0\u09bf\u09a4 \u09a4\u09be\u09b0\u09bf\u0996
+event_date=Event date
+report_date=\u09aa\u09b0\u09bf\u09a6\u09b0\u09cd\u09b6\u09a8\u09c7\u09b0 \u09a4\u09be\u09b0\u09bf\u0996
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=\u09b9\u09cd\u09af\u09be\u0981
+no=\u09a8\u09be
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=New
+add_new=Add new
+registration=Registration
+registration_date=\u09b0\u09c7\u099c\u09bf\u09b8\u09cd\u099f\u09cd\u09b0\u09c7\u09b6\u09a8\u09c7\u09b0 \u09a4\u09be\u09b0\u09bf\u0996
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=\u09ad\u09c1\u09b2\u0997\u09c1\u09b2\u09cb
+error=\u09ad\u09c1\u09b2
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisation unit
+category=Category
+entity_type=Entity type
+save=Save
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Go back
+cancel=Cancel
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=\u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09a8\u09bf\u09b6\u09cd\u099a\u09bf\u09a4 \u0986\u09aa\u09a8\u09bf \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09bf\u09a4 \u09a1\u09be\u099f\u09be \u09ae\u09c1\u099b\u09c7 \u09ab\u09c7\u09b2\u09a4\u09c7 \u099a\u09be\u09a8?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=\u0986\u09aa\u09a8\u09bf \u0995\u09bf \u09a8\u09bf\u09b6\u09cd\u099a\u09bf\u09a4 \u0986\u09aa\u09a8\u09bf \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09bf\u09a4 \u09a4\u09a5\u09cd\u09af \u09ae\u09c1\u099b\u09c7 \u09ab\u09c7\u09b2\u09a4\u09c7 \u099a\u09be\u09a8?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u09aa\u09cd\u09b0\u09cb\u09ab\u09be\u0987\u09b2
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=Settings
+account=Account
+help=Help
+log_out=Log out
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Period
+jan=January
+feb=February
+mar=March
+apr=April
+may=May
+jun=June
+jul=July
+aug=August
+sep=September
+oct=October
+nov=November
+dec=December
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=\u09ab\u09b2\u09cb\u0986\u09aa \u09b8\u09ae\u09cd\u09aa\u09a8\u09cd\u09a8?
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=\u0995\u09cb\u09a8 \u09b0\u09c7\u0995\u09b0\u09cd\u09a1 \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=\u098f\u0987 \u09aa\u09cd\u09b0\u09cb\u09ab\u09be\u0987\u09b2\u099f\u09bf \u09b8\u09ae\u09cd\u09aa\u09be\u09a6\u09a8 \u0995\u09b0\u09be \u09ac\u09be\u09a6 \u09a6\u09c7\u09ac\u09be\u09b0 \u09ac\u09bf\u09b7\u09af\u09bc\u09c7 \u0995\u09bf \u0986\u09aa\u09a8\u09bf \u09a8\u09bf\u09b6\u09cd\u099a\u09bf\u09a4?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=\u09aa\u09b0\u09ac\u09b0\u09cd\u09a4\u09c0 \u09ad\u09bf\u099c\u09bf\u099f\u09c7\u09b0 \u09a4\u09be\u09b0\u09bf\u0996
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=\u09aa\u09cd\u09b0\u09a7\u09be\u09a8 \u09b8\u09c2\u099a\u09bf
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=\u09b8\u09ae\u09cd\u09aa\u09a8\u09cd\u09a8
+stage_completed=Event is completed
+stage_completed_label=\u09b8\u09ac \u09b8\u09ae\u09cd\u09aa\u09a8\u09cd\u09a8
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=\u0985\u09b8\u09ae\u09cd\u09aa\u09a8\u09cd\u09a8
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=\u0996\u09be\u09b2\u09bf
+stage_empty_label=\u0996\u09be\u09b2\u09bf
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=\u098f\u0987 \u09aa\u09cd\u09b0\u09cb\u0997\u09cd\u09b0\u09be\u09ae\u09c7 \u098f\u0996\u09a8\u09cb \u09a8\u09bf\u09ac\u09a8\u09cd\u09a7\u09a8 \u09b9\u09af\u09bc\u09a8\u09bf\u0964 \u09a1\u09be\u09a8 \u09a6\u09bf\u0995\u09c7 Add new enrollment \u098f \u0995\u09cd\u09b2\u09bf\u0995 \u0995\u09b0\u09c1\u09a8\u0964
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Description
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=\u09a4\u09a5\u09cd\u09af\u09c7\u09b0 \u0985\u09a8\u09cd\u09a4\u09b0\u09cd\u09ad\u09c1\u0995\u09cd\u09a4\u09bf
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=Years
+months=Months
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=All
+ALL=All
+completed=\u09b8\u09ae\u09cd\u09aa\u09a8\u09cd\u09a8
+active=Active
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} \u0996\u09cb\u0981\u099c\u09be\u09b0 \u09ab\u09b2\u09be\u09ab\u09b2
+tracked_entity_instance_search_matches_description=\u09af\u09a6\u09bf \u0989\u09aa\u09b0\u09c7\u09b0 \u0995\u09c7\u0989 \u0986\u09aa\u09a8\u09be\u09b0 \u0995\u09be\u0999\u09cd\u0995\u09cd\u09b7\u09bf\u09a4 {trackedEntityTypeName} \u09b8\u09be\u09a5\u09c7 \u09ae\u09bf\u09b2 \u09a8\u09be \u09b9\u09af\u09bc \u09a4\u09ac\u09c7 \u0986\u09aa\u09a8\u09bf "Go to Registration" \u09a8\u09bf\u09b0\u09cd\u09ac\u09be\u099a\u09a8 \u0995\u09b0\u09c1\u09a8\u0964
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=\u0995\u09cb\u09a8\u09cb {trackedEntityTypeName} \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf
+no_tracked_entity_instance_found_description=\u0995\u09cb\u09a8\u09cb {trackedEntityTypeName} \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf
+no_tracked_entity_instance_found_go_to_registration_description=\u0995\u09cb\u09a8\u09cb {trackedEntityTypeName} \u09aa\u09be\u0993\u09af\u09bc\u09be \u09af\u09be\u09af\u09bc\u09a8\u09bf\u0964 \u09a8\u09a4\u09c1\u09a8 \u09b0\u09c7\u099c\u09bf\u09b8\u09cd\u099f\u09cd\u09b0\u09c7\u09b6\u09a8\u09c7\u09b0 \u099c\u09a8\u09cd\u09af 'Go to registration' \u098f \u0995\u09cd\u09b2\u09bf\u0995 \u0995\u09b0\u09c1\u09a8\u0964
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=\u0985\u09a8\u09c7\u0995\u099c\u09a8\u09c7\u09b0 \u09b8\u09be\u09a5\u09c7 \u09ae\u09bf\u09b2 \u09aa\u09be\u0993\u09af\u09bc\u09be \u0997\u09bf\u09af\u09bc\u09c7\u099b\u09c7\u0964 \u0985\u09a8\u09c1\u0997\u09cd\u09b0\u09b9 \u0995\u09b0\u09c7 \u0986\u0997\u09c7\u09b0 \u099c\u09be\u09af\u09bc\u0997\u09be\u09af\u09bc \u09ab\u09bf\u09b0\u09c7 \u09af\u09be\u09a8 \u098f\u09ac\u0982 \u0986\u09b0\u09cb \u0985\u09a8\u09c1\u09b8\u09a8\u09cd\u09a7\u09be\u09a8\u09c7\u09b0 \u09a4\u09a5\u09cd\u09af \u09b8\u0982\u09af\u09cb\u099c\u09a8 \u0995\u09b0\u09c1\u09a8\u0964
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
 cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
 cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
 no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
@@ -59,3 +626,49 @@ you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Yo
 missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
 stage_write_required=Program stage write access required
 you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=None
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_ckb.properties b/i18n/i18n_app_ckb.properties
new file mode 100644
index 000000000..1e3b020f5
--- /dev/null
+++ b/i18n/i18n_app_ckb.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=\u062a\u0624\u0645\u0627\u0631 \u0643\u0631\u062f\u0646\u064a \u064a\u0629\u0643\u0629
+program=\u067e\u0631\u06c6\u06af\u0631\u0627\u0645
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Create
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=\u062b\u064a\u0648\u064a\u0633\u062a
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Name
+filter=Filter
+search=\u06af\u06d5\u0695\u0627\u0646
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=\u0643\u0624\u064a \u0637\u0634\u062a\u064a
+total_number_of_pages=\u0630\u0645\u0627\u0631\u0629\u064a \u0644\u0627\u0628\u0629\u0631\u0629\u0643\u0627\u0646
+rows_per_page=\u0633\u062a\u0648\u0646\u0629\u0643\u0627\u0646 \u0644\u0629 \u0647\u0629 \u0644\u0627\u0628\u0629\u0631\u0629\u064a\u0629\u0643
+jump_to_page=\u062c\u0648\u0648\u0646\u0629\u0648\u0629 \u0628\u0624 \u0644\u0627\u0628\u0629\u0631\u0629\u064a
+page=\u0644\u0627\u0628\u0629\u0631\u0629
+first=\u064a\u0629\u0643\u0629\u0645
+previous=\u0630\u064a\u064e\u0634\u0648\u0648
+next=\u062f\u0627\u0647\u0627\u062a\u0648\u0648
+last=\u0643\u0624\u062a\u0627\u064a\u064a
+go_to_dashboard=Go to dashboard
+go=Go
+find=\u0628\u062f\u06c6\u0632\u06d5\u0648\u06d5
+edit=\u062f\u0629\u0633\u062a\u0643\u0627\u0631\u064a
+edit_profile=Edit profile
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5
+deleted=deleted
+remove=\u0644\u0627\u0628\u0631\u062f\u0646
+entity=Entity
+clear=\u067e\u0627\u06a9\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5
+add=Add
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=\u062a\u06d5\u0648\u0627\u0648\u0628\u06a9\u06d5
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=\u067e\u06ce\u06af\u06d5
+event_completed=Event completed?
+details=\u062f\u0631\u064a\u0632\u0629
+_details=Details
+created_by=\u062a\u0624\u0645\u0627\u0631\u0643\u0631\u0627\u0648\u0629 \u0628\u0629
+date=\u0628\u06d5\u0631\u0648\u0627\u0631
+_date=date
+event_name=Event name
+new_event=\u0631\u0648\u0648\u062f\u0627\u0648\u064a \u0646\u0648\u064a
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=\u067e\u0631\u06c6\u06af\u0631\u0627\u0645\u06d5 \u0647\u06d5\u06b5\u0628\u0698\u06ce\u0631\u062f\u0631\u0627\u0648\u06d5\u06a9\u06d5
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=\u0634\u064a\u062a\u0629\u0644 \u0643\u0631\u062f\u0646\u064a \u062f\u0627\u062a\u0627
+home=\u0645\u0627\u06b5\u0629\u0648\u0629
+back=\u0643\u0629\u0631\u0627\u0646\u0629\u0648\u0629
+enrollment=\u062a\u06c6\u0645\u0627\u0631\u06a9\u0631\u062f\u0646
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=\u067e\u06d5\u06cc\u0648\u06d5\u0646\u062f\u06cc\u06d5\u06a9\u0627\u0646
+add_relationship=\u067e\u06d5\u0648\u06d5\u0646\u062f\u06cc \u062f\u0631\u0648\u0648\u0633\u062a\u0628\u06a9\u06d5
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u0646
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=\u0646\u06cc\u0634\u0627\u0646\u062f\u06d5\u0631
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u0695\u0627\u0648\u0648\u0628\u06c6\u0686\u0648\u0646
+no_feedback_exist=No feedback exist
+custom_form=\u0641\u0624\u0631\u0645\u064a \u0626\u0627\u0633\u0627\u064a\u064a
+default_form=\u0641\u0624\u0631\u0645\u064a \u062e\u0624\u0648\u064a\u0633\u062a
+menu=Menu
+tracker_reports=Tracker Reports
+reports=\u0631\u0627\u0628\u0648\u0631\u062a
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=\u0647\u064a\u062c \u0628\u0631
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=\u064a\u0629\u0643\u0629\u064a \u0631\u064a\u0643\u062e\u0631\u0627\u0648
+org_unit_scope=Organisation unit scope
+SELECTED=Selected
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=\u062f\u0627\u062a\u0627\u064a \u0633\u0629\u0631\u0629\u0643\u064a
+value=\u0628\u0629\u0647\u0627
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=\u0628\u0634\u0627\u0646\u062f\u0627\u0646/\u0634\u0627\u0631\u062f\u0646\u064a \u0633\u062a\u0648\u0646\u0629\u0643\u0627\u0646
+select_columns_to_show=\u0633\u062a\u0648\u0646\u0629\u0643\u0627\u0646 \u0647\u0629\u0644\u0628\u0632\u064a\u0631\u0629 \u0628\u0624 \u0628\u064a\u0634\u0627\u0646\u062f\u0627\u0646\u064a\u0627\u0646
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=\u0634\u0627\u0631\u062f\u0646\u064a \u0633\u062a\u0648\u0646\u0629\u0643\u0627\u0646
+show_column=\u0628\u064a\u0634\u0627\u0646\u062f\u0627\u0646\u064a \u0633\u062a\u0648\u0646\u0629\u0643\u0627\u0646
+close=\u062f\u0627\u062e\u0633\u062a\u0646
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=\u0642\u0624\u0646\u0627\u063a\u064a \u0628\u0629\u0631\u0646\u0627\u0645\u0629
+due_date=Due date
+event_date=\u0628\u064a\u0631\u0643\u0627\u0631\u064a \u062f\u0627\u062a\u0627
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=\u062f\u0629\u0633\u062a\u0628\u064a\u0643\u0631\u062f\u0646\u064a \u062f\u0627\u062a\u0627
+end_date=\u062a\u0629\u0648\u0627\u0648 \u0643\u0631\u062f\u0646\u064a \u062f\u0627\u062a\u0627
+from=\u0644\u06d5
+to=\u0644\u06d5
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=\u0628\u06d5\u06b5\u06ce
+no=\u0646\u06d5\u062e\u06ce\u0631
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=\u0646\u0648\u06ce
+add_new=Add new
+registration=\u062a\u06c6\u0645\u0627\u0631\u06a9\u0631\u062f\u0646
+registration_date=Registration date
+register=\u062a\u06c6\u0645\u0627\u0631 \u0628\u06a9\u06d5
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=\u0641\u0624\u0631\u0645\u0629\u0643\u0629 \u062f\u0631\u0648\u0633\u062a \u0646\u064a\u0629 \u062a\u0643\u0627\u064a\u0629 \u0628\u0629\u0634\u0629 \u0628\u064a\u0648\u064a\u0633\u062a\u0629\u0643\u0627\u0646 \u0628\u0634\u0643\u0646\u064a\u0646 \u0628\u0643\u0629
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=\u0647\u06d5\u06b5\u06d5
+error=\u0647\u06d5\u06b5\u06d5
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=\u064a\u0629\u0643\u0629\u064a \u0631\u064a\u0643\u062e\u0631\u0627\u0648
+category=Category
+entity_type=Entity type
+save=\u062a\u06c6\u0645\u0627\u0631\u06a9\u0631\u062f\u0646
+save_and_add_new=\u062e\u0629\u0632\u0646 \u0643\u0631\u062f\u0646 \u0632\u064a\u0627\u062f\u0643\u0631\u0646\u064a \u0646\u0648\u064a
+save_and_go_back=\u062e\u0648\u0632\u0646 \u0643\u0631\u062f\u0646 \u0648 \u062c\u0648\u0646 \u0628\u0624 \u062f\u0648\u0627\u0648\u0629
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=\u0628\u0624 \u062f\u0648\u0627\u0648\u0629
+cancel=\u0644\u0627\u0628\u0631\u062f\u0646
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u067e\u0631\u06c6\u0641\u0627\u06cc\u0644
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=\u0631\u064a\u0643\u062e\u0633\u062a\u0646
+account=Account
+help=\u0647\u0627\u0648\u0643\u0627\u0631\u064a
+log_out=\u062c\u0648\u0646\u0629\u062f\u0629\u0631\u0629\u0648\u0629
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=\u0631\u064a\u0643\u062e\u0633\u062a\u0646\u064a \u064a\u0629\u0643\u0629\u0643\u0627\u0646 \u0628\u0629\u0643\u0648\u064a\u0631\u0629\u064a \u0646\u0627\u0648
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=\u0647\u06ce\u06b5\u06cc \u062f\u0631\u06ce\u0698\u06cc \u0648 \u067e\u0627\u0646\u06cc \u062f\u06cc\u0627\u0631\u06cc\u0628\u06a9\u06d5
+coordinate=\u0647\u06cc\u06b5\u06cc \u0633\u062a\u0648\u0648\u0646\u06cc \u0648 \u0626\u0627\u0633\u06c6\u06cc\u06cc \u0632\u06d5\u0648\u06cc
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=\u0645\u0627\u0648\u0629
+jan=January
+feb=February
+mar=March
+apr=April
+may=May
+jun=June
+jul=July
+aug=August
+sep=September
+oct=October
+nov=November
+dec=December
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=\u0628\u0629\u0634
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=\u062c\u0627\u0628\u0643\u0631\u062f\u0646\u064a \u0641\u0624\u0631\u0645
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=\u0644\u064a\u0633\u062a\u0649 \u0633\u06d5\u0631\u06d5\u0643\u0649
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=\u062a\u06d5\u0648\u0627\u0648\u0628\u0648\u0648
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Description
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=\u0646\u0627\u0645\u0629
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=\u0633\u0627\u06b5\u06d5\u06a9\u0627\u0646
+months=\u0645\u0627\u0646\u06af\u06d5\u06a9\u0627\u0646
+days=\u0631\u06c6\u0698\u06d5\u06a9\u0627\u0646
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=\u062a\u0629\u0648\u0627\u0648
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=All
+ALL=All
+completed=\u062a\u06d5\u0648\u0627\u0648\u0628\u0648\u0648
+active=\u0686\u0627\u06b5\u0627\u06a9
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=\u067e\u06ce\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648\u0627\u0646
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=\u0628\u06d5\u06a9\u0627\u0631\u0647\u06ce\u0646\u06d5\u0631\u06cc \u062f\u06d5\u0633\u062a\u0646\u06cc\u0634\u0627\u0646\u06a9\u0631\u0627\u0648
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=\u0647\u06cc\u0686\u06cc\u0627\u0646
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_cs.properties b/i18n/i18n_app_cs.properties
new file mode 100644
index 000000000..da61007fa
--- /dev/null
+++ b/i18n/i18n_app_cs.properties
@@ -0,0 +1,674 @@
+tracker_capture=Trasova\u010d zachycen\u00ed
+online_notification=Jste online
+offline_notification=Jste offline
+login_failed=P\u0159ihl\u00e1\u0161en\u00ed se nezda\u0159ilo, zkontrolujte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo a zkuste to znovu
+tracked_entity_management=Spr\u00e1va sledovan\u00fdch entit
+registering_unit=Registra\u010dn\u00ed jednotka
+program=Program
+tracked_entity=Trasovan\u00e1 entita
+tracked_entity_instance=Sledovan\u00e1 instance entity
+tracked_entity_attribute=Atribut trasovan\u00e9 entity
+select_or_search=Vyberte nebo vyhledejte ze seznamu
+please_select=[Pros\u00edm vyberte]
+please_select_a_program=[Vyberte program]
+no_program_exists=[\u017d\u00e1dn\u00fd program neexistuje]
+please_select_a_program_for_enrollment=Vyberte program pro z\u00e1pis
+please_select_program_report=Vyberte program pro hl\u00e1\u0161en\u00ed
+please_select_a_relationship=Vyberte pros\u00edm vztah
+no_relationship=Nejsou \u017e\u00e1dn\u00e9 vztahy
+relationship_not_possible=\u017d\u00e1dn\u00e9 instance trasovan\u00fdch entit, vztah nen\u00ed mo\u017en\u00fd
+no_program_exists_enrollment=Pro vybranou organiza\u010dn\u00ed jednotku neexistuj\u00ed \u017e\u00e1dn\u00e9 programy. Z\u00e1pis nen\u00ed mo\u017en\u00fd.
+no_program_exists_report=Pro vybranou organiza\u010dn\u00ed jednotku neexistuj\u00ed \u017e\u00e1dn\u00e9 programy. Hl\u00e1\u0161en\u00ed nen\u00ed mo\u017en\u00e9.
+not_yet_enrolled_data_entry=Je\u0161t\u011b nen\u00ed zaregistrov\u00e1n. Zad\u00e1n\u00ed \u00fadaj\u016f nen\u00ed mo\u017en\u00e9.
+not_yet_enrolled_enrollment=Neexistuje \u017e\u00e1dn\u00fd z\u00e1pis.
+no_active_enrollment_exists=Pro vybran\u00fd program neexistuje \u017e\u00e1dn\u00fd aktivn\u00ed z\u00e1pis
+no_active_enrollments_exist=Neexistuj\u00ed \u017e\u00e1dn\u00e9 aktivn\u00ed registrace
+too_many_items_report=Hl\u00e1\u0161en\u00ed nelze zobrazit, proto\u017ee mno\u017estv\u00ed po\u017eadovan\u00fdch dat p\u0159ekra\u010duje kapacitu podporovanou touto slu\u017ebou. Zva\u017ete pou\u017eit\u00ed analytick\u00e9 aplikace nebo ovl\u00e1dac\u00edch panel\u016f.
+not_yet_enrolled_note=Je\u0161t\u011b nezaps\u00e1n. Z\u00e1znam pozn\u00e1mek nen\u00ed mo\u017en\u00fd.
+not_yet_enrolled_report=Je\u0161t\u011b nen\u00ed zaps\u00e1n. Hl\u00e1\u0161en\u00ed nen\u00ed mo\u017en\u00e9.
+no_data_report=Pro hl\u00e1\u0161en\u00ed neexistuj\u00ed \u017e\u00e1dn\u00e9 z\u00e1znamy
+no_notes_exist=\u017d\u00e1dn\u00e9 pozn\u00e1mky neexistuj\u00ed
+event=Ud\u00e1lost
+no_event_is_yet_created=Pro zad\u00e1v\u00e1n\u00ed dat nejsou k dispozici \u017e\u00e1dn\u00e9 ud\u00e1losti. Vytvo\u0159te jednu.
+event_creation=Vytvo\u0159te pros\u00edm jeden z n\u00ed\u017ee
+not_selected=Nevybran\u00fd
+create=Vytvo\u0159it
+view_all=[Zobrazit v\u0161e]
+list_all_entities=Seznam v\u0161ech entit
+list_all=Seznam v\u0161ech
+list=Seznam
+lists=Seznamy
+invalid=Neplatn\u00fd
+selected_tei_is_invalid=Vybran\u00e1 trasovan\u00e1 instance entity je neplatn\u00e1
+required=Vy\u017eadov\u00e1no
+number_required=Po\u017eadov\u00e1no \u010d\u00edslo
+date_required=Datum vy\u017eadov\u00e1no
+number=\u010c\u00edslo
+value_must_be_number=Hodnota mus\u00ed b\u00fdt \u010d\u00edslo
+value_must_be_posInt=Hodnota mus\u00ed b\u00fdt kladn\u00e9 cel\u00e9 \u010d\u00edslo
+value_must_be_negInt=Hodnota mus\u00ed b\u00fdt z\u00e1porn\u00e9 cel\u00e9 \u010d\u00edslo
+value_must_be_zeroPositiveInt=Hodnota mus\u00ed b\u00fdt nula nebo kladn\u00e9 cel\u00e9 \u010d\u00edslo
+value_must_be_int=Hodnota mus\u00ed b\u00fdt cel\u00e9 \u010d\u00edslo
+posInt=Kladn\u00e9 cel\u00e9 \u010d\u00edslo
+negInt=Z\u00e1porn\u00e9 cel\u00e9 \u010d\u00edslo
+zeroPositiveInt=Nula nebo kladn\u00e9 cel\u00e9 \u010d\u00edslo
+latitude_required=Hodnota zem\u011bpisn\u00e9 \u0161\u00ed\u0159ky mus\u00ed b\u00fdt mezi [-90 ... 90]
+longitude_required=Hodnota zem\u011bpisn\u00e9 d\u00e9lky mus\u00ed b\u00fdt mezi [-180 ... 180]
+latitude_longitude_required=Hodnota mus\u00ed b\u00fdt ve form\u00e1tu [-180 ... 180],[-90 ... 90] pro zem\u011bpisnou d\u00e9lku a \u0161\u00ed\u0159ku
+future_date_not_allowed=Budouc\u00ed datum nen\u00ed povoleno
+option_required=Hodnota mus\u00ed b\u00fdt vybr\u00e1na z rozbalovac\u00ed nab\u00eddky
+bool_required=Hodnota mus\u00ed b\u00fdt logick\u00e1 hodnota
+name=N\u00e1zev
+filter=Filtr
+search=Hledat
+_search=Vyhled\u00e1v\u00e1n\u00ed
+search_by_name=Hled\u00e1n\u00ed podle n\u00e1zvu
+search_by_data_element=Hled\u00e1n\u00ed podle datov\u00e9ho prvku
+search_by_attribute=Hledat podle atributu
+search_for=Hledat
+type_your_search_criteria_here=Sem zadejte krit\u00e9ria vyhled\u00e1v\u00e1n\u00ed
+search_input_required=Uve\u010fte pros\u00edm vyhled\u00e1vac\u00ed krit\u00e9ria
+in_progress=Prob\u00edh\u00e1
+registered_entities=Registrovan\u00e9 subjekty
+empty=Vypr\u00e1zdnit
+form_is_empty_fill_at_least_one=Formul\u00e1\u0159 je pr\u00e1zdn\u00fd, vypl\u0148te alespo\u0148 jeden
+no_event_exists=Neexistuje \u017e\u00e1dn\u00e1 ud\u00e1lost
+total=Celkem
+total_number_of_pages=Po\u010det stran
+rows_per_page=Po\u010det \u0159\u00e1dk\u016f na str\u00e1nku
+jump_to_page=P\u0159ej\u00edt na str\u00e1nku
+page=Strana
+first=Prvn\u00ed
+previous=P\u0159edchoz\u00ed
+next=Dal\u0161\u00ed
+last=Posledn\u00ed
+go_to_dashboard=P\u0159ej\u00edt na ovl\u00e1dac\u00ed panel
+go=J\u00edt
+find=Hledat
+edit=Upravit
+edit_profile=Upravit profil
+tracker_associate=p\u0159idru\u017een\u00fd trasova\u010d
+association=Spravovat p\u0159idru\u017een\u00ed
+change_location=Spravovat polohu
+details_history=Podrobnosti / historie
+history=Historie
+canceled=Zru\u0161eno
+delete=Smazat
+deleted=smaz\u00e1no
+remove=Odebrat
+entity=Entita
+clear=Vy\u010distit
+add=P\u0159idat
+add_note=P\u0159idat pozn\u00e1mku
+search_note=Hledat pozn\u00e1mky
+your_note_here=Va\u0161e pozn\u00e1mka sem
+phone_number=Telefonn\u00ed \u010d\u00edslo
+your_sms_message_here=Va\u0161e SMS zpr\u00e1va zde
+your_email_message_here=Va\u0161e e-mailov\u00e1 zpr\u00e1va zde
+sms_send_status=Stav odes\u00edl\u00e1n\u00ed SMS
+send=Odeslat
+add_new_event=P\u0159idat novou ud\u00e1lost
+add_new_event_for_stage=P\u0159idat novou ud\u00e1lost pro f\u00e1zi
+schedule_new_event=Napl\u00e1novat novou ud\u00e1lost
+schedule_new_event_for_stage=Napl\u00e1nujte novou ud\u00e1lost pro f\u00e1zi
+refer_new_event_for_stage=Doporu\u010dit novou ud\u00e1lost pro f\u00e1zi
+skip=P\u0159esko\u010dit
+unskip=Napl\u00e1novat zp\u011btn\u011b
+complete=Dokon\u010dit
+incomplete=Nedokon\u010deno
+reopen=Znovu otev\u0159\u00edt
+validate=Ov\u011b\u0159it
+validation_result=V\u00fdsledek ov\u011b\u0159en\u00ed
+status=Stav
+event_completed=Ud\u00e1lost dokon\u010dena?
+details=Kliknut\u00edm zobraz\u00edte podrobnosti
+_details=Detaily
+created_by=Registrov\u00e1no u\u017eivatelem
+date=datum
+_date=datum
+event_name=N\u00e1zev ud\u00e1losti
+new_event=Nov\u00e1 ud\u00e1lost
+create_new_event=Vytvo\u0159it novou ud\u00e1lost
+create_new_event_repeatable=Vytvo\u0159it novou ud\u00e1lost z opakovateln\u00e9 f\u00e1ze
+toggle_table_view_on=Pokud je to mo\u017en\u00e9, zobrazit ud\u00e1losti jako tabulky
+toggle_table_view_off=Zobrazit formul\u00e1\u0159e pro zad\u00e1v\u00e1n\u00ed \u00fadaj\u016f pro ka\u017edou ud\u00e1lost
+event_recorded_on=Ud\u00e1lost zaznamenan\u00e1 v
+at=na
+show_more=Kliknut\u00edm zobraz\u00edte dal\u0161\u00ed
+close_search=Zav\u0159\u00edt vyhled\u00e1v\u00e1n\u00ed
+search_attributes=Atributy vyhled\u00e1v\u00e1n\u00ed
+available_search_attributes=Dostupn\u00e9 atributy vyhled\u00e1v\u00e1n\u00ed
+selected_search_attributes=Vybran\u00e9 atributy vyhled\u00e1v\u00e1n\u00ed
+selected_program=Vybran\u00fd program
+other_programs=Dal\u0161\u00ed programy
+search_for_dashboard=Vyhledat polo\u017eky na ovl\u00e1dac\u00edm panelu
+dashboard=Ovl\u00e1dac\u00ed panel
+home=Domovsk\u00e1 strana
+back=Zp\u011bt
+enrollment=Z\u00e1pis
+enrolling_orgunit=Z\u00e1pis organiza\u010dn\u00ed jednotky
+delete_enrollment=Smazat z\u00e1pis
+cancel_enrollment=Zru\u0161it z\u00e1pis
+complete_enrollment=Dokon\u010dit z\u00e1pis
+reopen_enrollment=Znovu otev\u0159\u00edt z\u00e1pis
+activate_enrollment=Aktivovat z\u00e1pis
+deactivate_enrollment=Deaktivujte z\u00e1pis
+enrollment_date=Datum z\u00e1pisu
+incident_date=Datum incidentu
+notes=Pozn\u00e1mky
+relationship=Vztah
+relationshipTo=Odchoz\u00ed vztahy
+relationshipFrom=P\u0159\u00edchoz\u00ed vztahy
+relationships=Vztahy
+add_relationship=P\u0159idat vztah
+a_is_to_b=A je k B
+b_is_to_a=B je k A
+select=Vybrat
+please_add_some_text=P\u0159idejte n\u011bjak\u00fd text
+please_select_source=Vyberte zdroj
+register_new=Registrovat nov\u00fd
+search_from_existing=Hled\u00e1n\u00ed ze st\u00e1vaj\u00edc\u00edch
+dataentry=Zad\u00e1v\u00e1n\u00ed dat na \u010dasov\u00e9 ose
+dataentryTabular=Tabulkov\u00e9 zad\u00e1v\u00e1n\u00ed dat
+indicators=Indik\u00e1tory
+empty_inidcator_list=\u017d\u00e1dn\u00e9 indik\u00e1tory nejsou
+no_indicators_exist=\u017d\u00e1dn\u00e9 indik\u00e1tory nejsou
+feedback=Zp\u011btn\u00e1 vazba
+no_feedback_exist=Neexistuje \u017e\u00e1dn\u00e1 zp\u011btn\u00e1 vazba
+custom_form=Vlastn\u00ed formul\u00e1\u0159
+default_form=V\u00fdchoz\u00ed formul\u00e1\u0159
+menu=Menu
+tracker_reports=Zpr\u00e1vy trasova\u010de
+reports=Zpr\u00e1vy
+registration_and_data_entry=Registrace a zad\u00e1v\u00e1n\u00ed \u00fadaj\u016f
+program_summary_report=Souhrnn\u00e1 zpr\u00e1va o programu
+program_summary=Shrnut\u00ed programu
+program_summary_description=Vygenerujte souhrnnou zpr\u00e1vu pro konkr\u00e9tn\u00ed program, organiza\u010dn\u00ed jednotku a \u010dasov\u00fd r\u00e1mec. Zpr\u00e1va p\u0159edstavuje seznam trasovan\u00fdch instanc\u00ed entit a jejich z\u00e1znam\u016f uspo\u0159\u00e1dan\u00fdch podle f\u00e1z\u00ed programu.
+program_statistics_report=Zpr\u00e1va o statistice programu
+program_statistics=Statistika programu
+program_statistics_description=Generuje statistickou zpr\u00e1vu pro konkr\u00e9tn\u00ed program. Zpr\u00e1va poskytuje nap\u0159\u00edklad p\u0159ehled v\u00fdpadk\u016f nebo m\u00edry dokon\u010den\u00ed v dan\u00e9m \u010dasov\u00e9m r\u00e1mci v konkr\u00e9tn\u00ed organiza\u010dn\u00ed jednotce.
+upcoming_events=P\u0159ipravovan\u00e9 akce
+upcoming_events_description=Vygenerujte tabulkovou zpr\u00e1vu zobrazuj\u00edc\u00ed instance sledovan\u00fdch entit a jejich nadch\u00e1zej\u00edc\u00ed ud\u00e1losti pro vybran\u00fd program a \u010das. Ve sloupc\u00edch jsou mo\u017en\u00e9 operace vyhled\u00e1v\u00e1n\u00ed, \u0159azen\u00ed a zobrazen\u00ed / skryt\u00ed.
+overdue_events=Ud\u00e1losti po term\u00ednu
+overdue_events_description=Vytvo\u0159\u00ed seznam ud\u00e1lost\u00ed pro vybran\u00fd program. Zpr\u00e1va zobrazuje seznam instanc\u00ed sledovan\u00fdch entit a jejich ud\u00e1lost\u00ed, kter\u00e9 nejsou provedeny v\u010das. Filtrov\u00e1n\u00ed a vyhled\u00e1v\u00e1n\u00ed je tak\u00e9 mo\u017en\u00e9.
+enrollment_stats=Statistiky z\u00e1pisu
+event_stats=Statistiky ud\u00e1lost\u00ed
+upcoming_event=Nadch\u00e1zej\u00edc\u00ed ud\u00e1lost
+legend=Legenda
+event_color_legend=Co znamenaj\u00ed barvy?
+report=Zpr\u00e1va
+_report=zpr\u00e1va
+visit_schedule=Pl\u00e1n n\u00e1v\u0161t\u011bvy
+mark_for_followup=Ozna\u010dit pro dal\u0161\u00ed sledov\u00e1n\u00ed
+unmark_for_followup=Odebrat ze sledov\u00e1n\u00ed
+only_marked_for_followup=Pouze ozna\u010deno pro dal\u0161\u00ed krok
+registered_data=Registrovan\u00e1 data
+no_value=\u017d\u00e1dn\u00e1 hodnota
+no_data_found=Nenalezena \u017e\u00e1dn\u00e1 data
+no_data=Nejsou data
+mo_matching_data=Va\u0161im krit\u00e9ri\u00edm vyhled\u00e1v\u00e1n\u00ed neodpov\u00eddaj\u00ed \u017e\u00e1dn\u00e1 data
+data_exists=Data existuj\u00ed
+data_registerd=Nejsou registrov\u00e1na \u017e\u00e1dn\u00e1 data
+no_visit_made=Neprovedena \u017e\u00e1dn\u00e1 n\u00e1v\u0161t\u011bva
+visit_not_made=N\u00e1v\u0161t\u011bva nebyla provedena
+_visit=n\u00e1v\u0161t\u011bva
+visit=N\u00e1v\u0161t\u011bva
+visits=N\u00e1v\u0161t\u011bvy
+current_selections=Aktu\u00e1ln\u00ed v\u00fdb\u011bry
+activePrograms=Aktivn\u00ed programy
+set_as_current=Nastavit jako aktu\u00e1ln\u00ed
+org_unit=Organiza\u010dn\u00ed jednotka
+org_unit_scope=Rozsah organiza\u010dn\u00ed jednotky
+SELECTED=Vybr\u00e1no
+CHILDREN=Bezprost\u0159edn\u00ed pod\u0159azen\u00ed
+DESCENDANTS=V\u0161echny pod\u0159azen\u00e9
+ACCESSIBLE=V\u0161echno p\u0159\u00edstupn\u00e9
+data_element=Datov\u00fd prvek
+value=Hodnota
+provided_elsewhere=Poskytnuto jinde
+expand=Rozbalit
+collapse=Sbalit
+show_hide_columns=Zobrazit / skr\u00fdt sloupce
+select_columns_to_show=Vybrat sloupce ke zobrazen\u00ed
+show_hide_widgets=Zobrazit / skr\u00fdt widgety
+select_widgets_to_show=Vyberte widgety k zobrazen\u00ed
+audit_history=Historie auditu
+hide_widget=Skr\u00fdt widget
+show_widget=Zobrazit widget
+hide_column=Skr\u00fdt sloupec
+show_column=Zobrazit sloupec
+close=Zav\u0159\u00edt
+generate=generovat
+print=Tisk
+excel_export=Export do Excelu
+download=St\u00e1hnout jako
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=Seznam program\u016f
+program_stage=Programov\u00e1 f\u00e1ze
+due_date=Datum vypr\u0161en\u00ed
+event_date=Datum ud\u00e1losti
+report_date=Datum zpr\u00e1vy
+enable_rescheduling=Povolit p\u0159epl\u00e1nov\u00e1n\u00ed
+disable_rescheduling=Zak\u00e1zat p\u0159epl\u00e1nov\u00e1n\u00ed
+show_hide_scheduling=Zobrazit / skr\u00fdt pl\u00e1novac\u00ed formul\u00e1\u0159
+show_hide_notes=Zobrazit / skr\u00fdt pozn\u00e1mky formul\u00e1\u0159e
+show_hide_messaging=Zobrazit / skr\u00fdt formul\u00e1\u0159 pro zas\u00edl\u00e1n\u00ed zpr\u00e1v
+messaging=Zpr\u00e1vy
+scheduling=Pl\u00e1nov\u00e1n\u00ed
+reschedule_duedate=Zm\u011bnit term\u00edn splatnosti
+reschedule=P\u0159epl\u00e1novat
+rescheduling=P\u0159epl\u00e1nov\u00e1n\u00ed
+scheduling_messaging=Pl\u00e1nov\u00e1n\u00ed a zas\u00edl\u00e1n\u00ed zpr\u00e1v
+not_yet_enrolled_scheduling=Je\u0161t\u011b nen\u00ed zaps\u00e1n, pl\u00e1nov\u00e1n\u00ed nen\u00ed mo\u017en\u00e9
+schedule_details=Podrobnosti pl\u00e1nu
+no_event_to_schedule=\u017d\u00e1dn\u00e9 ud\u00e1losti k pl\u00e1nov\u00e1n\u00ed
+enroll=Zapsat
+new_enrollment=Nov\u00fd z\u00e1pis
+start_date=Datum za\u010d\u00e1tku
+end_date=Datum ukon\u010den\u00ed
+from=Od
+to=Do
+exact_date=P\u0159esn\u00e9 datum
+exact_value=P\u0159esn\u00e1 hodnota
+EQ=Rovn\u00e1 se
+GT=V\u011bt\u0161\u00ed ne\u017e
+GE=V\u011bt\u0161\u00ed nebo rovno
+LT=M\u00e9n\u011b ne\u017e
+LE=M\u00e9n\u011b ne\u017e nebo rovno
+NE=Nen\u00ed shodn\u00e9
+IS=Je
+RANGE=Rozsah
+like=Jako
+not_like=Ne jako
+boolean=Booleovsk\u00fd
+yes=Ano
+no=Ne
+records=Z\u00e1znamy
+record=Z\u00e1znam
+_record=z\u00e1znam
+_records=z\u00e1znamy
+found=Nalezeno
+move_to_selected=P\u0159esunout na vybran\u00e9
+move_all_to_selected=P\u0159esunout v\u0161e do vybran\u00e9ho
+current=Aktu\u00e1ln\u00ed
+new=Nov\u00fd
+add_new=P\u0159idat nov\u00fd
+registration=Registrace
+registration_date=Datum registrace
+register=Registrovat
+_register=registrovat
+enrollment_error=Chyba p\u0159i z\u00e1pisu
+registration_error=Chyba v registraci
+update_error=Chyba v aktualizaci
+register_error=Chyba v registraci
+event_creation_error=Chyba p\u0159i vytv\u00e1\u0159en\u00ed ud\u00e1losti
+relationship_error=Chyba v p\u0159i\u0159azen\u00ed vztahu
+tracker_associate_error=Chyba v p\u0159i\u0159azen\u00ed trasova\u010de
+searching_error=Chyba p\u0159i hled\u00e1n\u00ed
+form_invalid=Formul\u00e1\u0159 je neplatn\u00fd. Zkontrolujte pros\u00edm povinn\u00e1 pole.
+no_entity_for_tracker_associate_attribute=Vybran\u00fd atribut m\u00e1 neplatnou sledovanou entitu
+errors=Chyby
+error=Chyba
+warning=Varov\u00e1n\u00ed
+success=\u00dasp\u011bch
+unable_to_fetch_data_from_server=Nelze na\u010d\u00edst data ze serveru.
+access_denied=P\u0159\u00edstup odep\u0159en
+registration_complete=Registrace je dokon\u010dena
+auto_generate_failed=Nelze zaregistrovat, proto\u017ee automatick\u00e9 generov\u00e1n\u00ed atributu(\u016f) selhalo.
+validation_error=Chyba ov\u011b\u0159en\u00ed
+event_orgunit_name=Organiza\u010dn\u00ed jednotka
+category=Kategorie
+entity_type=Typ entity
+save=Ulo\u017eit
+save_and_add_new=Ulo\u017eit a p\u0159idat nov\u00e9
+save_and_go_back=Ulo\u017eit a vr\u00e1tit se
+save_and_continue=Ulo\u017eit a pokra\u010dovat
+save_relationship=Ulo\u017eit vztah
+delete_relationship=Smazat vztah
+can_not_delete_relationship=Nelze odstranit vztah z d\u016fvodu chyb\u011bj\u00edc\u00edho p\u0159\u00edstupu pro z\u00e1pis.
+go_back=Zp\u011bt
+cancel=Zru\u0161it
+are_you_sure_to_delete_relationship=Opravdu chcete vztah smazat?
+are_you_sure_to_delete_enrollment=Opravdu chcete smazat vybran\u00fd z\u00e1pis? T\u00edmto odstran\u00edte v\u0161echny ud\u00e1losti spojen\u00e9 s t\u00edmto z\u00e1pisem.
+would_you_like_to_complete_enrollment=Chcete dokon\u010dit aktu\u00e1ln\u00ed z\u00e1pis?
+are_you_sure_to_complete_enrollment=Opravdu chcete dokon\u010dit vybranou registraci?
+are_you_sure_to_deactivate_enrollment=Opravdu chcete deaktivovat vybranou registraci?
+are_you_sure_to_activate_enrollment=Opravdu chcete aktivovat vybran\u00fd z\u00e1pis?
+are_you_sure_to_reopen_enrollment=Opravdu chcete znovu otev\u0159\u00edt vybran\u00fd z\u00e1pis?
+are_you_sure_to_delete_event=Opravdu chcete vybranou ud\u00e1lost smazat?
+are_you_sure_to_delete_event_with_audit=Opravdu odstran\u00edte vybranou ud\u00e1lost? T\u00edm tak\u00e9 odstran\u00edte v\u0161echny souvisej\u00edc\u00ed hodnoty auditu.
+are_you_sure_to_complete_event=Opravdu chcete dokon\u010dit vybranou ud\u00e1lost?
+please_fix_errors_before_completing=P\u0159ed dokon\u010den\u00edm ud\u00e1losti zkontrolujte a opravte n\u00e1sleduj\u00edc\u00ed chybu(y):
+are_you_sure_to_incomplete_event=Opravdu chcete vybranou ud\u00e1lost upravit?
+are_you_sure_to_skip_event=Opravdu chcete p\u0159esko\u010dit vybranou ud\u00e1lost?
+are_you_sure_to_unskip_event=Opravdu chcete napl\u00e1novat zp\u011bt vybranou ud\u00e1lost?
+do_you_want_to_proceed=Chcete pokra\u010dovat s neplatn\u00fdmi krit\u00e9rii?
+are_you_sure_to_proceed=Opravdu chcete pokra\u010dovat?
+will_delete_all_data_associated=T\u00edmto sma\u017eete V\u0160ECHNA DATA s t\u00edm spojen\u00e1
+more=V\u00edce
+under_construction=Ve v\u00fdstavb\u011b
+advanced_search=Pokro\u010dil\u00e9 vyhled\u00e1v\u00e1n\u00ed
+profile=Profil
+applications=Aplikace
+more_applications=Dal\u0161\u00ed aplikace
+manage=Spravovat
+settings=Nastaven\u00ed
+account=\u00da\u010det
+help=N\u00e1pov\u011bda
+log_out=Odhl\u00e1sit se
+about_dhis2=O DHIS 2
+missing_translation_file=Chyb\u00ed p\u0159ekladov\u00fd soubor
+missing_translation_using_default=Pro vybran\u00e9 n\u00e1rodn\u00ed prost\u0159ed\u00ed nebyl nalezen \u017e\u00e1dn\u00fd p\u0159ekladov\u00fd soubor. Pou\u017e\u00edv\u00e1 se v\u00fdchoz\u00ed p\u0159eklad (angli\u010dtina).
+loading_tree=Na\u010d\u00edt\u00e1n\u00ed stromu organiza\u010dn\u00ed jednotky
+loading_metadata=Na\u010d\u00edt\u00e1n\u00ed metadat
+loading_components=Na\u010d\u00edt\u00e1n\u00ed komponent
+latitude=Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka
+longitude=Zem\u011bpisn\u00e1 d\u00e9lka
+lat_lng=[Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka a d\u00e9lka]
+get=Z\u00edskat
+get_from_map=Z\u00edskat z mapy
+capture=Sb\u011br dat
+nothing_captured=Nic nen\u00ed zachyceno
+point_and_click_for_coordinate=Kliknut\u00edm prav\u00fdm tla\u010d\u00edtkem na mapu nastav\u00edte um\u00edst\u011bn\u00ed
+value_must_be_between=Hodnota mus\u00ed b\u00fdt mezi
+locate_organisation_unit_by_name=Vyhledejte organiza\u010dn\u00ed jednotku podle n\u00e1zvu
+dashboard_layout_saved=Rozlo\u017een\u00ed ovl\u00e1dac\u00edho panelu ulo\u017eeno
+dashboard_layout_saved_as_default=Rozlo\u017een\u00ed ovl\u00e1dac\u00edho panelu je ulo\u017eeno jako v\u00fdchoz\u00ed
+dashboard_layout_not_saved=Rozlo\u017een\u00ed ovl\u00e1dac\u00edho panelu nebylo ulo\u017eeno
+dashboard_layout_not_saved_as_default=Nepoda\u0159ilo se ulo\u017eit rozlo\u017een\u00ed ovl\u00e1dac\u00edho panelu jako v\u00fdchoz\u00ed
+dashboard_layout_not_fetched=Na\u010dten\u00ed rozvr\u017een\u00ed ovl\u00e1dac\u00edho panelu se nezda\u0159ilo
+failed_to_fetch_enrollment=Na\u010dten\u00ed registrace ze serveru se nezda\u0159ilo
+failed_to_save_enrollment=Nepoda\u0159ilo se ulo\u017eit z\u00e1pis na server
+failed_to_update_enrollment=Aktualizace z\u00e1pisu na serveru se nezda\u0159ila
+ou_search_scope=Rozsah organiza\u010dn\u00ed jednotky
+zoom_in=P\u0159ibl\u00ed\u017eit
+zoom_out=Odd\u00e1lit
+center_map=Vyst\u0159edit mapu
+set_coordinate=Nastavit sou\u0159adnice
+coordinate=Sou\u0159adnice
+show_active_only=Zobrazit pouze aktivn\u00ed
+all_enrollment=Jak\u00fdkoli stav z\u00e1pisu
+active_enrollment=Pouze ti s aktivn\u00edm z\u00e1pisem
+cancelled_enrollment=Pouze ti, kte\u0159\u00ed maj\u00ed zru\u0161enou registraci
+completed_enrollment=Pouze ti, kte\u0159\u00ed maj\u00ed dokon\u010den\u00fd z\u00e1pis
+filter_events=Filtrovat ud\u00e1losti
+list_events=Seznam v\u0161ech ud\u00e1lost\u00ed
+prev_period=P\u0159edchoz\u00ed obdob\u00ed
+nxt_period=Dal\u0161\u00ed obdob\u00ed
+period=Obdob\u00ed
+jan=Leden
+feb=\u00fanor
+mar=b\u0159ezen
+apr=Duben
+may=Kv\u011bten
+jun=\u010derven
+jul=\u010dervenec
+aug=Srpen
+sep=Z\u00e1\u0159\u00ed
+oct=\u0159\u00edjen
+nov=Listopad
+dec=prosinec
+week=T\u00fdden
+save_layout_as_default=Ulo\u017een\u00e9 rozlo\u017een\u00ed ovl\u00e1dac\u00edho  panelu jako v\u00fdchoz\u00ed
+reset_layout=Obnovit rozlo\u017een\u00ed ovl\u00e1dac\u00edho panelu
+is_expected_to_be=se o\u010dek\u00e1v\u00e1, \u017ee bude
+but_found=ale nalezeno
+equals_to=rovn\u00e1 se
+less_than=m\u00e9n\u011b ne\u017e
+greater_than=v\u011bt\u0161\u00ed ne\u017e
+inactive=Neaktivn\u00ed
+activate=aktivovat
+deactivate=Deaktivovat
+tei_inactive_only_read=je neaktivn\u00ed. Jsou povoleny pouze operace \u010dten\u00ed.
+hide_menu=Skr\u00fdt nab\u00eddku
+extend_menu=Roz\u0161\u00ed\u0159it nab\u00eddku
+show_main_menu=Zobrazit hlavn\u00ed nab\u00eddku
+stick_right_widgets=P\u0159ilepit prav\u00e9 bo\u010dn\u00ed widgety
+unstick_right_widgets=Odlepit widgety na prav\u00e9 stran\u011b
+existing_associate=St\u00e1vaj\u00edc\u00ed spolupracovn\u00edk
+value_not_unique=Hodnota nen\u00ed jedine\u010dn\u00e1
+custom_form_has_invalid_attribute=Vlastn\u00ed formul\u00e1\u0159 m\u00e1 neplatn\u00fd atribut.
+custom_form_has_invalid_dataelement=Vlastn\u00ed formul\u00e1\u0159 obsahuje neplatn\u00fd datov\u00fd prvek.
+events_today_persons=Pouze ti, kte\u0159\u00ed maj\u00ed dnes ud\u00e1lost
+section_has_no_dataelements=Sekce neobsahuje \u017e\u00e1dn\u00e9 datov\u00e9 prvky
+section=Sekce
+display_mode=Zobrazovac\u00ed m\u00f3d
+tracker_capture_display_mode=Re\u017eim zobrazen\u00ed sb\u011bru dat trasova\u010de
+events_today_all=V\u0161echny ud\u00e1losti dnes
+events_today_completeoractive=Dokon\u010den\u00e9 nebo aktivn\u00ed
+events_today_skipped=P\u0159esko\u010deno
+events_today_scheduled=Napl\u00e1nov\u00e1no
+multiple_records_warning=Nalezeno v\u00edce z\u00e1znam\u016f. Up\u0159esn\u011bte pros\u00edm.
+result=V\u00fdsledek
+no_record_found=Nenalezen \u017e\u00e1dn\u00fd z\u00e1znam
+no_record_found_create=Nebyl nalezen \u017e\u00e1dn\u00fd z\u00e1znam. Chcete vytvo\u0159it nov\u00fd z\u00e1znam?
+print_form=Tisk formul\u00e1\u0159e
+value_must_be_email=Zadejte platnou e-mailovou adresu
+click_to_edit_view_complete_notes=Kliknut\u00edm uprav\u00edte / zobraz\u00edte kompletn\u00ed pozn\u00e1mky
+complete_and_exit =Dokon\u010dit a odej\u00edt
+are_you_sure_to_cancel_editing=Opravdu chcete zru\u0161it \u00fapravy tohoto profilu?
+are_you_sure_to_cancel_registration=Opravdu chcete zru\u0161it tuto registraci?
+schedule=Pl\u00e1n
+scheduled_date=Pl\u00e1novan\u00e9 datum
+show_new_event_menu=Zobrazit nov\u00e9 menu ud\u00e1losti
+no_stages_available=V\u0161echny o\u010dek\u00e1van\u00e9 ud\u00e1losti jsou ji\u017e p\u0159\u00edtomny, nelze vytvo\u0159it v\u00edce ud\u00e1lost\u00ed.
+make_referral=Prove\u010fte doporu\u010den\u00ed
+referral=Doporu\u010den\u00ed
+show_previous=Zobrazit p\u0159edchoz\u00ed
+show_next=Zobrazit dal\u0161\u00ed
+schedule_new=Napl\u00e1novat nov\u00fd
+save_note=Ulo\u017eit pozn\u00e1mku
+add_justification=Zde p\u0159idejte od\u016fvodn\u011bn\u00ed
+please_complete_all_results_before_add = P\u0159ed p\u0159id\u00e1n\u00edm nov\u00e9ho vypl\u0148te v\u0161echny v\u00fdsledky
+please_complete_all_results_before_schedule = P\u0159ed napl\u00e1nov\u00e1n\u00edm nov\u00e9ho vypl\u0148te v\u0161echny v\u00fdsledky
+please_complete_all_results_before_referral = Nejprve vypl\u0148te v\u0161echny v\u00fdsledky
+no_designation=Bez ozna\u010den\u00ed
+main_menu=Hlavn\u00ed menu
+complete_event_and_enrollment=Kompletn\u00ed ud\u00e1lost a z\u00e1pis
+are_you_sure_to_complete_event_and_enrollment=Opravdu chcete dokon\u010dit tuto ud\u00e1lost a z\u00e1pis?
+enrollment_is_not_active=Z\u00e1pis nen\u00ed aktivn\u00ed
+please_complete_all_events=Nejprve dokon\u010dete v\u0161echny ud\u00e1losti
+scheduling_disabled_for_programstage=Pl\u00e1nov\u00e1n\u00ed je pro tuto f\u00e1zi programu zak\u00e1z\u00e1no
+event_already_scheduled=Ud\u00e1lost je ji\u017e napl\u00e1nov\u00e1na
+programstage_multiple_events_disabled=Tato f\u00e1ze programu neumo\u017e\u0148uje v\u00edce ud\u00e1lost\u00ed
+event_cant_be_created=Nelze vytvo\u0159it novou ud\u00e1lost
+created=Vytvo\u0159eno
+auditType=Typ auditu
+modifiedBy=Upraveno
+audit_history_unavailable=Historie auditu nen\u00ed k dispozici
+delete_error_audit=Ud\u00e1lost nelze odstranit, proto\u017ee obsahuje protokol auditu.
+are_you_sure_to_remove=Opravdu chcete odebrat?
+completed_label=Dokon\u010deno
+stage_completed=Ud\u00e1lost je dokon\u010dena
+stage_completed_label=V\u0161e dokon\u010deno
+executed=Otev\u0159eno pro zad\u00e1v\u00e1n\u00ed dat
+executed_label=Otev\u0159\u00edt
+stage_executed=Ud\u00e1lost je otev\u0159en\u00e1
+stage_executed_label=Otev\u0159\u00edt nalezen\u00e9
+ontime=Napl\u00e1nov\u00e1no
+ontime_label=Napl\u00e1nov\u00e1no
+stage_ontime=Ud\u00e1lost je napl\u00e1nov\u00e1na
+stage_ontime_label=Pl\u00e1nov\u00e1n\u00ed nalezeno
+overdue=Po term\u00ednu
+overdue_label=Po term\u00ednu
+stage_overdue=Ud\u00e1lost je po term\u00ednu
+stage_overdue_label=Nalezeno zpo\u017ed\u011bn\u00ed
+skipped=P\u0159esko\u010den\u00e1 ud\u00e1lost
+skipped_label=P\u0159esko\u010den\u00e1 ud\u00e1lost
+stage_empty=Vypr\u00e1zdnit
+stage_empty_label=Vypr\u00e1zdnit
+complete_active_events_before_completing_enrollment=P\u0159ed dokon\u010den\u00edm z\u00e1pisu pros\u00edm dokon\u010dete aktivn\u00ed ud\u00e1losti
+complete_enrollment_failed=Dokon\u010den\u00ed se nezda\u0159ilo
+are_you_sure_to_complete_enrollment_delete_schedule=Opravdu chcete dokon\u010dit tento z\u00e1pis? St\u00e1vaj\u00edc\u00ed napl\u00e1novan\u00e9 ud\u00e1losti a ud\u00e1losti po vypr\u0161en\u00ed budou smaz\u00e1ny
+no_active_enrollment=\u017d\u00e1dn\u00fd aktivn\u00ed z\u00e1pis. Zapi\u0161te se pros\u00edm z widgetu pro z\u00e1pis.
+events_today=Ud\u00e1losti vypr\u0161\u00ed dnes
+events_in_one_week=Ud\u00e1losti splatn\u00e9 za t\u00fdden
+events_in_two_weeks=Ud\u00e1losti vypr\u0161\u00ed za dva t\u00fddny
+events_in_one_month=Ud\u00e1losti vypr\u0161\u00ed za m\u011bs\u00edc
+choose_the_dates=Zvolte data
+fill_all_category_options=Vypl\u0148te v\u0161echny mo\u017enosti kategori\u00ed
+description=Popis
+url=URL
+not_available=Nen\u00ed dostupn\u00fd
+attribute=Atribut
+data_entry=Vstup dat
+invalid_coordinate_format=Neplatn\u00fd form\u00e1t sou\u0159adnic
+latitude_longitude_format=Zem\u011bpisn\u00e1 d\u00e9lka zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka
+missing_search_ous=U\u017eivatel nem\u00e1 p\u0159i\u0159azen\u00e9 \u017e\u00e1dn\u00e9 Organiza\u010dn\u00ed jednotky
+cocbo_filter=Filtr kategorie a mo\u017enosti kategorie
+apply=Pou\u017e\u00edt
+attribute_category_selection=V\u00fdb\u011br kategorie atribut\u016f
+event_filter=Filtrujte ud\u00e1losti podle hodnoty datov\u00e9ho prvku, f\u00e1ze nebo n\u00e1zvu organiza\u010dn\u00ed jednotky
+validation_errors=Chyby aktu\u00e1ln\u011b ve formul\u00e1\u0159i:
+validation_warnings=Uv\u011bdomte si tato upozorn\u011bn\u00ed:
+openstreetmap=OpenStreetMap
+googlemap=Google Mapy
+missing_google_map_api_key=Chyb\u00ed kl\u00ed\u010d API Google Maps. To lze nakonfigurovat v Nastaven\u00ed syst\u00e9mu (Nastaven\u00ed p\u0159\u00edstupu).
+missing_mapzen_search_api_key=Chyb\u00ed kl\u00ed\u010d API pro vyhled\u00e1v\u00e1n\u00ed Mapzen. To lze nakonfigurovat v Nastaven\u00ed syst\u00e9mu (Nastaven\u00ed p\u0159\u00edstupu).
+sms=SMS
+email=E-mail
+email_address=E-mailov\u00e1 adresa
+wrong_email=Zadejte platnou e-mailovou adresu
+email_subject=P\u0159edm\u011bt
+message=Zpr\u00e1va
+gridColumns_fetch_failed=Nepoda\u0159ilo se na\u010d\u00edst sloupce m\u0159\u00ed\u017eky, kter\u00e9 se maj\u00ed zobrazit
+gridColumns_invalid=Ze serveru byly vr\u00e1ceny neplatn\u00e9 sloupce m\u0159\u00ed\u017eky
+dasboard_layout_saving_failed=Ulo\u017een\u00ed rozvr\u017een\u00ed ovl\u00e1dac\u00edho panelu se nezda\u0159ilo
+failed_to_register_tei=Nepoda\u0159ilo se zaregistrovat trasovanou instanci entity na serveru
+failed_to_update_tei=Aktualizace trasovan\u00e9 instance entity na serveru se nezda\u0159ila
+failed_to_generate_tracked_entity_attribute=Vygenerov\u00e1n\u00ed hodnoty atributu se nezda\u0159ilo
+failed_to_fetch_events=Na\u010dten\u00ed ud\u00e1lost\u00ed ze serveru se nezda\u0159ilo
+failed_to_update_event=Aktualizace ud\u00e1losti na serveru se nezda\u0159ila
+failed_to_send_message=Zpr\u00e1vu se nepoda\u0159ilo odeslat
+file_missing=Soubor chyb\u00ed
+file_upload_failed=Nahr\u00e1n\u00ed souboru se nezda\u0159ilo
+missing_file_identifier= Chyb\u00ed identifik\u00e1tor souboru
+unsupported_value_type=Nepodporovan\u00fd typ hodnoty
+event_date_out_of_range=Zadan\u00e9 datum nelze nastavit. Nakonfigurovan\u00fd po\u010det dn\u016f vypr\u0161en\u00ed platnosti programu uplynul po obdob\u00ed obsahuj\u00edc\u00edm datum.
+date_out_of_ou_period=Datum nen\u00ed v po\u010d\u00e1te\u010dn\u00edm a koncov\u00e9m datu organiza\u010dn\u00ed jednotky.
+orgunit_closed= Organiza\u010dn\u00ed jednotka je uzav\u0159ena. Registrace a \u00fapravy jsou zak\u00e1z\u00e1ny.
+dob=Datum narozen\u00ed
+years=Let
+months=M\u011bs\u00edce
+days=Dn\u016f
+age_fields_info=Informace o v\u011bkov\u00fdch pol\u00edch
+reponse_from_server=Odpov\u011b\u010f ze serveru.
+loading-audit-data=Na\u010d\u00edt\u00e1n\u00ed dat auditu.
+more_options_available=v\u00edce mo\u017enost\u00ed k dispozici, zkuste hledat ...
+move_permanently=P\u0159esunout trvale
+onetime_referral=Jednor\u00e1zov\u00e9 doporu\u010den\u00ed
+are_you_sure_you_want_to_move_permanently=Opravdu chcete pacienta trvale p\u0159em\u00edstit?
+ok=OK
+can_not_add_new_enrollment=Nelze p\u0159idat novou registraci, proto\u017ee tento program umo\u017e\u0148uje pouze jednu registraci.
+switch_compare_form=P\u0159epnout na srovn\u00e1n\u00ed formul\u00e1\u0159e
+switch_default_form=P\u0159epnout na v\u00fdchoz\u00ed formul\u00e1\u0159
+switch_tabel_form=P\u0159epnout na tabulkov\u00fd formul\u00e1\u0159
+url_format=http(s)://
+url_error=Zkontrolujte, zda je adresa URL platn\u00e1.
+time_error=\u0160patn\u00fd form\u00e1t \u010dasu
+no_blank_date=Akce vy\u017eaduje datum. Chcete-li m\u00edsto toho napl\u00e1novat ud\u00e1lost, sma\u017ete tuto ud\u00e1lost a vytvo\u0159te novou napl\u00e1novanou ud\u00e1lost.
+not_authorized_to_uncomplete_event=Nem\u00e1te opr\u00e1vn\u011bn\u00ed k nedokon\u010den\u00ed ud\u00e1lost\u00ed.
+both_date_and_time=Zkontrolujte, zda jsou vypln\u011bna pole pro datum a \u010das a zda maj\u00ed spr\u00e1vn\u00fd form\u00e1t. Jinak nebudou data ulo\u017eena.
+wrong_time_format=Zajist\u011bte, aby byl dodr\u017een form\u00e1t \u010dasu (HH:MM).
+hours_and_minutes=HH:MM
+top_bar_settings=Nastaven\u00ed horn\u00ed li\u0161ty
+show=Zobrazit
+sort_order=Po\u0159ad\u00ed \u0159azen\u00ed
+activate_top_bar=Aktivovat horn\u00ed li\u0161tu
+use_as_top_bar=Pou\u017e\u00edt jako horn\u00ed li\u0161tu
+remove_widget=Odebrat widget?
+remove_widget_info=Chyst\u00e1te se odstranit widget. Chcete pokra\u010dovat?
+lock_default_layout=Uzamknout rozlo\u017een\u00ed pro v\u0161echny u\u017eivatele
+unlock_default_layout=Odemknout rozlo\u017een\u00ed pro v\u0161echny u\u017eivatele
+upload_image=Nahr\u00e1t
+please_select_an_image=[Vyberte obr\u00e1zek]
+all=V\u0161e
+ALL=V\u0161e
+completed=Dokon\u010deno
+active=Aktivn\u00ed
+cancelled=Zru\u0161eno
+enrollment_status=Stav z\u00e1pisu
+go_to_registration=P\u0159ej\u00edt na registraci
+tracked_entity_instance_search_results_header={trackedEntityTypeName} v\u00fdsledky vyhled\u00e1v\u00e1n\u00ed
+tracked_entity_instance_search_matches_description=Pokud \u017e\u00e1dn\u00e1 z v\u00fd\u0161e uveden\u00fdch shod nen\u00ed {trackedEntityTypeName}, kterou hled\u00e1te, zvolte \u201eP\u0159ej\u00edt na registraci\u201c.
+tracked_entity_instance_unique_found_header=Nalezeno {trackedEntityTypeName}
+tracked_entity_instance_unique_found_description=Byl nalezen {trackedEntityTypeName} v jin\u00e9m {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=Nebylo nalezeno {trackedEntityTypeName}.
+no_tracked_entity_instance_found_description=Nebylo nalezeno {trackedEntityTypeName}.
+no_tracked_entity_instance_found_go_to_registration_description=Nebyla nalezena polo\u017eka {trackedEntityTypeName}. Chcete-li ji zaregistrovat jako novou, klikn\u011bte na \u201eP\u0159ej\u00edt na registraci\u201c {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} ji\u017e existuje
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} ji\u017e existuje pro dal\u0161\u00ed {trackedEntityTypeName}. Chcete otev\u0159\u00edt toto {trackedEntityTypeName}?
+possible_duplicates_found=Byly nalezeny mo\u017en\u00e9 duplik\u00e1ty.
+view_x_candidates=Zobrazit {count} kandid\u00e1t\u016f
+view_candidate=Zobrazit kandid\u00e1ta
+matching_tracked_entity_instance_register_description=Kliknut\u00edm otev\u0159ete libovoln\u00e9 odpov\u00eddaj\u00edc\u00ed {trackedEntityTypeName} nebo se vra\u0165te a dokon\u010dete registraci.
+review_possible_duplicates_before_registration=P\u0159ed registrac\u00ed zkontrolujte mo\u017en\u00e9 duplik\u00e1ty
+review_possible_duplicates_description=Otev\u0159ete n\u011bkter\u00e9ho z v\u00fd\u0161e uveden\u00fdch duplicitn\u00edch kandid\u00e1t\u016f nebo se kliknut\u00edm zaregistrujte jako nov\u00fd {trackedEntityTypeName}
+register_new_tracked_entity_instance=Zaregistrovat nov\u00fd {trackedEntityTypeName}
+large_number_of_search_results_warning=Bylo nalezeno velk\u00e9 mno\u017estv\u00ed shod. Vra\u0165te se a up\u0159esn\u011bte krit\u00e9ria vyhled\u00e1v\u00e1n\u00ed nebo p\u0159ejd\u011bte k registraci.
+too_many_search_results=P\u0159\u00edli\u0161 mnoho v\u00fdsledk\u016f hled\u00e1n\u00ed
+open=Otev\u0159\u00edt
+continue=Pokra\u010dovat
+no_program_write_access=K odes\u00edl\u00e1n\u00ed zpr\u00e1v je pot\u0159eba opr\u00e1vn\u011bn\u00ed k z\u00e1pisu do programu
+show_all=Uk\u00e1zat v\u0161e
+not_allowed=Nepovoleno
+you_do_not_have_the_necessary_authorities_to_delete=K odstran\u011bn\u00ed nem\u00e1te pot\u0159ebn\u00e1 opr\u00e1vn\u011bn\u00ed
+this=tento
+delete_failed=Smaz\u00e1n\u00ed se nezda\u0159ilo
+cannot_delete_this_enrollment_because_it_already_contains_events=Tento z\u00e1pis nelze odstranit, proto\u017ee ji\u017e obsahuje ud\u00e1losti. P\u0159ed odstran\u011bn\u00edm z\u00e1pisu pros\u00edm sma\u017ete ud\u00e1losti
+cannot_delete_this_tei_because_it_already_contains_enrollments=Tuto sledovanou entitu nelze odstranit, proto\u017ee ji\u017e obsahuje registrace. P\u0159ed odstran\u011bn\u00edm instance sledovan\u00e9 entity pros\u00edm odstra\u0148te registrace
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=Ve vybran\u00e9m programu nebyl nalezen {trackedEntityTypeName}. Zobrazuj\u00ed se v\u00fdsledky z jin\u00fdch program\u016f
+drop_image=Vhodit obr\u00e1zek
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Abyste mohli vyhled\u00e1vat bez kontextu programu, pot\u0159ebujete p\u0159\u00edstup ke \u010dten\u00ed alespo\u0148 jednoho typu trasovan\u00e9 entity
+missing_read_access_for_tracked_entity_type=Pro typ sledovan\u00e9 entity chyb\u00ed p\u0159\u00edstup pro \u010dten\u00ed
+stage_write_required=Je vy\u017eadov\u00e1n p\u0159\u00edstup pro z\u00e1pis do programovac\u00ed f\u00e1ze
+you_need_write_to_program_stage_to_be_able_to_create_event=Abyste mohli vytvo\u0159it novou ud\u00e1lost, pot\u0159ebujete do t\u00e9to programov\u00e9 f\u00e1ze p\u0159\u00edstup pro z\u00e1pis
+no_polygon_captured=Nebyl zachycen \u017e\u00e1dn\u00fd polygon
+polygon_captured=Polygon zaznamen\u00e1n
+no_geometry_captured=Nebyla zachycena \u017e\u00e1dn\u00e1 geometrie
+geometry=Geometrie
+tracked_entity_type=Typ trasovan\u00e9 entity
+type=Typ
+tracked_entity_type_has_no_attributes=Typ trasovan\u00e9 entity nem\u00e1 \u017e\u00e1dn\u00e9 atributy.
+belongs_to_another_organisation_unit=pat\u0159\u00ed do jin\u00e9 organiza\u010dn\u00ed jednotky
+please_fill_in_a_reason_for_accessing=Vypl\u0148te pros\u00edm d\u016fvod p\u0159\u00edstupu
+your_action_is_being_monitored=Va\u0161e akce je sledov\u00e1na
+this=tento
+saving_relationship_failed_conflicts=Ulo\u017een\u00ed vztahu se nezda\u0159ilo. Konflikty
+saving_relationship_failed=Ulo\u017een\u00ed vztahu selhalo.
+open_tei_error=Otev\u0159en\u00ed TEI se nezda\u0159ilo
+PROGRAM_ACCESS_CLOSED=\u017d\u00e1dn\u00fd p\u0159\u00edstup k trasovan\u00fdm instanc\u00edm entit mimo p\u0159i\u0159azen\u00e9 organiza\u010dn\u00ed jednotky pro sb\u011br dat.
+compare_form_previous=Porovnat p\u0159edchoz\u00ed formul\u00e1\u0159
+compare_form_all=Porovnat v\u0161echy formul\u00e1\u0159e
+grid_form=M\u0159\u00ed\u017ekov\u00fd formul\u00e1\u0159
+pop_over_form=POP-over formul\u00e1\u0159
+failed_to_delete_enrollment=Nepoda\u0159ilo se smazat z\u00e1pis
+enrollment_polygon=Polygon z\u00e1pisu
+enrollment_point=Zapisovac\u00ed bod
+event_polygon=Polygon ud\u00e1losti
+event_point=Bod ud\u00e1losti
+point_on_map=Bod na map\u011b
+polygon_on_map=Polygon na map\u011b
+cancel_capturing_polygon=Zru\u0161it zachycen\u00ed polygonu
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=Moment\u00e1ln\u011b jste v re\u017eimu kreslen\u00ed. V\u0161echny nedokon\u010den\u00e9 zm\u011bny budou ztraceny.
+complete_stage=Dokon\u010dit f\u00e1zi?
+complete_stage_info=Chcete nastavit dokon\u010den\u00ed t\u00e9to f\u00e1ze?
+assigned_user=P\u0159i\u0159azen\u00fd u\u017eivatel
+linked_events=Propojen\u00e9 ud\u00e1losti
+user_assignment=P\u0159i\u0159azen\u00ed u\u017eivatele
+specific_users=Konkr\u00e9tn\u00ed u\u017eivatel\u00e9:
+none=\u017d\u00e1dn\u00fd
+any=Jak\u00fdkoliv
+no_requirement=\u017d\u00e1dn\u00fd po\u017eadavek
+the_record_has_is_possible_duplicate=Z\u00e1znam m\u00e1 / je mo\u017en\u00fd duplik\u00e1t
+flag_possible_duplicate=Ozna\u010dit mo\u017en\u00fd duplik\u00e1t
+possible_duplicate=Mo\u017en\u00fd duplik\u00e1t
+unflag=Odzna\u010dit vlajku
+possible_duplicate_info_start=Mo\u017en\u00fd duplik\u00e1t: Toto
+possible_duplicate_info_end= je nebo m\u00e1 mo\u017en\u00fd duplik\u00e1t a byl ozna\u010den ke kontrole.
+owned_by=Ve vlastnictv\u00ed:
+change_date_with_dependency_information=Aktualizace tohoto data m\u016f\u017ee vy\u017eadovat dal\u0161\u00ed akci. Ud\u00e1losti v tomto programu byly napl\u00e1nov\u00e1ny na z\u00e1klad\u011b tohoto data, ale tyto ud\u00e1losti nebudou automaticky p\u0159elo\u017eeny. Chcete pokra\u010dovat v aktualizaci data?
+custom_working_list=Vlastn\u00ed pracovn\u00ed seznam
diff --git a/i18n/i18n_app_da.properties b/i18n/i18n_app_da.properties
new file mode 100644
index 000000000..911275200
--- /dev/null
+++ b/i18n/i18n_app_da.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Create
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Required
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Name
+filter=Filter
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Jump to page
+page=Page
+first=First
+previous=Previous
+next=Next
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=Find
+edit=Edit
+edit_profile=Edit profile
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Delete
+deleted=deleted
+remove=Remove
+entity=Entity
+clear=Clear
+add=Add
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Complete
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=Status
+event_completed=Event completed?
+details=Click to see details
+_details=Details
+created_by=Registered by
+date=Date
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=Dashboard
+home=Home
+back=Back
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Select
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicators
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Feedback
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=NRHM Reports
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=No value
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Organisation unit
+org_unit_scope=Organisation unit scope
+SELECTED=Selected
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Data element
+value=Value
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Close
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=Due date
+event_date=Event date
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Yes
+no=No
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=New
+add_new=Add new
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=Error
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisation unit
+category=Category
+entity_type=Entity type
+save=Save
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Go back
+cancel=Cancel
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Profile
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=Settings
+account=Account
+help=Help
+log_out=Log out
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Period
+jan=January
+feb=February
+mar=March
+apr=April
+may=May
+jun=June
+jul=July
+aug=August
+sep=September
+oct=October
+nov=November
+dec=December
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Main menu
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Description
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=Years
+months=Months
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=All
+ALL=All
+completed=Completed
+active=Active
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=None
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_es.properties b/i18n/i18n_app_es.properties
index 69a991fe3..aa36d2889 100644
--- a/i18n/i18n_app_es.properties
+++ b/i18n/i18n_app_es.properties
@@ -1,4 +1,4 @@
-tracker_capture=Captura del rastreador
+tracker_capture=Registro de informaci\u00f3n de seguimiento
 online_notification=Est\u00e1 conectado
 offline_notification=Est\u00e1s desconectado
 login_failed=El acceso fall\u00f3, por favor revise su nombre de usuario y contrase\u00f1a e intente nuevamente
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=Todav\u00eda no se ha realizado inscripci\u00f3n. No
 not_yet_enrolled_enrollment=No hay inscripciones.
 no_active_enrollment_exists=No hay inscripciones activas para el programa seleccionado
 no_active_enrollments_exist=No hay inscripciones activas
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Todav\u00eda no se ha realizado inscripci\u00f3n. No es posible guardar notas.
 not_yet_enrolled_report=Todav\u00eda no se ha realizado inscripci\u00f3n. No es posible generar informes.
 no_data_report=No hay registros para generar informes
@@ -36,10 +37,10 @@ view_all=[Mostrar todos]
 list_all_entities=Mostrar todas las entidades
 list_all=Mostrar todo
 list=Mostrar
-lists=Lists
+lists=Listas
 invalid=No v\u00e1lido
 selected_tei_is_invalid=La instancia de entidad de seguimiento seleccionada no es v\u00e1lida
-required=Requerido
+required=Necesario
 number_required=N\u00famero obligatorio
 date_required=Fecha obligatoria
 number=N\u00famero
@@ -61,7 +62,7 @@ name=Nombre
 filter=filtro
 search=Buscar
 _search=buscar
-search_by_name=Buscar por nombre
+search_by_name=B\u00fasqueda por nombre
 search_by_data_element=B\u00fasqueda por elemento de datos
 search_by_attribute=B\u00fasqueda por atributos
 search_for=Buscar por
@@ -73,15 +74,15 @@ empty=Vac\u00edo
 form_is_empty_fill_at_least_one=El formulario est\u00e1 vac\u00edo, por favor, rellene al menos un campo
 no_event_exists=No existe ning\u00fan evento
 total=Total
-total_number_of_pages=No de p\u00e1ginas
-rows_per_page=No de filas por p\u00e1gina
+total_number_of_pages=N\u00famero de p\u00e1ginas
+rows_per_page=N\u00famero de filas por p\u00e1gina
 jump_to_page=Ir a la p\u00e1gina
 page=P\u00e1gina
 first=Primero
 previous=Anterior
 next=Siguiente
 last=\u00daltimo
-go_to_dashboard=Ir al cuadro de mandos
+go_to_dashboard=Ir al tablero
 go=Ir
 find=Encontrar
 edit=Editar
@@ -90,9 +91,9 @@ tracker_associate=Asociado del rastreador
 association=Gestionar asociaciones
 change_location=Gestionar localizaci\u00f3n
 details_history=Detalles/hist\u00f3rico
-history=Histo\u00cc\u0081rico
+history=Hist\u00f3rico
 canceled=Cancelado
-delete=Borrar
+delete=Eliminar
 deleted=eliminado
 remove=Eliminar
 entity=Entidad
@@ -140,7 +141,7 @@ available_search_attributes=Habilitar la b\u00fasqueda de atributos
 selected_search_attributes=Buscar atributos seleccionados
 selected_program=Programa seleccionado
 other_programs=Otros programas
-search_for_dashboard=Buscar elementos del cuadro de mandos
+search_for_dashboard=Buscar elementos del tablero
 dashboard=Tablero
 home=Inicio
 back=Atr\u00e1s
@@ -156,8 +157,8 @@ enrollment_date=Fecha de inscripci\u00f3n
 incident_date=Fecha del incidente
 notes=Notas
 relationship=Relaci\u00f3n
-relationshipTo=Outgoing relationships
-relationshipFrom=Incoming relationships
+relationshipTo=Relaciones salientes
+relationshipFrom=Relaciones entrantes
 relationships=Relaciones
 add_relationship=A\u00f1adir relaci\u00f3n
 a_is_to_b=A es de B
@@ -176,8 +177,8 @@ feedback=Retroalimentaci\u00f3n
 no_feedback_exist=No hay comentarios
 custom_form=Formulario personalizado
 default_form=Formulario predeterminado
-menu=Menu\u0301
-tracker_reports=Informes del Rastreador
+menu=Men\u00fa
+tracker_reports=Informes del rastreador
 reports=Informes
 registration_and_data_entry=Registro y Entrada de Datos
 program_summary_report=Informe resumido del programa
@@ -205,6 +206,7 @@ registered_data=Datos registrados
 no_value=Sin valor
 no_data_found=Dato no encontrado
 no_data=No hay datos
+mo_matching_data=No data matching your search criteria
 data_exists=Existen datos
 data_registerd=No hay datos registrados
 no_visit_made=Ninguna visita hecha
@@ -218,8 +220,8 @@ set_as_current=Establecer como actual
 org_unit=Unidad organizativa
 org_unit_scope=Alcance de la unidad organizativa a utilizar
 SELECTED=Seleccionado
-CHILDREN=Hijos inmediatos
-DESCENDANTS=Todos los hijos
+CHILDREN=\u00danicamente el nivel inmediatamente inferior
+DESCENDANTS=Todos los niveles inferiores
 ACCESSIBLE=Todo accesible
 data_element=Elemento de datos
 value=Valor
@@ -273,7 +275,7 @@ exact_date=Fecha exacta
 exact_value=Valor exacto
 EQ=Igual
 GT=Mayor que
-GE=>\=
+GE=Mayor o igual que
 LT=Menor que
 LE=Menor o igual que
 NE=No es igual a
@@ -326,7 +328,7 @@ save_and_go_back=Guardar y volver
 save_and_continue=Guardar y continuar
 save_relationship=Guardar relaci\u00f3n
 delete_relationship=Borrar relaci\u00f3n
-can_not_delete_relationship=Can not delete relationship because of lacking write access.
+can_not_delete_relationship=No se puede eliminar la relaci\u00f3n por falta de permiso de escritura.
 go_back=Ir atr\u00e1s
 cancel=Cancelar
 are_you_sure_to_delete_relationship=\u00bfEst\u00e1 seguro de que quiere borrar la relaci\u00f3n ?
@@ -352,6 +354,7 @@ advanced_search=B\u00fasqueda avanzada
 profile=Perfil
 applications=Aplicaciones
 more_applications=M\u00e1s aplicaciones
+manage=Gestionar
 settings=Configuraci\u00f3n
 account=Cuenta
 help=Ayuda
@@ -433,7 +436,7 @@ events_today_persons=S\u00f3lo aquellos con un evento hoy
 section_has_no_dataelements=La secci\u00f3n no tiene elementos de datos.
 section=Secci\u00f3n
 display_mode=Modo de visualizaci\u00f3n
-tracker_capture_display_mode=Modo de visualizaci\u00f3n de la captura del rastreador
+tracker_capture_display_mode=Modo de visualizaci\u00f3n del registro de informaci\u00f3n de seguimiento
 events_today_all=Todos los eventos de hoy
 events_today_completeoractive=Completa o activa
 events_today_skipped=Omitido
@@ -446,9 +449,9 @@ print_form=Imprimir formato
 value_must_be_email=Por favor, introduzca una direcci\u00f3n v\u00e1lida de correo electr\u00f3nico
 click_to_edit_view_complete_notes=Haga clic para editar / ver notas completas
 complete_and_exit =Completar y salir
-are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_editing=\u00bfEst\u00e1 seguro de que quiere cancelar este perfil?
 are_you_sure_to_cancel_registration=\u00bfEst\u00e1 seguro de que quiere cancelar el registro?
-schedule=Programaci\u00f3n
+schedule=Programado
 scheduled_date=Fecha planificada
 show_new_event_menu=Mostrar nuevo men\u00fa de eventos
 no_stages_available=Todos los eventos esperados ya est\u00e1n creados, no se pueden crear m\u00e1s eventos .
@@ -499,10 +502,10 @@ stage_empty=Vac\u00edo
 stage_empty_label=Vac\u00edo
 complete_active_events_before_completing_enrollment=Por favor, complete los eventos activos antes de completar la inscripci\u00f3n
 complete_enrollment_failed=Fallo al completar la ficha
-are_you_sure_to_complete_enrollment_delete_schedule=\u00bfEst\u00e1 seguro de que quiere completar esta inscripci\u00f3n? Eventos planificados y caducados ser\u00e1n eliminados
+are_you_sure_to_complete_enrollment_delete_schedule=\u00bfEst\u00e1 seguro de que quiere completar esta inscripci\u00f3n? Los eventos planificados y caducados ser\u00e1n eliminados
 no_active_enrollment=No hay inscripci\u00f3n activa. Por favor inscribase desde el complemento de inscripci\u00f3n
 events_today=Eventos para hoy
-events_in_one_week=Eventos para dentro de una seman
+events_in_one_week=Eventos para dentro de una semana
 events_in_two_weeks=Eventos para dentro de dos semanas
 events_in_one_month=Evento para dentro de un mes
 choose_the_dates=Elegir fechas
@@ -512,7 +515,7 @@ url=URL
 not_available=No disponible
 attribute=Atributo
 data_entry=Introducci\u00f3n de datos
-invalid_coordinate_format=Invalid coordinate format
+invalid_coordinate_format=Formato de coordenadas inv\u00e1lido
 latitude_longitude_format=Longitud,latitud
 missing_search_ous=El usuario no dispone de unidades organizativas asignadas
 cocbo_filter=Filtro de categor\u00edas y opciones de categor\u00edas
@@ -524,7 +527,7 @@ validation_warnings=Advertencias de validaci\u00f3n
 openstreetmap=Mapa abierto (OSM)
 googlemap=Google Maps
 missing_google_map_api_key=Falta clave de la API de Google Maps
-missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Falta la clave Mapzen de la API de b\u00fasqueda. Esto puede ser configurado en la configuraci\u00f3n del sistema (Configuraci\u00f3n de acceso).
 sms=SMS
 email=Correo electr\u00f3nico
 email_address=Direcci\u00f3n de correo electr\u00f3nico
@@ -551,7 +554,7 @@ dob=Fecha de nacimiento
 years=A\u00f1os
 months=Meses
 days=D\u00edas
-age_fields_info=Age fields info
+age_fields_info=Campos de informaci\u00f3n de edad
 reponse_from_server=Respuesta del servidor.
 loading-audit-data=Cargando datos de auditor\u00eda.
 more_options_available=Hay m\u00e1s opciones disponibles, use el buscador...
@@ -560,27 +563,28 @@ onetime_referral=Referencia puntual.
 are_you_sure_you_want_to_move_permanently=\u00bfEst\u00e1 seguro que quiere mover al paciente permanentemente?
 ok=Correcto
 can_not_add_new_enrollment=No se puede a\u00f1adir una nueva inscripci\u00f3n porqu\u00e9 el programa solo permite una inscripci\u00f3n.
-switch_compare_form=Switch to compare form
-switch_default_form=Switch to default form
-switch_tabel_form=Switch to tabel form
+switch_compare_form=Cambio al formulario de comparaci\u00f3n
+switch_default_form=Cambio al formulario por defecto
+switch_tabel_form=Cambio al formulario tabel
 url_format=http(s)://
 url_error=Aseg\u00farese que la URL es v\u00e1lida.
-time_error=Wrong time format
-no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+time_error=Formato de tiempo err\u00f3neo
+no_blank_date=El evento necesita una fecha. Si desea programar el evento en su lugar, por favor borre este evento y cree un nuevo evento programado
 not_authorized_to_uncomplete_event=No tiene permisos para descompletar eventos.
-both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
-wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+both_date_and_time=Por favor, asegurese de que los campos de fecha y hora est\u00e1n rellenos con su correcto formato. Si no es as\u00ed, no se guardaran los cambios.
+wrong_time_format=Asegurese que se sigue el formato correcto (HH:MM)
 hours_and_minutes=HH:MM
 top_bar_settings=Configuraci\u00f3n de la barra superior.
 show=Mostrar
 sort_order=Criterio de ordenaci\u00f3n
 activate_top_bar=Activar la barra superior.
+use_as_top_bar=Usar como barra superior
 remove_widget=\u00bfDesea quitar el complemento?
 remove_widget_info=Est\u00e1 a punto de quitar este complemento. \u00bfDesea continuar?
 lock_default_layout=Bloquear el dise\u00f1o para todos los usuarios.
-unlock_default_layout=Unlock layout for all users
+unlock_default_layout=Desbloqueado el dise\u00f1o para todos los usuarios
 upload_image=Subir
-please_select_an_image=[Please select an image]
+please_select_an_image=[Seleccione una imagen]
 all=Todos
 ALL=Todos
 completed=Completado
@@ -588,77 +592,77 @@ active=Activo
 cancelled=Cancelar
 enrollment_status=Estado de la inscripci\u00f3n.
 go_to_registration=Ir al registro
-tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
-tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
-tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
-tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
-no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
-tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
-tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+tracked_entity_instance_search_results_header={trackedEntityTypeName} busca resultados
+tracked_entity_instance_search_matches_description=Si ninguno de los mostrados a continuaci\u00f3n es el {trackedEntityTypeName} que est\u00e1 buscando, elija "Ir al registro".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} encontrado
+tracked_entity_instance_unique_found_description=Una {trackedEntityTypeName} se ha encontrado en otra {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No se ha encontrado {trackedEntityTypeName}
+no_tracked_entity_instance_found_description=No se ha encontrado {trackedEntityTypeName}
+no_tracked_entity_instance_found_go_to_registration_description=No se ha encontrado {trackedEntityTypeName} , click 'Ir al registro' si desea registrar una nueva {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} ya existe
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} ya existe para otra {trackedEntityTypeName}. \u00bfDesea abrir esa {trackedEntityTypeName}?
 possible_duplicates_found=Encontrados posibles duplicados.
-view_x_candidates=View {count} candidates
+view_x_candidates=Ver {count} candidatos
 view_candidate=Ver candidato.
-matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+matching_tracked_entity_instance_register_description=Haga click para abrir cualquier coincidencia {trackedEntityTypeName} o vaya hacia atr\u00e1 y finalice el registro.
 review_possible_duplicates_before_registration=Revise si existen duplicados antes de registrar.
 review_possible_duplicates_description=Abra cualquier de los duplicados de arriba o clique en registrar como un nuevo {trackedEntityTypeName}
-register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
-large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+register_new_tracked_entity_instance=Registrar nueva {trackedEntityTypeName}
+large_number_of_search_results_warning=Se han encontrado un gran n\u00famero de coincidencias. Por favor, vaya hacia atr\u00e1s y reajuste su criterio de b\u00fasqueda o vaya al registro.
 too_many_search_results=Demasiados resultados de la b\u00fasqueda.
 open=Abierto
 continue=Seguir
-no_program_write_access=Program write authority needed to send messages
+no_program_write_access=Necesita permisos de escritura para mandar mensajes
 show_all=Mostrar todo
-not_allowed=Not allowed
+not_allowed=No permitido
 you_do_not_have_the_necessary_authorities_to_delete=No tiene los permisos suficientes para borrar.
-this=this
-delete_failed=Delete failed
-cannot_delete_this_enrollment_because_it_already_contains_events=No se puede borrar la inscripci\u00f3n ya que contiene eventos. Por favor, borre todos los eventos antes de borrar la inscripci\u00f3n. 
-cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
-no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
-drop_image=Drop image
-you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
-missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
-stage_write_required=Program stage write access required
-you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
-no_polygon_captured=No polygon captured
+this=este
+delete_failed=Fallado el proceso de eliminar
+cannot_delete_this_enrollment_because_it_already_contains_events=No se puede borrar la inscripci\u00f3n ya que contiene eventos. Por favor, borre todos los eventos antes de borrar la inscripci\u00f3n.
+cannot_delete_this_tei_because_it_already_contains_enrollments=No se puede eliminar esta instancia de entidad rastreada porque ya contiene inscripciones. Elimine las inscripciones antes de eliminar la instancia de entidad rastreada.
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No se ha encontrado {trackedEntityTypeName} en el programa seleccionado. Se muestran datos de otros programas
+drop_image=Cortar imagen
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Necesita permiso de lectura para acceder a por lo menos un tipo de entidad de registro para poder buscar sin el contexto de un programa
+missing_read_access_for_tracked_entity_type=Perdido el acceso de lectura para el tipo de entidad de registro de seguimiento
+stage_write_required=Esta etapa del programa requiere permiso de escritura
+you_need_write_to_program_stage_to_be_able_to_create_event=Necesita permiso de escritura para acceder a este estado del programa y crear nuevos eventos
+no_polygon_captured=Ning\u00fan poligono guardado
 polygon_captured=Pol\u00edgono guardado
-no_geometry_captured=No geometry captured
-geometry=Geometry
-tracked_entity_type=Tracked entity type
+no_geometry_captured=No contiene geometria
+geometry=Geometria
+tracked_entity_type=Tipo de entidad registrada
 type=Tipo
-tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+tracked_entity_type_has_no_attributes=El tipo de entidad registrada no tiene atributos
 belongs_to_another_organisation_unit=pertenece a otra unidad organizativa.
-please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
-your_action_is_being_monitored=Your action is being monitored
-this=this
-saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
-saving_relationship_failed=Saving relationship failed.
-open_tei_error=Failed to open TEI
-PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
-compare_form_previous=Compare form previous
-compare_form_all=Compare form all
-grid_form=Grid form
-pop_over_form=POP-over form
-failed_to_delete_enrollment=Failed to delete enrollment
-enrollment_polygon=Enrollment polygon
-enrollment_point=Enrollment point
-event_polygon=Event polygon
-event_point=Event point
-point_on_map=Point on map
-polygon_on_map=Polygon on map
-cancel_capturing_polygon=Cancel capturing polygon
-you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+please_fill_in_a_reason_for_accessing=Por favor, rellene el motivo del acceso
+your_action_is_being_monitored=Su acci\u00f3n va a ser monitoreada
+this=este
+saving_relationship_failed_conflicts=Relaci\u00f3n no guardada. Conflictos
+saving_relationship_failed=Relaci\u00f3n no guardada
+open_tei_error=No se ha podido abrir el tipo de entidad registrada
+PROGRAM_ACCESS_CLOSED=Sin acceso a instancias de entidades rastreadas fuera de las unidades de organizaci\u00f3n de captura de datos asignadas.
+compare_form_previous=Comparar con el anterior
+compare_form_all=Comparar con todos
+grid_form=Formulario de cuadr\u00edcula
+pop_over_form=Formulario POP-Over
+failed_to_delete_enrollment=Fallo al eliminar la inscripci\u00f3n
+enrollment_polygon=Pol\u00edgono de inscripci\u00f3n
+enrollment_point=Punto de inscripci\u00f3n
+event_polygon=Evento del pol\u00edgono
+event_point=Punto del evento
+point_on_map=Punto en el mapa
+polygon_on_map=Pol\u00edgono en el mapa
+cancel_capturing_polygon=Cancelar el guardado del pol\u00edgono
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=Modo dise\u00f1o. Todos los cambios sin terminar ser\u00e1n eliminados.
 complete_stage=\u00bfCompletar la etapa?
-complete_stage_info=Do you want to set this stage to complete?
-assigned_user=Assigned user
-linked_events=Linked events
-user_assignment=User assignment
-specific_users=Specific users:
+complete_stage_info=\u00bfPreparar esta etapa para completar?
+assigned_user=Usuario asignado
+linked_events=Eventos asociados
+user_assignment=Asignaci\u00f3n de usuario
+specific_users=Usuarios espec\u00edficos
 none=Ninguno
-any=Any
-no_requirement=No requirement
+any=Cualquiera
+no_requirement=No requerido
 the_record_has_is_possible_duplicate=Este registro puede que est\u00e9 duplicado.
 flag_possible_duplicate=Marcar como posible duplicado.
 possible_duplicate=Posible duplicado
@@ -667,4 +671,4 @@ possible_duplicate_info_start=Posible duplicado:
 possible_duplicate_info_end= Est\u00e1 duplicado o puede que tenga un duplicado por lo que se ha marcado para revisi\u00f3n.
 owned_by=Pertenece a:
 change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
-custom_working_list=Custom working list
+custom_working_list=Lista de trabajo personalizada
diff --git a/i18n/i18n_app_fr.properties b/i18n/i18n_app_fr.properties
index 187b1273e..d1cf1fa18 100644
--- a/i18n/i18n_app_fr.properties
+++ b/i18n/i18n_app_fr.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=Pas encore enroll\u00e9. La saisie de donn\u00e9es e
 not_yet_enrolled_enrollment=Il n'existe pas d'enrollement.
 no_active_enrollment_exists=l n'existe pas d'enrollement actif pour ce programme.
 no_active_enrollments_exist=l n'existe pas d'enrollement actif.
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Pas encore enroll\u00e9. Impossible d'enregistrer une note.
 not_yet_enrolled_report=Pas encore enroll\u00e9. Rapportage impossible.
 no_data_report=Pas de donn\u00e9es pour le raaportage
@@ -36,10 +37,10 @@ view_all=[Voir tout]
 list_all_entities=Lister toutes les entit\u00e9s
 list_all=Lister tout
 list=Liste
-lists=Lists
+lists=Listes
 invalid=Invalide
 selected_tei_is_invalid=L'instance d'entit\u00e9 suivie selectionn\u00e9e est invalide.
-required=R\u00e9quis
+required=Obligatoire
 number_required=Nombre requis
 date_required=Date requise
 number=Nombre
@@ -86,7 +87,7 @@ go=Aller
 find=Trouver
 edit=Modifier
 edit_profile=Modifier profil
-tracker_associate=Tracker associate
+tracker_associate=Tracker associ\u00e9
 association=G\u00e9rer les associations
 change_location=G\u00e9rer la localisation
 details_history=Details/historique
@@ -117,7 +118,7 @@ complete=Terminer
 incomplete=Incomplet
 reopen=R\u00e9ouvrir
 validate=Valider
-validation_result=Result de validation
+validation_result=Resultat de validation
 status=Statut
 event_completed=\u00c9v\u00e9nement compl\u00e9t\u00e9?
 details=D\u00e9tails
@@ -137,7 +138,7 @@ show_more=Cliquer pour plus
 close_search=Fermer recherche
 search_attributes=Chercher attributs
 available_search_attributes=Attributs disponible pour la recherche
-selected_search_attributes=Selected search attributes
+selected_search_attributes=Attributs de recherche s\u00e9lectionn\u00e9s
 selected_program=Programme choisi
 other_programs=Autres programmes
 search_for_dashboard=Rechercher les \u00e9l\u00e9ments du tableau de bord
@@ -205,6 +206,7 @@ registered_data=donn\u00e9es enreigistr\u00e9es
 no_value=Pas de valeur
 no_data_found=Aucune valeur trouv\u00e9e
 no_data=Aucune donn\u00e9e
+mo_matching_data=No data matching your search criteria
 data_exists=Aucune donn\u00e9e n'existe
 data_registerd=Aucune donn\u00e9e enregistr\u00e9e
 no_visit_made=Aucne visite effectu\u00e9e
@@ -245,7 +247,7 @@ csv=CSV
 json=JSON
 xml=XML
 list_programs=Lister programmes
-program_stage=\u00c9tape du programme
+program_stage=Stade de programme
 due_date=Date d'\u00e9ch\u00e9ance
 event_date=Date d\u00b4\u00e9v\u00e9nement
 report_date=Date du rapport
@@ -273,7 +275,7 @@ exact_date=Date exacte
 exact_value=Valeur exacte
 EQ=Egal
 GT=Sup\u00e9rieur \u00e0
-GE=>\=
+GE=Sup\u00e9rieur ou \u00e9gal \u00e0
 LT=Inf\u00e9rieur \u00e0
 LE=Inf\u00e9rieur ou \u00e9gal
 NE=Non \u00e9gal
@@ -304,7 +306,7 @@ update_error=Erreur dans la mise \u00e0 jour
 register_error=Erreur lors de l'enr\u00f4lement
 event_creation_error=Erreur dans la cr\u00e9ation de l'\u00e9v\u00e8nement
 relationship_error=Erreur dans l'assignation de la relation
-tracker_associate_error=Error in tracker associate assignment
+tracker_associate_error=Erreur d'assignation du Tracker associ\u00e9
 searching_error=Erreur de recherche
 form_invalid=Formulaire non valide. Veuillez v\u00e9rifier les champs obligatoires.
 no_entity_for_tracker_associate_attribute=Les attributs choisis ont une entit\u00e9 suivie invalide.
@@ -315,7 +317,7 @@ success=Succ\u00e8s
 unable_to_fetch_data_from_server=Impossible de recup\u00e9rer les donn\u00e9es du serveur.
 access_denied=L'acc\u00e8s est refus\u00e9
 registration_complete=L'enregistrement est termin\u00e9
-auto_generate_failed=Impossible d'enregistrer puis que l'autog\u00e9n\u00e9ration des attributs a \u00e9chou\u00e9.
+auto_generate_failed=Impossible d'enregistrer puisque l'autog\u00e9n\u00e9ration de ou des attribut(s) a \u00e9chou\u00e9.
 validation_error=Erreur de validation
 event_orgunit_name=Unit\u00e9 d'organisation
 category=Cat\u00e9gorie
@@ -325,11 +327,11 @@ save_and_add_new=Sauvegarder et ajouter
 save_and_go_back=Sauvegarder et retourner
 save_and_continue=Enr\u00e9gistrer et continuer
 save_relationship=Enregistrer la relation
-delete_relationship=Supprimer relation
-can_not_delete_relationship=Can not delete relationship because of lacking write access.
+delete_relationship=Supprimer la relation
+can_not_delete_relationship=Impossible de supprimer la relation par manque d'acc\u00e8s en \u00e9criture.
 go_back=Pr\u00e9c\u00e9dent
 cancel=Annuler
-are_you_sure_to_delete_relationship=Vous \u00eates s\u00fbre de vouloir supprimer cette relation
+are_you_sure_to_delete_relationship=Vous \u00eates s\u00fbre de vouloir supprimer cette relation?
 are_you_sure_to_delete_enrollment=Etes-vous sur de vouloir supprimer l'enr\u00f4lement selectionn\u00e9? Ceci supprimera tous les \u00e9v\u00e9nements associ\u00e9s avec cet enr\u00f4lement.
 would_you_like_to_complete_enrollment=Voulez-vous terminer la saisie de l'\u00e9v\u00e9nement?
 are_you_sure_to_complete_enrollment=Voulez-vous terminer l'enr\u00f4lement s\u00e9lectionn\u00e9?
@@ -337,29 +339,30 @@ are_you_sure_to_deactivate_enrollment=Vous \u00eates s\u00fbre de vouloir d\u00e
 are_you_sure_to_activate_enrollment=Vous \u00eates s\u00fbre de vouloir activer l'enr\u00f4lement selectionn\u00e9?
 are_you_sure_to_reopen_enrollment=Vous \u00eates s\u00fbre de vouloir r\u00e9-ouvrir l'enr\u00f4lement selectionn\u00e9?
 are_you_sure_to_delete_event=Vous \u00eates s\u00fbre de vouloir supprimer l'\u00e9venement selectionn\u00e9?
-are_you_sure_to_delete_event_with_audit=Vous \u00eates s\u00fbre de supprimer l'\u00e9venement selectionn\u00e9?\nCeci va aussi supprimer toutes les valeurs d'audit connexes.
+are_you_sure_to_delete_event_with_audit=Vous \u00eates s\u00fbre de supprimer l'\u00e9venement selectionn\u00e9? Ceci supprimera aussi toutes les valeurs d'audit connexes.
 are_you_sure_to_complete_event=\u00cates-vous s\u00fbr de vouloir compl\u00e9ter l'\u00e9v\u00e9nement s\u00e9lectionn\u00e9?
-please_fix_errors_before_completing=Veuillez revoire et corriger le(s) erreur(s) suivante(s) avant de de compl\u00e9ter l'\u00e9venement 
+please_fix_errors_before_completing=Veuillez revoire et corriger les erreur(s) suivante(s) avant de de compl\u00e9ter l'\u00e9venement:
 are_you_sure_to_incomplete_event=Etes-vous sure de vouloir modifier l'\u00e9venement selectionn\u00e9?
 are_you_sure_to_skip_event=Etes-vous s\u00fbre de vouloir modifier sauter selectionn\u00e9?
-are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
-do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_unskip_event=\u00cates-vous s\u00fbr de vouloir reprogrammer l'\u00e9v\u00e9nement s\u00e9lectionn\u00e9 ?
+do_you_want_to_proceed=Voulez-vous poursuivre avec les crit\u00e8res invalides ?
 are_you_sure_to_proceed=\u00cates-vous s\u00fbr de vouloir continuer?
 will_delete_all_data_associated=Ceci supprimera TOUTES LES DONNEES associ\u00e9es
 more=Plus
 under_construction=Travaux en cours
 advanced_search=Recherche avanc\u00e9e
 profile=Profil
-applications=Applications
+applications=Apps
 more_applications=Plus d'applis
+manage=Manage
 settings=Param\u00e8tres
 account=Compte
 help=Aide
 log_out=D\u00e9connexion
 about_dhis2=\u00c0 propos DHIS 2
-missing_translation_file=Fichiers de traduction manquant
+missing_translation_file=Fichier de traduction manquant
 missing_translation_using_default=Aucun fichier de traduction trouv\u00e9 pour le locale s\u00e9lectionn\u00e9. Utilisation de la traduction par d\u00e9faut (anglais).
-loading_tree=Chargement de l'arborescence
+loading_tree=Chargement de l'arborescence des unit\u00e9 d'organisation
 loading_metadata=Chargement des metadata
 loading_components=Chargement des composantes
 latitude=Latitude
@@ -410,8 +413,8 @@ nov=Novembre
 dec=D\u00e9cembre
 week=Semaine
 save_layout_as_default=Save dashboard layout as default
-reset_layout=Reset dashboard layout
-is_expected_to_be=is expected to be
+reset_layout=La nouvelle mise en page du tableau de bord 
+is_expected_to_be= devrait \u00eatre
 but_found=mais trouv\u00e9
 equals_to=\u00e9gal \u00e0
 less_than=inf\u00e9rieur \u00e0
@@ -421,11 +424,11 @@ activate=Activer
 deactivate=D\u00e9sactiver
 tei_inactive_only_read=est actif. Seules les op\u00e9rations de lecture sont permises.
 hide_menu=Masquer le menu
-extend_menu=Etendre le menu
+extend_menu=\u00c9tendre le menu
 show_main_menu=Afficher le menu principal
 stick_right_widgets=Fixer le widget de droite
 unstick_right_widgets=Mouvoir le widget de droite avec la page
-existing_associate=Existing associate
+existing_associate=Tracker associ\u00e9 existant
 value_not_unique=Valeur non unique
 custom_form_has_invalid_attribute=Le formulaire personnalis\u00e9 a un attribut invalide.
 custom_form_has_invalid_dataelement=Le formulaire personnalis\u00e9 contient un \u00e9l\u00e9ment de donn\u00e9es non valide.
@@ -446,12 +449,12 @@ print_form=Imprimer le formulaire
 value_must_be_email=Veuillez saisir une adresse email valide
 click_to_edit_view_complete_notes=Cliquez pour \u00e9diter/voir les notes compl\u00e8tes
 complete_and_exit =Terminer et quitter
-are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_editing=\u00cates-vous s\u00fbr de vouloir annuler la modification de ce profil ?
 are_you_sure_to_cancel_registration=Etes-vous s\u00fbr de vouloir annuler cet enregistrement?
 schedule=Planning
 scheduled_date=Date programm\u00e9e
 show_new_event_menu=Afficher menu nouvel \u00e9v\u00e8nement
-no_stages_available=TOus les \u00e9v\u00e8nements attendus sont d\u00e9ja cr\u00e9\u00e9s. Impossible de cr\u00e9er un autre.
+no_stages_available=Tous les \u00e9v\u00e8nements attendus sont d\u00e9j\u00e0 cr\u00e9\u00e9s. Impossible de cr\u00e9er un autre.
 make_referral=Faire r\u00e9f\u00e9rence
 referral=R\u00e9f\u00e9rence
 show_previous=Afficher pr\u00e9c\u00e9dent
@@ -459,48 +462,48 @@ show_next=Afficher suivant
 schedule_new=Planifier nouveau
 save_note=Enregistrer note
 add_justification=Ajouter justification ici
-please_complete_all_results_before_add = Please complete all results before adding a new one
-please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
-please_complete_all_results_before_referral = Please complete all results first
-no_designation=No designation
+please_complete_all_results_before_add = Veuillez compl\u00e9ter tous les r\u00e9sultats avant de cr\u00e9er un nouveau
+please_complete_all_results_before_schedule = Veuillez compl\u00e9ter tous les r\u00e9sultats avant de programmer un nouveau
+please_complete_all_results_before_referral = Veuillez d'abord compl\u00e9ter tous les r\u00e9sultats
+no_designation=Aucune appellation
 main_menu=Menu principal
 complete_event_and_enrollment=Terminer l'\u00e9v\u00e9nement et l'enr\u00f4lement
 are_you_sure_to_complete_event_and_enrollment=Voulez-vous vraiment terminer cet \u00e9v\u00e9nement et l'enr\u00f4lement?
 enrollment_is_not_active=Enr\u00f4lement non actif
 please_complete_all_events=Veuillez d'abord terminer tous les \u00e9v\u00e9nements
-scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
-event_already_scheduled=An event is already scheduled
-programstage_multiple_events_disabled=This program stage does not allow multiple events
-event_cant_be_created=New event can not be created
-created=Cr\u00e9\u00e9 le
+scheduling_disabled_for_programstage=La programmation est d\u00e9sactiv\u00e9e pour cette \u00e9tape du programme
+event_already_scheduled=Un \u00e9v\u00e9nement est d\u00e9j\u00e0 programm\u00e9
+programstage_multiple_events_disabled=Cette \u00e9tape du programme ne prend pas en compte les \u00e9v\u00e9nements multiples
+event_cant_be_created=Impossible de cr\u00e9er un nouvel \u00e9v\u00e9nement
+created=Cr\u00e9\u00e9
 auditType=Type d'audit
 modifiedBy=Modifi\u00e9 par
 audit_history_unavailable=Historique d'audit non disponible
 delete_error_audit=L'\u00e9v\u00e8nement ne peut \u00eatre supprim\u00e9 car il contient une trace d'audit.
-are_you_sure_to_remove=Are you sure you want to remove?
+are_you_sure_to_remove=Voulez-vous vraiment le supprimer ?
 completed_label=Termin\u00e9
 stage_completed=Ev\u00e9nement termin\u00e9
-stage_completed_label=Tous termin\u00e9s
+stage_completed_label=Tous les \u00e9v\u00e9nements termin\u00e9s
 executed=Ouvert \u00e0 la saisie
 executed_label=Ouvrir
-stage_executed=Event is open
-stage_executed_label=Open found
+stage_executed=L'\u00e9v\u00e9nement est ouvert
+stage_executed_label=\u00c9v\u00e9nements ouverts trouv\u00e9s
 ontime=Programm\u00e9
 ontime_label=Programm\u00e9
-stage_ontime=Event is scheduled
-stage_ontime_label=Scheduled found
+stage_ontime=L'\u00e9v\u00e9nement est programm\u00e9
+stage_ontime_label=\u00c9v\u00e9nements planifi\u00e9s trouv\u00e9s
 overdue=En retard
 overdue_label=En retard
-stage_overdue=Event is overdue
-stage_overdue_label=Overdue found
+stage_overdue=L'\u00e9v\u00e9nement est retard\u00e9
+stage_overdue_label=\u00c9v\u00e9nements retard\u00e9s trouv\u00e9s
 skipped=Ev\u00e8nement ignor\u00e9
 skipped_label=Ev\u00e8nement ignor\u00e9
 stage_empty=Vide
 stage_empty_label=Vide
 complete_active_events_before_completing_enrollment=Veuillez terminer les evenements termin\u00e9s avant de compl\u00e9ter l'enr\u00f4lement
-complete_enrollment_failed=Complete file failed
+complete_enrollment_failed=\u00c9chec du fichier complet
 are_you_sure_to_complete_enrollment_delete_schedule=Voulez-vous compl\u00e9ter cet enr\u00f4lement? Le planning existant et les \u00e9v\u00e9nements en retard seront supprim\u00e9s
-no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+no_active_enrollment=Aucune inscription active. Veuillez vous inscrire \u00e0 partir du widget d'inscription.
 events_today=Ev\u00e8nements avec \u00e9ch\u00e9ance aujoud'hui
 events_in_one_week=Ev\u00e8nements avec \u00e9ch\u00e9ance cette semaine
 events_in_two_weeks=Ev\u00e8nements avec \u00e9ch\u00e9ance dans deux semaines
@@ -515,11 +518,11 @@ data_entry=Saisie de donn\u00e9es
 invalid_coordinate_format=Format de coordonn\u00e9es non valide
 latitude_longitude_format=Longitude, latitude
 missing_search_ous=L'utilisateur n'a aucune unit\u00e9 d'organisation qui lui ai assign\u00e9e
-cocbo_filter=Category and category option filter
+cocbo_filter=Filtre des cat\u00e9gories et des options de cat\u00e9gorie
 apply=Appliquer
-attribute_category_selection=Attribute category selection
+attribute_category_selection=S\u00e9lection de la cat\u00e9gorie d'attributs
 event_filter=Filtrer les \u00e9\u00e8nements par daleur d'\u00e9l\u00e9ment de donn\u00e9e, stade ou nom d'unit\u00e9 d'organisation
-validation_errors=Errors currently in the form:
+validation_errors=Erreurs pr\u00e9sentes dans le formulaire :
 validation_warnings=Attention aux avertissements suivants\:
 openstreetmap=OpenStreetMap
 googlemap=Google Maps
@@ -554,117 +557,118 @@ days=Jours
 age_fields_info=Info champs \u00e2ge
 reponse_from_server=R\u00e9ponse du serveur
 loading-audit-data=Chargement des donn\u00e9es d'audit
-more_options_available=more options available, try searching...
-move_permanently=Move permanently
-onetime_referral=One-time referral
-are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+more_options_available=plus d'options disponibles, essayez de rechercher...
+move_permanently=D\u00e9placer d\u00e9finitivement
+onetime_referral=Renvoi de r\u00e9f\u00e9rence unique
+are_you_sure_you_want_to_move_permanently=\u00cates-vous s\u00fbr de vouloir d\u00e9placer d\u00e9finitivement le patient ?
 ok=Ok
-can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
-switch_compare_form=Switch to compare form
-switch_default_form=Switch to default form
-switch_tabel_form=Switch to tabel form
+can_not_add_new_enrollment=Impossible d'ajouter une nouvelle inscription car ce programme ne permet qu'une seule inscription.
+switch_compare_form=Passer en mode de comparaison des formulaires
+switch_default_form=Passer au formulaire par d\u00e9faut
+switch_tabel_form=Passer au format tableau
 url_format=http(s)://
-url_error=Ensure that the URL is valid.
-time_error=Wrong time format
-no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
-not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
-both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
-wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+url_error=V\u00e9rifiez que l'URL est valide.
+time_error=Format d'heure incorrect
+no_blank_date=L'\u00e9v\u00e9nement requiert une date. Si vous souhaitez plut\u00f4t planifier l'\u00e9v\u00e9nement, veuillez supprimer cet \u00e9v\u00e9nement et cr\u00e9er un nouvel \u00e9v\u00e9nement planifi\u00e9.
+not_authorized_to_uncomplete_event=Non autoris\u00e9 \u00e0 laisser les \u00e9v\u00e9nements incomplets.
+both_date_and_time=Vous devez vous assurer que les champs de la date et de l'heure sont renseign\u00e9s et qu'ils ob\u00e9issent au format correct. Sinon, les donn\u00e9es ne seront pas enregistr\u00e9es.
+wrong_time_format=Veuillez v\u00e9rifier que le format horaire (HH:MM) est bien respect\u00e9.
 hours_and_minutes=HH:MM
-top_bar_settings=Top bar settings
+top_bar_settings=Param\u00e8tres de la barre sup\u00e9rieure
 show=Afficher
 sort_order=Ordre de tri
-activate_top_bar=Activate top bar
-remove_widget=Remove widget?
-remove_widget_info=You are about to remove a widget. Do you want to proceed?
-lock_default_layout=Lock layout for all users
-unlock_default_layout=Unlock layout for all users
+activate_top_bar=Activer la barre sup\u00e9rieure
+use_as_top_bar=Use as top bar
+remove_widget=Retirer le widget ?
+remove_widget_info=Vous \u00eates sur le point de supprimer un widget. Voulez-vous continuer ?
+lock_default_layout=Verrouiller la mise en page pour tous les utilisateurs
+unlock_default_layout=D\u00e9verrouiller la mise en page pour tous les utilisateurs
 upload_image=T\u00e9l\u00e9charger
-please_select_an_image=[Please select an image]
+please_select_an_image=[Veuillez choisir une image]
 all=Tout
 ALL=Tout
 completed=Termin\u00e9
 active=Actif
 cancelled=Annul\u00e9
-enrollment_status=Enrollment status
-go_to_registration=Go to registration
-tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
-tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
-tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
-tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
-no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
-tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
-tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
-possible_duplicates_found=Possible duplicates found.
-view_x_candidates=View {count} candidates
-view_candidate=View candidate
-matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
-review_possible_duplicates_before_registration=Review possible duplicates before registration
-review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
-register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
-large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
-too_many_search_results=Too many search results
+enrollment_status=Statut de l'enr\u00f4lement
+go_to_registration=Aller \u00e0 l'enregistrement
+tracked_entity_instance_search_results_header=R\u00e9sultats de la recherche de {trackedEntityTypeName} (type de nom d'entit\u00e9 suivie)
+tracked_entity_instance_search_matches_description=Si rien ne correspond au {trackedEntityTypeName}  (type de nom d'entit\u00e9 suivie) que vous recherchez, cliquez sur "Aller \u00e0 l'enregistrement".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName}  (type de nom d'entit\u00e9 suivie) trouv\u00e9
+tracked_entity_instance_unique_found_description=Un {trackedEntityTypeName} a \u00e9t\u00e9 trouv\u00e9, dans un autre {orgUnitLevelName} nom du niveau d'unit\u00e9 d'organisation).
+no_tracked_entity_instance_found_header=Aucun {trackedEntityTypeName} (Nom de type d'entit\u00e9 suivie) trouv\u00e9.
+no_tracked_entity_instance_found_description=Aucun {trackedEntityTypeName} (Nom de type d'entit\u00e9 suivie) trouv\u00e9.
+no_tracked_entity_instance_found_go_to_registration_description=Aucun {trackedEntityTypeName} n'a \u00e9t\u00e9 trouv\u00e9, cliquez sur ''Aller \u00e0 l'enregistrement'' si vous voulez vous enregistrer comme un nouveau {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} d\u00e9j\u00e0 existant
+tracked_entity_attributes_already_existing_description=Ce {trackedEntityAttributeName} existe d\u00e9j\u00e0 pour un autre {trackedEntityTypeName}. Voulez-vous ouvrir ce {trackedEntityTypeName} ?
+possible_duplicates_found=Doublons \u00e9ventuellement d\u00e9tect\u00e9s.
+view_x_candidates=Afficher {comptage} (nombre) candidats
+view_candidate=Afficher le candidat
+matching_tracked_entity_instance_register_description=Cliquez pour ouvrir tout {trackedEntityTypeName} correspondant ou revenez en arri\u00e8re et terminez l'enregistrement.
+review_possible_duplicates_before_registration=V\u00e9rifier les \u00e9ventuels doublons avant l'enregistrement
+review_possible_duplicates_description=Ouvrez l'un des candidats dupliqu\u00e9s ci-dessus, ou cliquez pour enregistrer en tant que nouveau {trackedEntityTypeName}
+register_new_tracked_entity_instance=Enregistrer un nouveau {trackedEntityTypeName} (Nom de type d'entit\u00e9 suivie)
+large_number_of_search_results_warning=Un grand nombre de r\u00e9sultats a \u00e9t\u00e9 trouv\u00e9. Veuillez revenir en arri\u00e8re et affiner vos crit\u00e8res de recherche ou passer \u00e0 l'inscription.
+too_many_search_results=Un trop grand nombre de r\u00e9sultats de recherche
 open=Ouvrir
 continue=Continuer
-no_program_write_access=Program write authority needed to send messages
+no_program_write_access=Autorisation d'\u00e9criture du programme requise pour l'envoi de messages
 show_all=Tout afficher
-not_allowed=Not allowed
-you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
-this=this
-delete_failed=Delete failed
-cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
-cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
-no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
-drop_image=Drop image
-you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
-missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
-stage_write_required=Program stage write access required
-you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
-no_polygon_captured=No polygon captured
+not_allowed=Non autoris\u00e9
+you_do_not_have_the_necessary_authorities_to_delete=Vous n'avez pas les autorisations n\u00e9cessaires pour proc\u00e9der \u00e0 la suppression de ceci
+this=de ceci
+delete_failed=\u00c9chec de la suppression
+cannot_delete_this_enrollment_because_it_already_contains_events=Impossible de supprimer cette inscription car elle contient d\u00e9j\u00e0 des \u00e9v\u00e9nements. Veuillez supprimer les \u00e9v\u00e9nements avant la suppression de l'inscription.
+cannot_delete_this_tei_because_it_already_contains_enrollments=Impossible de supprimer cette instance d'entit\u00e9 suivie car elle contient d\u00e9j\u00e0 des inscriptions. Veuillez supprimer les inscriptions avant la suppression de l'instance d'entit\u00e9 suivie.
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=Aucun {trackedEntityTypeName} (Nom de type d'entit\u00e9 suivie) trouv\u00e9 dans le programme s\u00e9lectionn\u00e9. Affichage les r\u00e9sultats d'autres programmes
+drop_image=D\u00e9poser une image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Vous devez avoir un acc\u00e8s en lecture \u00e0 au moins un type d'entit\u00e9 suivie pour pouvoir effectuer une recherche hors du contexte du programme
+missing_read_access_for_tracked_entity_type=Acc\u00e8s en lecture manquant pour le type d'entit\u00e9 suivie.
+stage_write_required=Acc\u00e8s en \u00e9criture requis \u00e0 l'\u00e9tape du programme
+you_need_write_to_program_stage_to_be_able_to_create_event=Vous devez avoir un acc\u00e8s en \u00e9criture \u00e0 cette \u00e9tape du programme pour pouvoir cr\u00e9er un nouvel \u00e9v\u00e9nement
+no_polygon_captured=Aucun polygone d\u00e9fini
 polygon_captured=Le polyg\u00f4ne a \u00e9t\u00e9 d\u00e9fini
-no_geometry_captured=No geometry captured
-geometry=Geometry
-tracked_entity_type=Tracked entity type
+no_geometry_captured=Aucune g\u00e9om\u00e9trie d\u00e9finie
+geometry=G\u00e9om\u00e9trie
+tracked_entity_type=Type d'entit\u00e9 suivie
 type=Type
-tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
-belongs_to_another_organisation_unit=belongs to another organization unit
-please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
-your_action_is_being_monitored=Your action is being monitored
-this=this
-saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
-saving_relationship_failed=Saving relationship failed.
-open_tei_error=Failed to open TEI
-PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
-compare_form_previous=Compare form previous
-compare_form_all=Compare form all
-grid_form=Grid form
-pop_over_form=POP-over form
-failed_to_delete_enrollment=Failed to delete enrollment
-enrollment_polygon=Enrollment polygon
-enrollment_point=Enrollment point
-event_polygon=Event polygon
-event_point=Event point
-point_on_map=Point on map
-polygon_on_map=Polygon on map
-cancel_capturing_polygon=Cancel capturing polygon
-you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
-complete_stage=Complete stage?
-complete_stage_info=Do you want to set this stage to complete?
-assigned_user=Assigned user
-linked_events=Linked events
-user_assignment=User assignment
-specific_users=Specific users:
+tracked_entity_type_has_no_attributes=Le type d'entit\u00e9 suivi ne dispose d'aucun attribut.
+belongs_to_another_organisation_unit=appartient \u00e0 une autre unit\u00e9 d'organisation
+please_fill_in_a_reason_for_accessing=Veuillez indiquer le motif de l'acc\u00e8s
+your_action_is_being_monitored=Votre action est suivie
+this=de ceci
+saving_relationship_failed_conflicts=\u00c9chec de la sauvegarde de la relation. Conflits
+saving_relationship_failed=\u00c9chec de la sauvegarde de la relation.
+open_tei_error=\u00c9chec de l'ouverture de la TEI
+PROGRAM_ACCESS_CLOSED=Aucun acc\u00e8s aux instances d'entit\u00e9s suivies en dehors des unit\u00e9s d'organisation de saisie de donn\u00e9es assign\u00e9es.
+compare_form_previous=Comparer avec les formulaires pr\u00e9c\u00e9dents
+compare_form_all=Comparer tous les formulaires
+grid_form=Formulaire de grille
+pop_over_form=Formulaire popover
+failed_to_delete_enrollment=\u00c9chec de la suppression de l'inscription
+enrollment_polygon=Polygone d'enr\u00f4lement
+enrollment_point=Point d'enr\u00f4lement
+event_polygon=Polygone d'\u00e9v\u00e9nement
+event_point=Point de l'\u00e9v\u00e9nement
+point_on_map=Point sur la carte
+polygon_on_map=Polygone sur la carte
+cancel_capturing_polygon=Annuler la capture du polygone
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=Vous \u00eates actuellement en mode dessin. Toutes les modifications inachev\u00e9es seront perdues.
+complete_stage=\u00c9tape achev\u00e9e ?
+complete_stage_info=Voulez-vous d\u00e9finir cette \u00e9tape comme \u00e9tant achev\u00e9e ?
+assigned_user=Utilisateur affect\u00e9
+linked_events=\u00c9v\u00e9nements li\u00e9s
+user_assignment=Affectation d'utilisateur
+specific_users=Utilisateurs particuliers :
 none=Aucun
-any=Any
-no_requirement=No requirement
-the_record_has_is_possible_duplicate=The record has/is possible duplicate
-flag_possible_duplicate=Flag possible duplicate
-possible_duplicate=Possible duplicate
-unflag=Unflag
-possible_duplicate_info_start=Possible duplicate: This
-possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
-owned_by=Owned by:
-change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
-custom_working_list=Custom working list
+any=Tout
+no_requirement=Aucune condition requise
+the_record_has_is_possible_duplicate=L'enregistrement pourrait contenir des doublons
+flag_possible_duplicate=Signaler un \u00e9ventuel doublon
+possible_duplicate=Doublon \u00e9ventuellement
+unflag=D\u00e9marquer
+possible_duplicate_info_start=les \u00e9ventuels doublons
+possible_duplicate_info_end= Il s'agit d'un \u00e9ventuel doublon qui a \u00e9t\u00e9 marqu\u00e9 pour examen.
+owned_by=Propri\u00e9t\u00e9 de :
+change_date_with_dependency_information=La mise \u00e0 jour de cette date peut n\u00e9cessiter une action suppl\u00e9mentaire de votre part. Les \u00e9v\u00e9nements de ce programme ont \u00e9t\u00e9 planifi\u00e9s en fonction de cette date, mais ces \u00e9v\u00e9nements ne seront pas reprogramm\u00e9s automatiquement. Voulez-vous poursuivre la mise \u00e0 jour de la date ?
+custom_working_list=Liste de travail personnalis\u00e9e
diff --git a/i18n/i18n_app_id.properties b/i18n/i18n_app_id.properties
index cc8937289..137a5d2c5 100644
--- a/i18n/i18n_app_id.properties
+++ b/i18n/i18n_app_id.properties
@@ -1,11 +1,11 @@
-tracker_capture=Tracker capture
+tracker_capture=Tangkapan pelacak
 online_notification=Anda sedang online
 offline_notification=Anda sedang offline
 login_failed=Login gagal, cek username anda, password dan coba kembali
 tracked_entity_management=Manajemen Tracked entity
 registering_unit=Unit pendaftaran
 program=Program
-tracked_entity=Tracked Entity
+tracked_entity=Entitas dilacak
 tracked_entity_instance=Tracked entity instance
 tracked_entity_attribute=Atribut
 select_or_search=Pilih atau cari dari daftar
@@ -23,11 +23,12 @@ not_yet_enrolled_data_entry=Belum terdaftar. Entri data tidak dimungkinkan.
 not_yet_enrolled_enrollment=Belum terdaftar. Sialahkan daftar.
 no_active_enrollment_exists=Tidak ada pendaftaran untuk program terpilih
 no_active_enrollments_exist=Belum ada pendaftaran aktif
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Belum terdaftar. Perekaman catatan tidak dimungkinkan.
 not_yet_enrolled_report=Belum terdaftar. Pelaporan tidak dimungkinkan
 no_data_report=Tidak ada rekaman untuk pelaporan
 no_notes_exist=Tidak ada catatan aktif
-event=Kejadian
+event=Even
 no_event_is_yet_created=Tidak ada event yang tersedia untuk entri data. Silakan buat satu
 event_creation=Silakan buat satu dari daftar di bawah ini
 not_selected=Tidak terpilih
@@ -36,7 +37,7 @@ view_all=[Tampilkan semua]
 list_all_entities=Daftar semua entity
 list_all=Daftar semua
 list=Daftar
-lists=Lists
+lists=Daftar
 invalid=Tidak valid
 selected_tei_is_invalid=Tracked entity instance terpilih tidak valid.
 required=Wajib
@@ -79,12 +80,12 @@ jump_to_page=Ke halaman
 page=Halaman
 first=Pertama
 previous=Sebelumnya
-next=Se;lanjutnya
+next=Selanjutnya
 last=Terakhir
 go_to_dashboard=Ke dashboard
 go=Ke
 find=Cari
-edit=Edit
+edit=Sunting
 edit_profile=Edit profil
 tracker_associate=Associate tracker
 association=Atur asosiasi
@@ -92,7 +93,7 @@ change_location=Atur lokasi
 details_history=Detail/keterangan
 history=Keterangan
 canceled=Dibatalkan
-delete=hapus
+delete=Hapus
 deleted=dihapus
 remove=Hapus
 entity=Entitas
@@ -101,7 +102,7 @@ add=Tambah
 add_note=Tambah catatan
 search_note=Cari catatan
 your_note_here=Tambah catatan baru disini
-phone_number=No. Telp.
+phone_number=Nomor Telepon
 your_sms_message_here=Pesan SMS Anda di sini
 your_email_message_here=Pesan Email Anda di sini
 sms_send_status=Status pengiriman SMS
@@ -188,8 +189,8 @@ program_statistics=Program Statistik
 program_statistics_description=Buat laporan statistik untuk program tertentu. Laporan tersebut menyediakan contoh overview drop out atau rata-rata penyelesaian dalam time frame pada unit organisasi tertentu.
 upcoming_events=Event selanjutnya
 upcoming_events_description=Buat laporan tabulasi yang menunjukkan tracked entity instances dan event selanjutnya untuk program dan waktu yang dipilih. Pencarian, pengurutan dan tampilkan/sembunyikan operation dalam bentuk kolom.
-overdue_events=Kejadian yang Lewat
-overdue_events_description=Buat sebuah daftar event untuk program terpilih. Laporan tersebut menunjukkan daftar tracked entity instances dan event yang tdak diselenggarakan tepat waktu. Memfilter dan melakukan pencarian mungkin dilakukan.
+overdue_events=Kejadian yang telah Lewat
+overdue_events_description=Buat sebuah daftar event untuk program terpilih. Laporan tersebut menunjukkan daftar tracked entity instances dan event yang tidak diselenggarakan tepat waktu. Memfilter dan melakukan pencarian mungkin dilakukan.
 enrollment_stats=Statistik pendaftaran
 event_stats=Statistik Event
 upcoming_event=Event selanjutnya
@@ -205,6 +206,7 @@ registered_data=Data yang telah teregistrasi
 no_value=NO_VALUE
 no_data_found=Tidak ada data yang ditemukan
 no_data=Tidak ada data
+mo_matching_data=No data matching your search criteria
 data_exists=Data tersedia
 data_registerd=Tidak ada data yang terdaftar
 no_visit_made=Tidak ada kunjungan
@@ -273,7 +275,7 @@ exact_date=Tanggal pasti
 exact_value=Nilai pasti
 EQ=Setara
 GT=Lebih besar dari
-GE=Lebih besar setara
+GE=Lebih besar atau sama dengan
 LT=Kurang dari
 LE=Kurang setara
 NE=Tidak setara
@@ -326,9 +328,9 @@ save_and_go_back=Simpan dan kembali
 save_and_continue=Simpan dan lanjutkan
 save_relationship=Simpan Hubungan
 delete_relationship=Hapus hubungan
-can_not_delete_relationship=Can not delete relationship because of lacking write access.
+can_not_delete_relationship=Tidak dapat menghapus hubungan karena tidak memiliki akses tulis.
 go_back=Kembali
-cancel=batal
+cancel=Batal
 are_you_sure_to_delete_relationship=Apakah anda yakin ingin menghapus hubungan?
 are_you_sure_to_delete_enrollment=Apakah anda yakin ingin menghapus enrollment yang dipilih?
 would_you_like_to_complete_enrollment=Apakah Anda ingin melengkapi pendaftaran terkini?
@@ -350,8 +352,9 @@ more=Lagi
 under_construction=Sedang dalam perbaikan.
 advanced_search=Pencarian lebih lanjut
 profile=Profil
-applications=Apps
+applications=Aplikasi
 more_applications=Apps lainnya
+manage=Mengelola
 settings=Setting
 account=Akun
 help=Bantuan
@@ -362,12 +365,12 @@ missing_translation_using_default=File translasi tidak ditemukan pada locale ter
 loading_tree=Loading bagan unit organisasi
 loading_metadata=Memuat meta-data
 loading_components=Memuat komponen
-latitude=Latitude
-longitude=Longitude
+latitude=Lintang
+longitude=Bujur
 lat_lng=[Garis Lintang Garis Bujur]
 get=Dapatkan
 get_from_map=Dapatkan dari peta
-capture=Capture
+capture=Menangkap
 nothing_captured=Tidak ada yang dicapture
 point_and_click_for_coordinate=Tandai dan klik untuk melihat koordinat
 value_must_be_between=Nilainya harus diantara
@@ -423,248 +426,249 @@ tei_inactive_only_read=TEI tidak aktif. Hanya memperbolehkan read operations.
 hide_menu=Sembunyikan menu
 extend_menu=Lihat menu
 show_main_menu=Tampilkan menu utama
-stick_right_widgets=Stick right side widgets
-unstick_right_widgets=Unstick right side widgets
-existing_associate=Existing associate
-value_not_unique=Value not unique
-custom_form_has_invalid_attribute=Custom form has an invalid attribute.
-custom_form_has_invalid_dataelement=Custom form has an invalid data element.
-events_today_persons=Only those with an event today
-section_has_no_dataelements=Section has no data elements
-section=Section
-display_mode=Display mode
-tracker_capture_display_mode=Tracker capture display mode
-events_today_all=All events today
-events_today_completeoractive=Complete or active
+stick_right_widgets=Tempelkan widget sisi kanan
+unstick_right_widgets=Lepaskan widget sisi kanan
+existing_associate=Asosiasi yang ada
+value_not_unique=Nilai tidak unik
+custom_form_has_invalid_attribute=Formulir kustom memiliki atribut yang tidak valid.
+custom_form_has_invalid_dataelement=Formulir kustom memiliki elemen data yang tidak valid.
+events_today_persons=Hanya yang ada even hari ini
+section_has_no_dataelements=Bagian tidak memiliki elemen data
+section=Bagian
+display_mode=Mode tampilan
+tracker_capture_display_mode=Mode tampilan tangkapan pelacak
+events_today_all=Semua even hari ini
+events_today_completeoractive=Lengkap atau aktif
 events_today_skipped=Dilewati
 events_today_scheduled=Terjadual
-multiple_records_warning=Multiple records found. Please be more specific.
-result=Result
-no_record_found=No record found
-no_record_found_create=No record was found. Do you want to create a new record?
-print_form=Print form
-value_must_be_email=Please enter a valid e-mail address
-click_to_edit_view_complete_notes=Click to edit/view complete notes
-complete_and_exit =Complete and exit
-are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
-are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+multiple_records_warning=Beberapa catatan ditemukan. Harap lebih spesifik.
+result=Hasil
+no_record_found=Tidak ada catatan yang ditemukan
+no_record_found_create=Tidak ada record yang ditemukan. Apakah Anda ingin membuat record baru?
+print_form=Cetak formulir
+value_must_be_email=Silakan isi alamat email
+click_to_edit_view_complete_notes=Klik untuk mengedit/melihat catatan lengkap
+complete_and_exit =Selesai dan keluar
+are_you_sure_to_cancel_editing=Anda yakin ingin membatalkan pengeditan profil ini?
+are_you_sure_to_cancel_registration=Anda yakin ingin membatalkan pendaftaran ini?
 schedule=Jadwal
-scheduled_date=Scheduled date
-show_new_event_menu=Show new event menu
-no_stages_available=All the expected events are already present, cannot create more events.
-make_referral=Make referral
+scheduled_date=Tanggal yang dijadwalkan
+show_new_event_menu=Tampilkan menu even baru
+no_stages_available=Semua even yang diharapkan sudah ada, tidak dapat membuat lebih banyak even.
+make_referral=Buat rujukan
 referral=Rujukan
-show_previous=Show previous
-show_next=Show next
+show_previous=Tampilkan sebelumnya
+show_next=Tampilkan selanjutnya
 schedule_new=Penjadwalan baru
-save_note=Save note
-add_justification=Add justification here
-please_complete_all_results_before_add = Please complete all results before adding a new one
-please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
-please_complete_all_results_before_referral = Please complete all results first
-no_designation=No designation
-main_menu=Main menu
-complete_event_and_enrollment=Complete event and enrollment
-are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
-enrollment_is_not_active=Enrollment is not active
-please_complete_all_events=Please complete all events first
-scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
-event_already_scheduled=An event is already scheduled
-programstage_multiple_events_disabled=This program stage does not allow multiple events
-event_cant_be_created=New event can not be created
+save_note=Simpan catatan
+add_justification=Tambahkan pembenaran di sini
+please_complete_all_results_before_add = Harap selesaikan semua hasil sebelum menambahkan yang baru
+please_complete_all_results_before_schedule = Harap selesaikan semua hasil sebelum menjadwalkan yang baru
+please_complete_all_results_before_referral = Silakan selesaikan semua hasil terlebih dahulu
+no_designation=Tidak ada sebutan
+main_menu=Menu utama
+complete_event_and_enrollment=Selesaikan even dan pendaftaran
+are_you_sure_to_complete_event_and_enrollment=Apakah Anda yakin ingin menyelesaikan even dan pendaftaran ini?
+enrollment_is_not_active=Pendaftaran tidak aktif
+please_complete_all_events=Harap selesaikan semua even terlebih dahulu
+scheduling_disabled_for_programstage=Penjadwalan dinonaktifkan untuk tahap program ini
+event_already_scheduled=Sebuah even sudah dijadwalkan
+programstage_multiple_events_disabled=Tahap program ini tidak memungkinkan banyak even
+event_cant_be_created=Even baru tidak dapat dibuat
 created=Dibuat
-auditType=Audit type
-modifiedBy=Modified by
-audit_history_unavailable=Audit history unavailable
-delete_error_audit=The event could not be deleted because it contains an audit log.
-are_you_sure_to_remove=Are you sure you want to remove?
+auditType=Jenis audit
+modifiedBy=Diubah oleh
+audit_history_unavailable=Riwayat audit tidak tersedia
+delete_error_audit=Even tidak dapat dihapus karena berisi log audit.
+are_you_sure_to_remove=Yakin ingin menghapus?
 completed_label=Selesai
-stage_completed=Event is completed
-stage_completed_label=All completed
-executed=Opened for data entry
+stage_completed=Even selesai
+stage_completed_label=Semua selesai
+executed=Dibuka untuk entri data
 executed_label=Buka
-stage_executed=Event is open
-stage_executed_label=Open found
+stage_executed=Even dibuka
+stage_executed_label=Terbuka ditemukan
 ontime=Terjadual
 ontime_label=Terjadual
-stage_ontime=Event is scheduled
-stage_ontime_label=Scheduled found
+stage_ontime=Even dijadwalkan
+stage_ontime_label=Dijadwalkan ditemukan
 overdue=Lewat waktu
 overdue_label=Lewat waktu
-stage_overdue=Event is overdue
-stage_overdue_label=Overdue found
-skipped=Skipped event
-skipped_label=Skipped event
+stage_overdue=Even terlambat
+stage_overdue_label=Keterlambatan ditemukan
+skipped=Even yang dilewati
+skipped_label=Even yang dilewati
 stage_empty=Kosong
 stage_empty_label=Kosong
-complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
-complete_enrollment_failed=Complete file failed
-are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
-no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
-events_today=Events due today
-events_in_one_week=Events due in a week
-events_in_two_weeks=Events due in two weeks
-events_in_one_month=Events due in a month
-choose_the_dates=Choose the dates
-fill_all_category_options=Please fill all category options
+complete_active_events_before_completing_enrollment=Harap selesaikan even aktif sebelum menyelesaikan pendaftaran
+complete_enrollment_failed=File lengkap gagal
+are_you_sure_to_complete_enrollment_delete_schedule=Apakah Anda yakin ingin menyelesaikan pendaftaran ini? Even terjadwal dan terlambat yang ada akan dihapus
+no_active_enrollment=Tidak ada pendaftaran aktif. Silakan mendaftar dari widget pendaftaran.
+events_today=Even dijadwalkan hari ini
+events_in_one_week=Even dijadwalkan dalam seminggu
+events_in_two_weeks=Even dijadwalkan dalam dua minggu
+events_in_one_month=Even jatuh tempo dalam sebulan
+choose_the_dates=Pilih tanggalnya
+fill_all_category_options=Silakan isi semua opsi kategori
 description=Deskripsi
 url=URL
-not_available=Not available
+not_available=Tidak tersedia
 attribute=Atribut
 data_entry=Data entri
-invalid_coordinate_format=Invalid coordinate format
-latitude_longitude_format=Longitude,latitude
-missing_search_ous=User has no orgunits assigned to it
-cocbo_filter=Category and category option filter
-apply=Apply
-attribute_category_selection=Attribute category selection
-event_filter=Filter events by data element value, stage or org unit name
-validation_errors=Errors currently in the form:
+invalid_coordinate_format=Format koordinat tidak valid
+latitude_longitude_format=Bujur, lintang
+missing_search_ous=Pengguna tidak memiliki orgunit yang ditetapkan untuk itu
+cocbo_filter=Filter opsi kategori dan kategori
+apply=Menerapkan
+attribute_category_selection=Pemilihan kategori atribut
+event_filter=Filter peristiwa menurut nilai elemen data, tahap, atau nama unit organisasi
+validation_errors=Kesalahan saat ini dalam formulir:
 validation_warnings=Peringatan validasi
 openstreetmap=OpenStreetMap
 googlemap=Google Maps
-missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
-missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+missing_google_map_api_key=Kunci Google Maps API tidak ada. Ini dapat dikonfigurasi di Pengaturan Sistem (Pengaturan akses).
+missing_mapzen_search_api_key=Kunci API pencarian Mapzen tidak ada. Ini dapat dikonfigurasi di Pengaturan Sistem (Pengaturan akses).
 sms=SMS
 email=E-mail
-email_address=E-mail address
-wrong_email=Please specify a valid e-mail address
+email_address=Alamat email
+wrong_email=Harap tentukan alamat email yang valid
 email_subject=Judul
 message=Pesan
-gridColumns_fetch_failed=Failed to fetch the grid columns to display
-gridColumns_invalid=Invalid grid columns returned from the server
-dasboard_layout_saving_failed=Failed to save the dashboard layout
-failed_to_register_tei=Failed to register the tracked entity instance in the server
-failed_to_update_tei=Failed to update the tracked entity instance in the server
-failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
-failed_to_fetch_events=Failed to fetch events from the server
-failed_to_update_event=Failed to update the event in the server
-failed_to_send_message=Failed to send the message
-file_missing=File is missing
-file_upload_failed=File upload has failed
-missing_file_identifier= File identifier is missing
-unsupported_value_type=Unsupported value type
-event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
-date_out_of_ou_period=The date is not within the start date and end date of the org unit.
-orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+gridColumns_fetch_failed=Gagal mengambil kolom grid untuk ditampilkan
+gridColumns_invalid=Kolom grid yang tidak valid dikembalikan dari server
+dasboard_layout_saving_failed=Gagal menyimpan tata letak dasbor
+failed_to_register_tei=Gagal mendaftarkan instance entitas yang dilacak di server
+failed_to_update_tei=Gagal memperbarui instance entitas yang dilacak di server
+failed_to_generate_tracked_entity_attribute=Gagal menghasilkan nilai atribut
+failed_to_fetch_events=Gagal mengambil even dari server
+failed_to_update_event=Gagal memperbarui even di server
+failed_to_send_message=Gagal mengirim pesan
+file_missing=File hilang
+file_upload_failed=Unggahan file gagal
+missing_file_identifier= Pengidentifikasi file tidak ada
+unsupported_value_type=Jenis nilai yang tidak didukung
+event_date_out_of_range=Tanggal yang ditentukan tidak dapat disetel. Jumlah hari kedaluwarsa yang dikonfigurasi untuk program telah berlalu setelah periode yang berisi tanggal.
+date_out_of_ou_period=Tanggal tidak termasuk dalam tanggal mulai dan tanggal akhir unit organisasi.
+orgunit_closed= Orgunit tertutup. Pendaftaran dan pengeditan dinonaktifkan.
 dob=Tanggal lahir
 years=Tahun
 months=Bulan
 days=Hari
-age_fields_info=Age fields info
-reponse_from_server=Response from the server.
-loading-audit-data=Loading audit data.
-more_options_available=more options available, try searching...
-move_permanently=Move permanently
-onetime_referral=One-time referral
-are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+age_fields_info=Info bidang usia
+reponse_from_server=Tanggapan dari server.
+loading-audit-data=Memuat data audit.
+more_options_available=lebih banyak pilihan yang tersedia, coba cari...
+move_permanently=Pindah secara permanen
+onetime_referral=Rujukan satu kali
+are_you_sure_you_want_to_move_permanently=Apakah Anda yakin ingin memindahkan pasien secara permanen?
 ok=OK
-can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
-switch_compare_form=Switch to compare form
-switch_default_form=Switch to default form
-switch_tabel_form=Switch to tabel form
-url_format=http(s)://
-url_error=Ensure that the URL is valid.
-time_error=Wrong time format
-no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
-not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
-both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
-wrong_time_format=Please ensure that the time format (HH:MM) is followed.
-hours_and_minutes=HH:MM
-top_bar_settings=Top bar settings
+can_not_add_new_enrollment=Tidak dapat menambah pendaftaran baru karena program ini hanya mengizinkan satu pendaftaran.
+switch_compare_form=Beralih untuk membandingkan formulir
+switch_default_form=Beralih ke bentuk default
+switch_tabel_form=Beralih ke bentuk tabel
+url_format=http://
+url_error=Pastikan bahwa URL tersebut valid.
+time_error=Format waktu salah
+no_blank_date=Even membutuhkan tanggal. Jika Anda ingin menjadwalkan even, harap hapus even ini dan buat even terjadwal baru.
+not_authorized_to_uncomplete_event=Tidak diizinkan untuk membatalkan even.
+both_date_and_time=Harap pastikan bahwa bidang tanggal dan waktu diisi dan mengikuti format yang benar. Jika tidak, data tidak akan disimpan.
+wrong_time_format=Harap pastikan bahwa format waktu (JJ:MM) diikuti.
+hours_and_minutes=HH: MM
+top_bar_settings=Pengaturan bilah atas
 show=Tampilkan
 sort_order=Urutkan
-activate_top_bar=Activate top bar
-remove_widget=Remove widget?
-remove_widget_info=You are about to remove a widget. Do you want to proceed?
-lock_default_layout=Lock layout for all users
-unlock_default_layout=Unlock layout for all users
-upload_image=Upload
-please_select_an_image=[Please select an image]
+activate_top_bar=Aktifkan bilah atas
+use_as_top_bar=Gunakan sebagai bilah atas
+remove_widget=Hapus widget?
+remove_widget_info=Anda akan menghapus widget. Apakah Anda ingin melanjutkan?
+lock_default_layout=Kunci tata letak untuk semua pengguna
+unlock_default_layout=Buka kunci tata letak untuk semua pengguna
+upload_image=Unggah
+please_select_an_image=[Silakan pilih gambar]
 all=Semua
 ALL=Semua
 completed=Selesai
 active=Aktif
 cancelled=Dibatalkan
-enrollment_status=Enrollment status
-go_to_registration=Go to registration
-tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
-tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
-tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
-tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
-no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
-no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
-tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
-tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
-possible_duplicates_found=Possible duplicates found.
-view_x_candidates=View {count} candidates
-view_candidate=View candidate
-matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
-review_possible_duplicates_before_registration=Review possible duplicates before registration
-review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
-register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
-large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
-too_many_search_results=Too many search results
+enrollment_status=Status pendaftaran
+go_to_registration=Pergi ke pendaftaran
+tracked_entity_instance_search_results_header={trackedEntityTypeName} hasil penelusuran
+tracked_entity_instance_search_matches_description=Jika tidak ada yang cocok di atas adalah {trackedEntityTypeName} yang Anda cari, pilih "Pergi ke pendaftaran".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} ditemukan
+tracked_entity_instance_unique_found_description={trackedEntityTypeName} ditemukan, di {orgUnitLevelName} lain.
+no_tracked_entity_instance_found_header={trackedEntityTypeName} tidak ditemukan.
+no_tracked_entity_instance_found_description={trackedEntityTypeName} tidak ditemukan.
+no_tracked_entity_instance_found_go_to_registration_description={trackedEntityTypeName} tidak ditemukan, klik 'Buka pendaftaran' jika Anda ingin mendaftar sebagai {trackedEntityTypeName} baru.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} sudah ada
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} sudah ada untuk {trackedEntityTypeName} lainnya. Apakah Anda ingin membuka {trackedEntityTypeName} ini?
+possible_duplicates_found=Kemungkinan duplikat ditemukan.
+view_x_candidates=Lihat {count} kandidat
+view_candidate=Lihat kandidat
+matching_tracked_entity_instance_register_description=Klik untuk membuka {trackedEntityTypeName} yang cocok atau kembali dan selesaikan pendaftaran.
+review_possible_duplicates_before_registration=Tinjau kemungkinan duplikat sebelum mendaftar
+review_possible_duplicates_description=Buka salah satu kandidat duplikat di atas, atau klik untuk mendaftar sebagai {trackedEntityTypeName} baru
+register_new_tracked_entity_instance=Daftarkan {trackedEntityTypeName} baru
+large_number_of_search_results_warning=Sejumlah besar kecocokan ditemukan. Silakan kembali dan perbaiki kriteria pencarian Anda atau pergi ke pendaftaran.
+too_many_search_results=Terlalu banyak hasil pencarian
 open=Buka
-continue=Continue
-no_program_write_access=Program write authority needed to send messages
+continue=Terus
+no_program_write_access=Program write authority diperlukan untuk mengirim pesan
 show_all=Tampilkan semua
-not_allowed=Not allowed
-you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
-this=this
-delete_failed=Delete failed
-cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
-cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
-no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
-drop_image=Drop image
-you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
-missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
-stage_write_required=Program stage write access required
-you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
-no_polygon_captured=No polygon captured
-polygon_captured=Polygon captured
-no_geometry_captured=No geometry captured
-geometry=Geometry
-tracked_entity_type=Tracked entity type
+not_allowed=Tidak diperbolehkan
+you_do_not_have_the_necessary_authorities_to_delete=Anda tidak memiliki otoritas yang diperlukan untuk menghapus
+this=ini
+delete_failed=Hapus yang gagal
+cannot_delete_this_enrollment_because_it_already_contains_events=Tidak dapat menghapus pendaftaran ini karena sudah berisi even. Harap hapus even sebelum menghapus pendaftaran
+cannot_delete_this_tei_because_it_already_contains_enrollments=Tidak dapat menghapus instance entitas terlacak ini karena sudah berisi pendaftaran. Harap hapus pendaftaran sebelum menghapus instance entitas yang dilacak
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs={trackedEntityTypeName} tidak ditemukan dalam program yang dipilih. Menampilkan hasil dari program lain
+drop_image=Masukkan gambar
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Anda memerlukan akses baca ke setidaknya satu jenis entitas yang dilacak agar dapat menelusuri tanpa konteks program
+missing_read_access_for_tracked_entity_type=Tidak ada akses baca untuk jenis entitas yang dilacak
+stage_write_required=Diperlukan akses tulis pada tahap program
+you_need_write_to_program_stage_to_be_able_to_create_event=Anda memerlukan akses tulis ke tahap program ini untuk dapat membuat even baru
+no_polygon_captured=Tidak ada poligon yang ditangkap
+polygon_captured=Poligon ditangkap
+no_geometry_captured=Tidak ada geometri yang ditangkap
+geometry=Geometri
+tracked_entity_type=Jenis entitas yang dilacak
 type=Tipe
-tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
-belongs_to_another_organisation_unit=belongs to another organization unit
-please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
-your_action_is_being_monitored=Your action is being monitored
-this=this
-saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
-saving_relationship_failed=Saving relationship failed.
-open_tei_error=Failed to open TEI
-PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
-compare_form_previous=Compare form previous
-compare_form_all=Compare form all
-grid_form=Grid form
-pop_over_form=POP-over form
-failed_to_delete_enrollment=Failed to delete enrollment
-enrollment_polygon=Enrollment polygon
-enrollment_point=Enrollment point
-event_polygon=Event polygon
-event_point=Event point
-point_on_map=Point on map
-polygon_on_map=Polygon on map
-cancel_capturing_polygon=Cancel capturing polygon
-you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
-complete_stage=Complete stage?
-complete_stage_info=Do you want to set this stage to complete?
-assigned_user=Assigned user
-linked_events=Linked events
-user_assignment=User assignment
-specific_users=Specific users:
+tracked_entity_type_has_no_attributes=Jenis entitas yang dilacak tidak memiliki atribut.
+belongs_to_another_organisation_unit=milik unit organisasi lain
+please_fill_in_a_reason_for_accessing=Harap isi alasan untuk mengakses
+your_action_is_being_monitored=Tindakan Anda sedang dipantau
+this=ini
+saving_relationship_failed_conflicts=Gagal menyimpan hubungan. Konflik
+saving_relationship_failed=Gagal menyimpan hubungan.
+open_tei_error=Gagal membuka TEI
+PROGRAM_ACCESS_CLOSED=Tidak ada akses ke instance entitas terlacak di luar unit organisasi pengambilan data yang ditetapkan.
+compare_form_previous=Bandingkan formulir sebelumnya
+compare_form_all=Bandingkan formulir semua
+grid_form=Bentuk grid
+pop_over_form=Formulir POP-over
+failed_to_delete_enrollment=Gagal menghapus pendaftaran
+enrollment_polygon=Poligon pendaftaran
+enrollment_point=Titik pendaftaran
+event_polygon=Poligon peristiwa
+event_point=Titik even
+point_on_map=Titik di peta
+polygon_on_map=Poligon di peta
+cancel_capturing_polygon=Batalkan pengambilan poligon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=Anda sedang dalam mode menggambar. Semua perubahan yang belum selesai akan hilang.
+complete_stage=Tahap lengkap?
+complete_stage_info=Apakah Anda ingin menyetel tahap ini untuk diselesaikan?
+assigned_user=Pengguna yang ditetapkan
+linked_events=Even terkait
+user_assignment=Tugas pengguna
+specific_users=Pengguna tertentu:
 none=Tidak ada
-any=Any
-no_requirement=No requirement
-the_record_has_is_possible_duplicate=The record has/is possible duplicate
-flag_possible_duplicate=Flag possible duplicate
-possible_duplicate=Possible duplicate
-unflag=Unflag
-possible_duplicate_info_start=Possible duplicate: This
-possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
-owned_by=Owned by:
-change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
-custom_working_list=Custom working list
+any=Apa saja
+no_requirement=Tidak ada persyaratan
+the_record_has_is_possible_duplicate=Catatan memiliki/mungkin duplikat
+flag_possible_duplicate=Tandai kemungkinan duplikat
+possible_duplicate=Kemungkinan duplikat
+unflag=Hapus bendera
+possible_duplicate_info_start=Kemungkinan duplikat: Ini
+possible_duplicate_info_end= adalah, atau memiliki, kemungkinan duplikat dan telah ditandai untuk ditinjau.
+owned_by=Dimiliki oleh:
+change_date_with_dependency_information=Memperbarui tanggal ini mungkin memerlukan tindakan lebih lanjut dari Anda. Even dalam program ini telah dijadwalkan berdasarkan tanggal ini, tetapi even ini tidak akan dijadwalkan ulang secara otomatis. Apakah Anda ingin melanjutkan pembaruan tanggal?
+custom_working_list=Daftar kerja khusus
diff --git a/i18n/i18n_app_km.properties b/i18n/i18n_app_km.properties
new file mode 100644
index 000000000..a4a488fe6
--- /dev/null
+++ b/i18n/i18n_app_km.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=\u17a2\u17d2\u1793\u1780\u1780\u17c6\u1796\u17bb\u1784\u178b\u17b7\u178f\u179b\u17be\u1794\u178e\u17d2\u178f\u17b6\u1789\u17a2\u17b7\u1793\u1792\u17ba\u179a\u178e\u17c2\u178f
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=\u200b\u1794\u1784\u17d2\u1780\u17be\u178f
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=\u1791\u17b6\u1798\u1791\u17b6\u179a
+number_required=Number required
+date_required=Date required
+number=\u178f\u17bd\u179a\u179b\u17c1\u1781
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=\u1788\u17d2\u1798\u17c4\u17c7
+filter=Filter
+search=\u179f\u17d2\u179c\u17c2\u1784\u179a\u1780
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Jump to page
+page=Page
+first=First
+previous=\u1798\u17bb\u1793
+next=\u1794\u1793\u17d2\u1791\u17b6\u1794\u17cb
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=Find
+edit=\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b
+edit_profile=\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b\u200b\u1787\u17b8\u179c\u1794\u17d2\u179a\u179c\u178f\u17d2\u178f\u17b7
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=\u200b\u179b\u17bb\u1794\u200b
+deleted=deleted
+remove=\u1799\u1780\u1785\u17c1\u1789
+entity=Entity
+clear=\u179b\u17bb\u1794\u1785\u17c4\u179b
+add=\u1794\u1793\u17d2\u1790\u17c2\u1798
+add_note=\u1794\u1793\u17d2\u1790\u17c2\u1798\u1780\u17b6\u179a\u1780\u178f\u17cb\u1785\u17c6\u178e\u17b6\u17c6
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=\u1795\u17d2\u1789\u17be\u1791\u17c5
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=\u1794\u1789\u17d2\u1785\u1794\u17cb
+incomplete=\u1798\u17b7\u1793\u1791\u17b6\u1793\u17cb\u200b\u1794\u1789\u17d2\u1785\u1794\u17cb
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=\u179f\u17d2\u1790\u17b6\u1793\u1797\u17b6\u1796
+event_completed=Event completed?
+details=Click to see details
+_details=\u179b\u1798\u17d2\u17a2\u17b7\u178f
+created_by=Registered by
+date=\u1780\u17b6\u179b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791
+_date=date
+event_name=Event name
+new_event=\u1796\u17d2\u179a\u17b9\u178f\u17d2\u178f\u17b7\u1780\u17b6\u179a\u178e\u17cf\u1790\u17d2\u1798\u17b8
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=\u17af
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=\u1795\u17d2\u1791\u17b6\u17c6\u1784\u1785\u1798\u17d2\u179a\u17c4\u17c7\u200b\u179f\u1784\u17d2\u1781\u17c1\u1794\u1796\u17d0\u178f\u17cc\u1798\u17b6\u1793
+home=\u1795\u17d2\u1791\u17b6\u17c6\u1784\u178a\u17be\u1798
+back=\u1790\u1799\u1780\u17d2\u179a\u17c4\u1799
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=\u1790\u17d2\u1784\u17c3\u1781\u17c2\u1786\u17d2\u1793\u17b6\u17c6\u1785\u17bb\u17c7\u1788\u17d2\u1798\u17c4\u17c7
+incident_date=\u1790\u17d2\u1784\u17c3\u1781\u17c2\u1786\u17d2\u1793\u17b6\u17c6 \u1792\u17d2\u179c\u17be\u179a\u17c4\u1782\u179c\u17b7\u1793\u17b7\u1785\u17d2\u1786\u17d0\u1799
+notes=\u1785\u17c6\u178e\u17b6\u17c6
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=\u1791\u17c6\u1793\u17b6\u1780\u17cb\u1791\u17c6\u1793\u1784
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=\u1787\u17d2\u179a\u17be\u179f\u200b\u179a\u17be\u179f
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicators
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u1798\u178f\u17b7\u200b\u1786\u17d2\u179b\u17be\u1799\u178f\u1794
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=\u179a\u1794\u17b6\u1799\u200b\u1780\u17b6\u179a\u178e\u17cd
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=\u1798\u17b7\u1793\u1798\u17b6\u1793\u178f\u1798\u17d2\u179b\u17c3
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u178a\u17c6\u178e\u17be\u179a\u1780\u17b6\u179a
+set_as_current=Set as current
+org_unit=\u1795\u17d2\u1793\u17c2\u1780\u200b\u1793\u17c3\u200b\u17a2\u1784\u17d2\u1782\u1780\u17b6\u179a
+org_unit_scope=Organisation unit scope
+SELECTED=\u1794\u17b6\u1793\u200b\u1787\u17d2\u179a\u17be\u179f
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=\u1791\u17b7\u1793\u17d2\u1793\u1793\u17d0\u1799\u1792\u17b6\u178f\u17bb\u178a\u17be\u1798
+value=\u178f\u1798\u17d2\u179b\u17c3
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=\u1794\u17b7\u1791
+generate=Generate
+print=\u1794\u17c4\u17c7\u1796\u17bb\u1798\u17d2\u1796
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=\u1780\u17b6\u179b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\u1780\u17c6\u178e\u178f\u17cb
+event_date=\u1790\u17d2\u1784\u17c3\u1781\u17c2\u1786\u17d2\u1793\u17b6\u17c6\u179a\u1794\u179f\u17cb\u1796\u17d2\u179a\u17b9\u178f\u17d2\u178f\u17b7\u1780\u17b6\u179a\u178e\u17cf
+report_date=\u1790\u17d2\u1784\u17c3\u1781\u17c2\u1786\u17d2\u1793\u17b6\u17c6\u179a\u17b6\u1799\u1780\u17b6\u179a\u178e\u17cf
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=\u1785\u17bb\u17c7\u1788\u17d2\u1798\u17c4\u17c7
+new_enrollment=New enrollment
+start_date=\u1780\u17b6\u179b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\u200b\u1785\u17b6\u1794\u17cb\u1795\u17d2\u178a\u17be\u1798\u200b
+end_date=\u1780\u17b6\u179b\u200b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\u200b\u1794\u1789\u17d2\u1785\u1794\u17cb\u200b
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=\u2265
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=\u1794\u17b6\u1791/\u1785\u17b6\u179f
+no=\u1791\u17c1
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=\u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793
+new=\u1790\u17d2\u1798\u17b8
+add_new=\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1790\u17d2\u1798\u17b8\u200b
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=\u1780\u17c6\u17a0\u17bb\u179f\u1794\u1785\u17d2\u1785\u17c1\u1780\u1791\u17c1\u179f
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=\u1795\u17d2\u1793\u17c2\u1780\u200b\u1793\u17c3\u200b\u17a2\u1784\u17d2\u1782\u1780\u17b6\u179a
+category=Category
+entity_type=Entity type
+save=\u179a\u1780\u17d2\u179f\u17b6\u1791\u17bb\u1780\u200b
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=\u178f\u17d2\u179a\u179b\u1794\u17cb\u1790\u1799\u200b\u1780\u17d2\u179a\u17c4\u1799
+cancel=\u1794\u17c4\u17c7\u1794\u1784\u17cb
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u1787\u17b8\u179c\u1794\u17d2\u179a\u179c\u178f\u17d2\u178f\u17b7
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=\u1780\u17b6\u179a\u200b\u1780\u17c6\u178e\u178f\u17cb
+account=\u1782\u178e\u1793\u17b8
+help=\u1787\u17c6\u1793\u17bd\u1799\u200b
+log_out=\u1785\u17c1\u1789\u1796\u17b8\u1782\u178e\u1793\u17b8
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=\u179a\u1799\u17c8\u1791\u1791\u17b9\u1784
+longitude=\u179a\u1799\u17c8\u1794\u178e\u17d2\u178f\u17c4\u1799
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=\u1780\u17c6\u17a1\u17bb\u1784\u1796\u17c1\u179b
+jan=\u1798\u1780\u179a\u17b6\u200b
+feb=\u1780\u17bb\u1798\u17d2\u1797\u17c8\u200b
+mar=\u1798\u17b8\u1793\u17b6\u200b
+apr=\u1798\u17c1\u179f\u17b6\u200b
+may=\u17a7\u179f\u1797\u17b6\u200b
+jun=\u1798\u17b7\u1790\u17bb\u1793\u17b6\u200b
+jul=\u1780\u1780\u17d2\u1780\u178a\u17b6\u200b
+aug=\u179f\u17b8\u17a0\u17b6\u200b
+sep=\u1780\u1789\u17d2\u1789\u17b6\u200b
+oct=\u178f\u17bb\u179b\u17b6\u200b
+nov=\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6\u200b
+dec=\u1792\u17d2\u1793\u17bc\u200b
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=\u1792\u17d2\u179c\u17be\u17a2\u17c4\u1799\u17a2\u179f\u1780\u1798\u17d2\u1798
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=\u1794\u17b7\u1791\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799
+extend_menu=\u1794\u1784\u17d2\u17a0\u17b6\u1789\u1798\u17c9\u17b8\u1793\u17bb\u1799
+show_main_menu=\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u1780\u17d2\u1793\u17bb\u1784\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u200b
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=\u1794\u17c4\u17c7\u1796\u17bb\u1798\u17d2\u1797\u179f\u17c6\u178e\u17bb\u17c6\u1794\u17c2\u1794\u1794\u1791
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=\u1780\u17b6\u179a\u1794\u1789\u17d2\u1787\u17bc\u1793
+show_previous=Show previous
+show_next=Show next
+schedule_new=\u1780\u17c6\u178e\u178f\u17cb\u1780\u17b6\u179b\u179c\u17b7\u1797\u17b6\u1782\u17a5\u17a1\u17bc\u179c\u1793\u17c1\u17c7
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=\u1798\u17c9\u17ba\u1793\u17bb\u1799\u200b\u178a\u17be\u1798
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=\u1780\u17c2\u1794\u17d2\u179a\u17c2\u200b\u178a\u17c4\u1799
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=\u1794\u17b6\u1793\u1794\u1789\u17d2\u1785\u1794\u17cb
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=\u1794\u17be\u1780
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=\u1780\u17b6\u179a\u200b\u1796\u17b7\u1796\u178e\u17cc\u1793\u17b6
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=\u179f\u17b6\u179a\u1791\u17bc\u179a\u179f\u17d0\u1796\u17d2\u1791
+email=\u179f\u17b6\u179a\u200b\u17a2\u17c1\u17a1\u17b7\u1785\u178f\u17d2\u179a\u17bc\u1793\u17b7\u1780
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=\u179f\u17b6\u179a
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=\u1786\u17d2\u1793\u17b6\u17c6
+months=\u1781\u17c2
+days=\u1790\u17d2\u1784\u17c3
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=\u1799\u179b\u17cb\u1796\u17d2\u179a\u1798
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=\u1794\u1789\u17d2\u1787\u17bc\u1793
+please_select_an_image=[Please select an image]
+all=\u1791\u17b6\u17c6\u1784\u17a2\u179f\u17cb
+ALL=\u1791\u17b6\u17c6\u1784\u17a2\u179f\u17cb
+completed=\u1794\u17b6\u1793\u1794\u1789\u17d2\u1785\u1794\u17cb
+active=Active
+cancelled=\u1794\u17b6\u1793\u179b\u17bb\u1794\u1785\u17c4\u179b
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=\u1794\u17be\u1780
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=\u1782\u17d2\u1798\u17b6\u1793
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_lo.properties b/i18n/i18n_app_lo.properties
index 7c2123de3..5e310e25b 100644
--- a/i18n/i18n_app_lo.properties
+++ b/i18n/i18n_app_lo.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u0e9a\u0ecd\u0ec8\u0ec4\u0e94\u0ec9\u0ea5\u0ebb\u0e
 not_yet_enrolled_enrollment=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5\u0e81\u0eb2\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99
 no_active_enrollment_exists=\u0e81\u0eb2\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99\u0e9a\u0ecd\u0ec8\u0ec4\u0e94\u0ec9\u0e99\u0ecd\u0eb2\u0ec3\u0e8a\u0ec9\u0eaa\u0ecd\u0eb2\u0ea5\u0eb1\u0e9a\u0eaa\u0eb2\u0e8d\u0e87\u0eb2\u0e99\u0e97\u0eb5\u0ec8\u0ec0\u0ea5\u0eb7\u0ead\u0e81
 no_active_enrollments_exist=\u0e81\u0eb2\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99\u0e9a\u0ecd\u0ec8\u0ec4\u0e94\u0ec9\u0e99\u0ecd\u0eb2\u0ec3\u0e8a\u0ec9
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u0e9a\u0ecd\u0ec8\u0ec4\u0e94\u0ec9\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99. \u0e9a\u0ecd\u0ec8\u0eaa\u0eb2\u0ea1\u0eb2\u0e94\u0e9a\u0eb1\u0e99\u0e97\u0eb6\u0e81\u0e9a\u0ebb\u0e94\u0e9a\u0eb1\u0e99\u0e97\u0eb6\u0e81\u0ec4\u0e94\u0ec9
 not_yet_enrolled_report=\u0e9a\u0ecd\u0ec8\u0ec4\u0e94\u0ec9\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99. \u0e9a\u0ecd\u0ec8\u0eaa\u0eb2\u0ea1\u0eb2\u0e94\u0ea5\u0eb2\u0e8d\u0e87\u0eb2\u0e99\u0ec4\u0e94\u0ec9
 no_data_report=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5 \u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e97\u0eb5\u0ec8\u0ec4\u0e94\u0ec9\u0ea5\u0eb2\u0e8d\u0e87\u0eb2\u0e99
@@ -141,7 +142,7 @@ selected_search_attributes=\u0e84\u0eb8\u0e99\u0ea5\u0eb1\u0e81\u0eaa\u0eb0\u0e9
 selected_program=\u0ec0\u0ea5\u0eb7\u0ead\u0e81\u0eaa\u0eb2\u0e8d\u0e87\u0eb2\u0e99
 other_programs=\u0eaa\u0eb2\u0e8d\u0e87\u0eb2\u0e99\u0ead\u0eb7\u0ec8\u0e99
 search_for_dashboard=\u0e84\u0ebb\u0ec9\u0e99\u0eab\u0eb2\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0ec3\u0e99\u0edc\u0ec9\u0eb2\u0eaa\u0eb0\u0ec1\u0e94\u0e87\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99
-dashboard=\u0e95\u0eb2\u0edc\u0ec8\u0eb2\u0e87\u0eaa\u0eb1\u0e87\u0ea5\u0ea7\u0ea1\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e82\u0ec8\u0eb2\u0ea7\u0eaa\u0eb2\u0e99
+dashboard=\u0e81\u0eb0\u0e94\u0eb2\u0e99\u0e82\u0ec8\u0eb2\u0ea7
 home=\u0edc\u0ec9\u0eb2\u0eab\u0ebc\u0eb1\u0e81
 back=\u200b\u0e81\u0eb1\u0e9a\u200b\u0e84\u0eb7\u0e99
 enrollment=\u0e81\u0eb2\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99
@@ -205,6 +206,7 @@ registered_data=\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e97\u0eb5\u0ec8\u0ec4\u0e
 no_value=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99
 no_data_found=\u0e9a\u0ecd\u0ec8\u0e9e\u0ebb\u0e9a\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99
 no_data=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99
+mo_matching_data=No data matching your search criteria
 data_exists=\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0ea1\u0eb5\u0ec1\u0ea5\u0ec9\u0ea7
 data_registerd=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5\u0e82\u0ecd\u0ec9\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99
 no_visit_made=No visit made
@@ -273,7 +275,7 @@ exact_date=\u0ea7\u0eb1\u0e99\u0e97\u0eb5\u0eb5\u0ec1\u0e99\u0ec8\u0e99\u0ead\u0
 exact_value=\u0e84\u0ec8\u0eb2\u0ec1\u0e99\u0ec8\u0e99\u0ead\u0e99
 EQ=\u0ec0\u0e97\u0ebb\u0ec8\u0eb2\u0e81\u0eb1\u0e9a
 GT=\u0eab\u0ebc\u0eb2\u0e8d\u0e81\u0ec8\u0ea7\u0eb2
-GE=>\=
+GE=\u0ec3\u0eab\u0ec8\u0e8d\u0e81\u0ea7\u0ec8\u0eb2\u0eab\u0ebc\u0eb7\u0ec0\u0e97\u0ebb\u0ec8\u0eb2\u0e81\u0eb1\u0e9a
 LT=<
 LE=\u0e99\u0ec9\u0ead\u0e8d\u0e81\u0ea7\u0ec8\u0eb2\u0eab\u0ebc\u0eb7\u0ec0\u0e97\u0ebb\u0ec8\u0eb2\u0e81\u0eb1\u0e9a
 NE=\u0e9a\u0ecd\u0ec8\u0ec0\u0e97\u0ebb\u0ec8\u0eb2
@@ -282,8 +284,8 @@ RANGE=\u0e82\u0ead\u0e9a\u0ec0\u0e82\u0e94
 like=\u0ea1\u0eb1\u0e81
 not_like=\u0e9a\u0ecd\u0ec8\u0ecd\u0ec8\u0e84\u0ec9\u0eb2\u0e8d\u0e84\u0eb7
 boolean=\u0e96\u0eb6\u0eb7\u0e81\u0e9c\u0eb4\u0e94
-yes=Yes
-no=No
+yes=\u0ea1\u0eb5
+no=\u0e9a\u0ecd\u0ec8\u0ea1\u0eb5
 records=\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e9a\u0eb1\u0e99\u0e97\u0eb6\u0e81
 record=\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e9a\u0eb1\u0e99\u0e97\u0eb6\u0e81
 _record=\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99\u0e9a\u0eb1\u0e99\u0e97\u0eb6\u0e81
@@ -352,6 +354,7 @@ advanced_search=\u0e84\u0ebb\u0ec9\u0e99\u0eab\u0eb2\u0e82\u0eb1\u0ec9\u0e99\u0e
 profile=\u0ea5\u0eb2\u0e8d\u0ea5\u0eb0\u0ead\u0ebd\u0e94\u0eaa\u0ec8\u0ea7\u0e99\u0e95\u0ebb\u0ebb\u0ea7
 applications=\u0ec1\u0ead\u0eb1\u0e9a
 more_applications=\u0ec1\u0ead\u0eb1\u0eb1\u0e9a\u0ead\u0eb7\u0ec8\u0e99\u0ec6
+manage=Manage
 settings=\u0e95\u0eb1\u0ec9\u0e87\u0e84\u0ec8\u0eb2
 account=\u0e9a\u0eb1\u0e99\u0e8a\u0eb5
 help=\u0e8a\u0ec8\u0ea7\u0e8d
@@ -575,6 +578,7 @@ top_bar_settings=Top bar settings
 show=\u0eaa\u0eb0\u0ec1\u0e94\u0e87
 sort_order=\u0ea5\u0ebd\u0e87\u0ea5\u0eb3\u0e94\u0eb1\u0e9a
 activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
 remove_widget=Remove widget?
 remove_widget_info=You are about to remove a widget. Do you want to proceed?
 lock_default_layout=Lock layout for all users
@@ -586,7 +590,7 @@ ALL=\u0e97\u0eb1\u0e87\u0edd\u0ebb\u0e94
 completed=\u0eaa\u0ecd\u0eb2\u0ec0\u0ea5\u0eb1\u0e94\u0ec1\u0ea5\u0ec9\u0ea7
 active=\u0e97\u0eb5\u0ec8\u0e8d\u0eb1\u0e87\u0e99\u0ecd\u0eb2\u0ec3\u0e8a\u0ec9\u0ea2\u0eb9\u0ec8
 cancelled=\u0e8d\u0ebb\u0e81\u0ec0\u0ea5\u0eb5\u0e81\u0ec1\u0ea5\u0ec9\u0ea7
-enrollment_status=Enrollment status
+enrollment_status=\u0eaa\u0eb0\u0e96\u0eb2\u0e99\u0eb0\u0e81\u0eb2\u0e99\u0ea5\u0ebb\u0e87\u0e97\u0eb0\u0e9a\u0ebd\u0e99
 go_to_registration=Go to registration
 tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
 tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
diff --git a/i18n/i18n_app_my.properties b/i18n/i18n_app_my.properties
new file mode 100644
index 000000000..7182e9e0d
--- /dev/null
+++ b/i18n/i18n_app_my.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=\u101e\u1004\u103a\u1021\u1004\u103a\u1010\u102c\u1014\u1000\u103a\u1014\u103e\u1004\u103a\u1037\u1001\u103b\u102d\u1010\u103a\u1006\u1000\u103a\u1011\u102c\u1038\u101e\u100a\u103a
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=\u1019\u101b\u103d\u1031\u1038\u1001\u103b\u101a\u103a\u1011\u102c\u1038\u101e\u1031\u102c
+create=\u1016\u1014\u103a\u1010\u102e\u1038\u101e\u100a\u103a
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=\u1016\u103c\u100a\u103a\u1037\u101e\u103d\u1004\u103a\u1038\u101b\u1014\u103a\u101c\u102d\u102f\u1021\u1015\u103a\u101e\u100a\u103a
+number_required=Number required
+date_required=Date required
+number=\u1002\u100f\u1014\u103a\u1038
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=\u1010\u1014\u103a\u1016\u102d\u102f\u1038\u101e\u100a\u103a \u1000\u102d\u1014\u103a\u1038\u1002\u100f\u1014\u103a\u1038\u101e\u102c \u1016\u103c\u1005\u103a\u101b\u1019\u100a\u103a\u104b
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=\u1021\u1019\u100a\u103a
+filter=\u101b\u103e\u102c\u1016\u103d\u1031\u1011\u102f\u1010\u103a\u101e\u100a\u103a
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=\u1005\u102c\u1019\u103b\u1000\u103a\u1014\u103e\u102c\u101e\u102d\u102f\u1037\u1000\u103b\u1031\u102c\u103a\u101e\u103d\u102c\u1038\u101e\u100a\u103a
+page=Page
+first=First
+previous=\u1014\u1031\u102c\u1000\u103a\u101e\u102d\u102f\u1037
+next=\u101b\u103e\u1031\u1037\u101e\u102d\u102f\u1037
+last=Last
+go_to_dashboard=Go to dashboard
+go=\u1006\u1000\u103a\u101e\u103d\u102c\u1038\u101e\u100a\u103a
+find=\u101b\u103e\u102c\u101e\u100a\u103a
+edit=\u1010\u100a\u103a\u1038\u1016\u103c\u1010\u103a\u101e\u100a\u103a
+edit_profile=\u1021\u1010\u1039\u1011\u102f\u1015\u1039\u1015\u1010\u1039\u1010\u102d\u1021\u1000\u103b\u1009\u103a\u1038\u1000\u102d\u102f\u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1001\u103c\u1004\u103a\u1038
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=\u1016\u103b\u1000\u103a\u1006\u102e\u1038\u101e\u100a\u103a
+deleted=deleted
+remove=\u1016\u101a\u103a\u101b\u103e\u102c\u1038\u1001\u103c\u1004\u103a\u1038
+entity=Entity
+clear=\u101b\u103e\u1004\u103a\u1038\u101c\u1004\u103a\u1038\u101e\u100a\u103a
+add=\u1011\u1015\u103a\u1011\u100a\u103a\u1037\u101e\u100a\u103a
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=\u1015\u102d\u102f\u1037\u101e\u100a\u103a
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=\u1015\u103c\u100a\u1037\u103a\u1005\u102f\u1036\u101e\u100a\u103a\u104b
+incomplete=\u1019\u1015\u103c\u100a\u1037\u103a\u1005\u102f\u1036\u1015\u102b\u104b
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=\u1021\u1001\u103c\u1031\u1021\u1014\u1031
+event_completed=Event completed?
+details=Click to see details
+_details=\u1021\u101e\u1031\u1038\u1005\u102d\u1010\u103a\u1019\u103b\u102c\u1038
+created_by=Registered by
+date=\u101b\u1000\u103a\u1005\u103d\u1032
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=\u1019\u103e\u102c
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=\u1021\u1001\u103b\u1000\u103a\u1021\u101c\u1000\u103a\u1019\u103b\u102c\u1038\u101c\u1031\u1037\u101c\u102c\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1001\u103c\u1004\u103a\u1038
+home=\u1015\u1004\u103a\u1019\u1005\u102c\u1019\u103b\u1000\u103a\u1014\u103e\u102c
+back=\u200c\u1014\u1031\u102c\u1000\u103a\u101e\u102d\u102f\u1037\u1015\u103c\u1014\u103a\u101e\u103d\u102c\u1038\u101e\u100a\u103a
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=\u0414\u0430\u0442\u0430 \u0437\u0430\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f
+incident_date=Incident date
+notes=\u1019\u103e\u1010\u103a\u1005\u102f
+relationship=Relationship
+relationshipTo=\u0418\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0435 \u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u044f
+relationshipFrom=\u0412\u0445\u043e\u0434\u044f\u0449\u0438\u0435 \u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u044f
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=\u101b\u103d\u1031\u1038\u1001\u103b\u101a\u103a\u1015\u102b\u104b
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=\u1021\u100a\u103d\u103e\u1014\u103a\u1038\u1019\u103b\u102c\u1038
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u1021\u1000\u103c\u1031\u102c\u1004\u103a\u1038\u1015\u103c\u1014\u103a\u1000\u103c\u102c\u1038\u1001\u103b\u1000\u103a
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1019\u103b\u102c\u1038
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=\u1010\u1014\u103a\u1016\u102d\u102f\u1038\u1019\u101b\u103e\u102d\u1015\u102b\u104b
+no_data_found=data \u1019\u1010\u103d\u1031\u1037\u1015\u102b\u104b
+no_data=\u1021\u1001\u103b\u1000\u103a\u1021\u101c\u1000\u103a\u1019\u101b\u103e\u102d\u1015\u102b\u104b
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Organisation unit
+org_unit_scope=Organisation unit scope
+SELECTED=\u200c\u101b\u103d\u1031\u1038\u1001\u103b\u101a\u103a\u1011\u102c\u1038\u1015\u103c\u102e\u1038
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=data element
+value=\u1010\u1014\u103a\u1016\u102d\u102f\u1038
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=\u1015\u102d\u1010\u103a\u101e\u100a\u103a
+generate=Generate
+print=Print \u1011\u102f\u1010\u103a\u101e\u100a\u103a
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=\u0414\u0430\u0442\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
+event_date=Event date
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=\u1011\u1000\u103a\u1000\u103c\u102e\u1038\u101e\u100a\u103a\u104b
+GE=Greater Than or Equal
+LT=\u1021\u1031\u102c\u1000\u103a\u1004\u101a\u103a\u101e\u100a\u103a\u104b
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=\u041d\u0440\u0430\u0432\u0438\u0442\u0441\u044f
+not_like=Not like
+boolean=Boolean
+yes=\u1019\u103e\u1014\u103a
+no=No
+records=Records
+record=Record
+_record=record
+_records=records
+found=\u101b\u103e\u102c\u1010\u103d\u1031\u1037\u101e\u100a\u103a\u104b
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=\u101c\u1000\u103a\u101b\u103e\u102d
+new=\u1021\u101e\u1005\u103a
+add_new=\u1021\u101e\u1005\u103a\u1011\u100a\u103a\u1037\u1001\u103c\u1004\u103a\u1038
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=\u1021\u1019\u103e\u102c\u1038
+warning=\u101e\u1010\u102d
+success=\u1021\u1031\u102c\u1004\u103a\u1019\u103c\u1004\u103a\u101e\u100a\u103a
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisation unit
+category=category
+entity_type=Entity type
+save=\u101e\u102d\u1019\u103a\u1038\u1006\u100a\u103a\u1038\u101e\u100a\u103a
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=\u1015\u103c\u1014\u103a\u101e\u103d\u102c\u1038\u1015\u102b
+cancel=\u1015\u101a\u103a\u1016\u103b\u1000\u103a\u101e\u100a\u103a
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u1021\u1010\u1039\u1011\u102f\u1015\u1039\u1015\u1010\u1039\u1010\u102d\u1021\u1000\u103b\u1009\u103a\u1038
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=\u1010\u100a\u103a\u1006\u1031\u102c\u1000\u103a\u1011\u102c\u1038\u101e\u100a\u103a\u1037\u1021\u1014\u1031\u1021\u1011\u102c\u1038
+account=\u1005\u102c\u101b\u1004\u103a\u1038
+help=\u1021\u1000\u1030\u1021\u100a\u102e\u1010\u1031\u102c\u1004\u103a\u1038\u1001\u1036\u101b\u1014\u103a
+log_out=\u1005\u1014\u1005\u103a\u1019\u103e\u1011\u103d\u1000\u103a\u1001\u103c\u1004\u103a\u1038
+about_dhis2=DHIS 2 \u1021\u1000\u103c\u1031\u102c\u1004\u103a\u1038
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u1019\u103b\u102c\u1038\u1000\u102d\u102f\u1021\u1019\u100a\u103a\u1016\u103c\u1004\u103a\u1037\u101b\u103e\u102c\u1015\u102b
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=\u1021\u1001\u103b\u102d\u1014\u103a\u1000\u102c\u101c
+jan=\u1007\u1014\u103a\u1014\u101d\u102b\u101b\u102e
+feb=\u1016\u1031\u1016\u1031\u102c\u103a\u101d\u102b\u101b\u102e
+mar=\u1019\u1010\u103a
+apr=\u1027\u1015\u103c\u102e
+may=\u1019\u1031
+jun=\u1007\u103d\u1014\u103a
+jul=\u1007\u1030\u101c\u102d\u102f\u1004\u103a
+aug=\u101e\u103c\u1002\u102f\u1010\u103a
+sep=\u1005\u1000\u103a\u1010\u1004\u103a\u1018\u102c
+oct=\u1021\u1031\u102c\u1000\u103a\u1010\u102d\u102f\u1018\u102c
+nov=\u1014\u102d\u102f\u101d\u1004\u103a\u1018\u102c
+dec=\u1012\u102e\u1007\u1004\u103a\u1018\u102c
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=\u1019\u102e\u1014\u1030\u1038\u1000\u102d\u102f\u1019\u1019\u103c\u1004\u103a\u1021\u1031\u102c\u1004\u103a\u1016\u103d\u1000\u103a\u1001\u103c\u1004\u103a\u1038
+extend_menu=\u1019\u102e\u1014\u1030\u1038\u1000\u102d\u102f\u1001\u103b\u1032\u1037\u1001\u103c\u1004\u103a\u1038
+show_main_menu=\u1021\u1013\u102d\u1000\u1019\u102e\u1014\u1030\u1038\u1000\u102d\u102f\u1015\u103c\u101e\u1001\u103c\u1004\u103a\u1038
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=\u1021\u1001\u1014\u103a\u1038/ \u1000\u100f\u1039\u100d
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=\u100a\u103d\u103e\u1014\u103a\u1038\u1015\u102d\u102f\u1037\u1001\u103c\u1004\u103a\u1038
+show_previous=Show previous
+show_next=Show next
+schedule_new=\u1021\u101e\u1005\u103a\u1001\u103b\u102d\u1014\u103a\u1038\u1006\u102d\u102f\u1001\u103c\u1004\u103a\u1038
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=\u1021\u1013\u102d\u1000\u1005\u102c\u1019\u103b\u1000\u103a\u1014\u103e\u102c
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=\u1016\u1031\u102c\u103a\u1015\u103c\u1001\u103b\u1000\u103a
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=\u101e\u1010\u1004\u103a\u1038\u1010\u102d\u102f\u1015\u1031\u1038\u1015\u102d\u102f\u1037\u1001\u103c\u1004\u103a\u1038
+email=\u1021\u102e\u1038\u1019\u1031\u1038\u101c\u103a
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=\u101e\u1010\u1004\u103a\u1038
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=\u1014\u103e\u1005\u103a\u1019\u103b\u102c\u1038
+months=\u101c\u1019\u103b\u102c\u1038
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=\u101c\u1000\u103a\u1001\u1036\u101e\u100a\u103a
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043d\u0430 \u0442\u0430\u0431\u0435\u043b\u044c \u0444\u043e\u0440\u043c
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=\u1016\u103c\u100a\u103a\u1037\u101e\u103d\u1004\u103a\u1038\u101e\u102d\u1019\u103a\u1038\u1006\u100a\u103a\u1038\u101e\u100a\u103a
+please_select_an_image=[Please select an image]
+all=\u1021\u102c\u1038\u101c\u102f\u1036\u1038
+ALL=\u1021\u102c\u1038\u101c\u102f\u1036\u1038
+completed=Completed
+active=\u101c\u102f\u1015\u103a\u1006\u1031\u102c\u1004\u103a\u1014\u102d\u102f\u1004\u103a\u101e\u100a\u103a
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=\u1015\u102f\u1036\u1005\u1036
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=\u0421\u0431\u043e\u0439 \u0432 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=\u0422\u043e\u0447\u043a\u0430 \u043c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a\u0430
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=\u0412 \u0434\u0430\u043d\u043d\u044b\u0439 \u043c\u043e\u043c\u0435\u043d\u0442 \u0432\u044b \u043f\u0440\u0435\u0431\u044b\u0432\u0430\u0435\u0442\u0435  \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u043f\u0440\u043e\u0440\u0438\u0441\u043e\u0432\u043a\u0438. \u0412\u0441\u0435 \u043d\u0435\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u044b.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=\u1010\u1005\u103a\u1001\u102f\u1019\u103e\u1019\u101f\u102f\u1010\u103a
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_nb.properties b/i18n/i18n_app_nb.properties
index 4a4d2f459..ede781254 100644
--- a/i18n/i18n_app_nb.properties
+++ b/i18n/i18n_app_nb.properties
@@ -6,23 +6,24 @@ tracked_entity_management=Sporet enhetsadministrasjon
 registering_unit=Registreringsenhet
 program=Program
 tracked_entity=Sporet enhet
-tracked_entity_instance=Sporet enhet instans
-tracked_entity_attribute=Sporet enhet attributt
+tracked_entity_instance=Sporet enhetforekomst
+tracked_entity_attribute=Sporet enhetattributt
 select_or_search=Velg eller s\u00f8k i listen
-please_select=[Vennligst velg]
-please_select_a_program=[Vennligst velg et program]
+please_select=[Please select]
+please_select_a_program=[Please select a program]
 no_program_exists=[Ingen program finnes]
 please_select_a_program_for_enrollment=Velg et program for registrering
 please_select_program_report=Vennligst velg et program for rapportering
 please_select_a_relationship=Vennligst velg en relasjon
 no_relationship=Det finnes ingen relasjoner
-relationship_not_possible=Ingen sporede enhetsinstanser, relasjoner er ikke mulig
+relationship_not_possible=Ingen sporede enhetsforekomster, relasjoner er ikke mulig
 no_program_exists_enrollment=Det finnes ingen programmer for den valgte organisasjonsenheten. Registrering er ikke mulig.
 no_program_exists_report=Det finnes ingen programmer for den valgte organisasjonsenheten. Rapportering er ikke mulig.
 not_yet_enrolled_data_entry=Ikke registrert enda. Dataregistrering ikke mulig.
 not_yet_enrolled_enrollment=Ingen registrering finnes
 no_active_enrollment_exists=Det finnes ingen aktiv registrering for det valgte programmet
 no_active_enrollments_exist=Det finnes ingen aktive registreringer
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Ikke registrert enda. Ikke mulig \u00e5 skrive notater.
 not_yet_enrolled_report=Ikke registrert enda. Rapportering er ikke mulig
 no_data_report=Det finnes ingen oppf\u00f8ringer for rapportering
@@ -33,13 +34,13 @@ event_creation=Opprett en fra under
 not_selected=Ikke valgt
 create=Opprett
 view_all=[Vis alle]
-list_all_entities=List opp alle enheter
+list_all_entities=Vis alle enheter
 list_all=Vis alle
 list=Vis
 lists=Lister
 invalid=Ugyldig
 selected_tei_is_invalid=Den valgte forekomsten av sporet enhet er ugyldig
-required=Obligatorisk
+required=P\u00e5krevd
 number_required=Antall er obligatorisk
 date_required=Dato er obligatorisk
 number=Nummer
@@ -107,14 +108,14 @@ your_email_message_here=Skriv din melding her
 sms_send_status=SMS-sendingsstatus
 send=Send
 add_new_event=Legg til ny hendelse
-add_new_event_for_stage=Legg til en hendelse for fase
+add_new_event_for_stage=Legg til en hendelse for fasen
 schedule_new_event=Planlegg en ny hendelse
 schedule_new_event_for_stage=Planlegg en ny hendelse for fasen
-refer_new_event_for_stage=Henvis til ny hendelse for fase
+refer_new_event_for_stage=Henvis til ny hendelse for fasen
 skip=Hopp over
 unskip=Planlegg igjen
 complete=Fullf\u00f8r
-incomplete=Gjen\u00e5pne
+incomplete=Ufullstendig
 reopen=Gjen\u00e5pning
 validate=Valider
 validation_result=Valideringsresultat
@@ -155,7 +156,7 @@ deactivate_enrollment=Deaktiver registrering
 enrollment_date=Registreringsdato
 incident_date=Forekomstdato
 notes=Notater
-relationship=Relasjoner
+relationship=Relasjon
 relationshipTo=Utg\u00e5ende relasjoner
 relationshipFrom=Innkommende relasjoner
 relationships=Relasjoner
@@ -182,12 +183,12 @@ reports=Rapporter
 registration_and_data_entry=Registrering og dataregistrering
 program_summary_report=Programoppsummeringsrapport
 program_summary=Programoppsummering
-program_summary_description=Generer en sammendragsrapport for et bestemt program, organisasjonsenhet og tidsramme. Rapporten presenterer en liste over sporede enhetsforekomster og postene deres organisert basert p\u00e5 programfaser.
+program_summary_description=Generer en sammendragsrapport for et bestemt program, organisasjonsenhet og tidsramme. Rapporten presenterer en liste over sporede enhetsforekomster og oppf\u00f8ringene deres organisert etter programfaser.
 program_statistics_report=Programstatistikkrapport
 program_statistics=Programstatistikker
 program_statistics_description=Generer en statistikkrapport for et bestemt program. Rapporten gir for eksempel en oversikt over frafall eller fullf\u00f8ringsgrad i en gitt tidsramme ved en bestemt organisasjonsenhet.
 upcoming_events=Kommende hendelser
-upcoming_events_description=Generer en tabellrapport som viser sporede enhetsforekomster og deres kommende hendelser for et valgt program og tid. S\u00f8ke, sortere og vise / skjule operasjoner er mulig i kolonnene.
+upcoming_events_description=Generer en tabellrapport som viser sporede enhetsforekomster og deres kommende hendelser for et valgt program og tid. S\u00f8ke, sortere og vise/skjule-operasjoner er mulig i kolonnene.
 overdue_events=Forfalte hendelser
 overdue_events_description=Generer en liste over hendelser for et valgt program. Rapporten viser en oversikt over sporede enhetsforekomster og hendelser som ikke blir utf\u00f8rt i tide. Filtrering og s\u00f8k er ogs\u00e5 mulig.
 enrollment_stats=Registreringstatistikk
@@ -205,6 +206,7 @@ registered_data=Registrerte data
 no_value=Ingen verdi
 no_data_found=Ingen data funnet
 no_data=Ingen data
+mo_matching_data=No data matching your search criteria
 data_exists=Eksisterende data
 data_registerd=Ingen data registrert
 no_visit_made=Ingen bes\u00f8k gjort
@@ -212,13 +214,13 @@ visit_not_made=Bes\u00f8k ikke gjort
 _visit=Bes\u00f8k
 visit=Bes\u00f8k
 visits=Bes\u00f8kende
-current_selections=Gjeldende valgt
+current_selections=Gjeldende valg
 activePrograms=Aktive programmer
 set_as_current=Sett som gjeldende
 org_unit=Organisasjonsenhet
 org_unit_scope=Organisasjonsenhet-omfang
 SELECTED=Valgt
-CHILDREN=Umiddelbare underordnede enheter
+CHILDREN=N\u00e6rmeste underenheter
 DESCENDANTS=Alle underordnede enheter
 ACCESSIBLE=Alle tilgjengelige
 data_element=Dataelement
@@ -254,7 +256,7 @@ disable_rescheduling=Deaktiver omplanlegging
 show_hide_scheduling=Vis/Skjul omplanleggingsskjema
 show_hide_notes=Vis/Skjul notatskjema
 show_hide_messaging=Vis/skjul meldingsskjema
-messaging=Meldinger
+messaging=Meldingstjenester
 scheduling=Planlegging
 reschedule_duedate=Flytt forfallsdato
 reschedule=Planlegg p\u00e5 nytt
@@ -339,7 +341,7 @@ are_you_sure_to_reopen_enrollment=Er du sikker p\u00e5 at du vil \u00e5pne den v
 are_you_sure_to_delete_event=Er du sikker p\u00e5 at du vil slette den valgte hendelsen?
 are_you_sure_to_delete_event_with_audit=Er du sikker p\u00e5 at du vil slette den valgte hendelsen? Dette vil ogs\u00e5 fjerne alle relaterte revisjonsverdier.
 are_you_sure_to_complete_event=Er du sikker p\u00e5 at du vil fullf\u00f8re den valgte hendelsen?
-please_fix_errors_before_completing=Se over og rett opp f\u00f8lgende feil f\u00f8r du fullf\u00f8rer denne hendelsen
+please_fix_errors_before_completing=Se over og rett opp f\u00f8lgende feil f\u00f8r du fullf\u00f8rer denne hendelsen:
 are_you_sure_to_incomplete_event=Er du sikker p\u00e5 at du vil redigere den valgte hendelsen?
 are_you_sure_to_skip_event=Er du sikker p\u00e5 at du vil hoppe over den valgte hendelsen?
 are_you_sure_to_unskip_event=Er du sikker p\u00e5 at du vil planlegge valgt hendelse igjen?
@@ -352,6 +354,7 @@ advanced_search=Avansert s\u00f8k
 profile=Profil
 applications=Applikasjoner
 more_applications=Flere applikasjoner
+manage=Administrer
 settings=Innstillinger
 account=Brukerkonto
 help=Hjelp
@@ -364,19 +367,19 @@ loading_metadata=Laster meta-data
 loading_components=Laster komponenter
 latitude=Breddegrad
 longitude=Lengdegrad
-lat_lng=[Breddegrad Lengegrad]
+lat_lng=[Breddegrad Lengdegrad ]
 get=F\u00e5
 get_from_map=F\u00e5 fra kart
-capture=Fange opp
+capture=Registrer
 nothing_captured=Ingenting er fanget opp
 point_and_click_for_coordinate=H\u00f8yreklikk p\u00e5 kartet for \u00e5 velge plassering
 value_must_be_between=Verdien m\u00e5 v\u00e6re mellom
 locate_organisation_unit_by_name=Finn organisasjonsenhet etter navn
-dashboard_layout_saved=Dashbord utseende lagret
-dashboard_layout_saved_as_default=Dashbord utseende er lagret som standard
-dashboard_layout_not_saved=Dashbord utseende er ikke lagret
-dashboard_layout_not_saved_as_default=Kunne ikke lagre dashbord utseende som standard
-dashboard_layout_not_fetched=Kunne ikke hente dashbord oppsett
+dashboard_layout_saved=Dashbordoppsett lagret
+dashboard_layout_saved_as_default=Dashbordoppsett er lagret som standard
+dashboard_layout_not_saved=Dashbordoppsett er ikke lagret
+dashboard_layout_not_saved_as_default=Kunne ikke lagre dashbordoppsett som standard
+dashboard_layout_not_fetched=Kunne ikke hente dashbordoppsett
 failed_to_fetch_enrollment=Kunne ikke hente registrering fra serveren
 failed_to_save_enrollment=Kunne ikke lagre registrering p\u00e5 serveren
 failed_to_update_enrollment=Kunne ikke oppdatere registreringen p\u00e5 serveren
@@ -409,8 +412,8 @@ oct=Oktober
 nov=November
 dec=Desember
 week=Uke
-save_layout_as_default=Dashbord oppsett lagret som standard
-reset_layout=Resett dashbord oppsett
+save_layout_as_default=Dashbordoppsett lagret som standard
+reset_layout=Nullstill dashbordoppsett
 is_expected_to_be=Forventet \u00e5 v\u00e6re
 but_found=men funnet
 equals_to=likt med
@@ -493,8 +496,8 @@ overdue=Forfalt
 overdue_label=Forfalt
 stage_overdue=Hendelsen har forfalt
 stage_overdue_label=Funnet forfalte
-skipped=Hoppet over hendelse
-skipped_label=Hoppet over hendelse
+skipped=Hoppet over hendelsen
+skipped_label=Hoppet over hendelsen
 stage_empty=Tomt
 stage_empty_label=Tomt
 complete_active_events_before_completing_enrollment=Vennligst fullf\u00f8r aktive hendelser f\u00f8r du fullf\u00f8rer registreringen
@@ -513,7 +516,7 @@ not_available=Ikke tilgjengelig
 attribute=Attributt
 data_entry=Dataregistrering
 invalid_coordinate_format=Ugyldig koordinatformat
-latitude_longitude_format=Breddegrad,lengdegrad
+latitude_longitude_format=Lengdegrad,breddegrad
 missing_search_ous=Brukeren har ikke noen organisasjonsenhet tildelt til seg
 cocbo_filter=Kategori og kategorialternativ filter
 apply=Bruk
@@ -573,8 +576,9 @@ wrong_time_format=S\u00f8rg for at tidsformat (HH:MM) er fulgt.
 hours_and_minutes=HH:MM
 top_bar_settings=Topplinjeinnstillinger
 show=Vis
-sort_order=Sorter etter
+sort_order=Sorteringsrekkef\u00f8lge
 activate_top_bar=Aktiver topplinje
+use_as_top_bar=Bruk som topplinje
 remove_widget=Fjern modul?
 remove_widget_info=Du er i ferd med \u00e5 fjerne en modul. Vil du fortsette?
 lock_default_layout=L\u00e5s oppsett for alle brukere
@@ -608,10 +612,10 @@ large_number_of_search_results_warning=Et stort antall treff ble funnet. G\u00e5
 too_many_search_results=For mange s\u00f8keresultat
 open=\u00c5pne
 continue=Fortsett
-no_program_write_access=Program skriverettighet er n\u00f8dvendig for \u00e5 sende meldinger
+no_program_write_access=Skriverettigheter for programmet er n\u00f8dvendig for \u00e5 sende meldinger
 show_all=Vis alle
 not_allowed=Ikke tillatt
-you_do_not_have_the_necessary_authorities_to_delete=Du har ikke n\u00f8dvendige tilganger for \u00e5 slette
+you_do_not_have_the_necessary_authorities_to_delete=Du har ikke n\u00f8dvendige rettigheter for \u00e5 slette
 this=Dette
 delete_failed=Kunne ikke slette
 cannot_delete_this_enrollment_because_it_already_contains_events=Kan ikke slette denne registreringen fordi den allerede inneholder hendelser. Vennligst slett hendelsene f\u00f8r du sletter registreringen
diff --git a/i18n/i18n_app_nl.properties b/i18n/i18n_app_nl.properties
new file mode 100644
index 000000000..d82681df2
--- /dev/null
+++ b/i18n/i18n_app_nl.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker opname
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Create
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Required
+number_required=Number required
+date_required=Date required
+number=Number
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Name
+filter=Filter
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Jump to page
+page=Page
+first=First
+previous=Previous
+next=Next
+last=Last
+go_to_dashboard=Go to dashboard
+go=Go
+find=Find
+edit=Edit
+edit_profile=Edit profile
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Verwijderen
+deleted=deleted
+remove=Remove
+entity=Entity
+clear=Clear
+add=Add
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Send
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Complete
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=Status
+event_completed=Event completed?
+details=Click to see details
+_details=Details
+created_by=Registered by
+date=Datum\n
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=Dashboard
+home=Home
+back=Back
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Selecteer
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicators
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Feedback
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=Reports
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=Geen waarde
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Organisation unit
+org_unit_scope=Organisation unit scope
+SELECTED=Selected
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Gegevenselement
+value=Value
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Close
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=Due date
+event_date=Event date
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Start date
+end_date=End date
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Yes
+no=No
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=New
+add_new=Add new
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=Error
+warning=Warning
+success=Success
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisation unit
+category=Category
+entity_type=Entity type
+save=Save
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Go back
+cancel=Cancel
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Profile
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=Settings
+account=Account
+help=Help
+log_out=Log out
+about_dhis2=About DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Locate organisation unit by name
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Periode
+jan=January
+feb=February
+mar=March
+apr=April
+may=May
+jun=June
+jul=July
+aug=August
+sep=September
+oct=October
+nov=November
+dec=December
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Hide menu
+extend_menu=Extend menu
+show_main_menu=Show main menu
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Main menu
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Description
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-mail
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Message
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=Years
+months=Months
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=nqed qedpj epdjpi!
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=oeuhuwh
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Show
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=All
+ALL=All
+completed=Completed
+active=Active
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Type
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=None
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_prs.properties b/i18n/i18n_app_prs.properties
index 045f7764a..39c46dfdc 100644
--- a/i18n/i18n_app_prs.properties
+++ b/i18n/i18n_app_prs.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u0647\u0646\u0648\u0632 \u062b\u0628\u062a \u0646\u
 not_yet_enrolled_enrollment=\u0634\u0645\u0648\u0644\u06cc\u062a \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f
 no_active_enrollment_exists=\u062f\u0631 \u0628\u0631\u0646\u0627\u0645\u0647 \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 \u0634\u0645\u0648\u0644\u06cc\u062a \u0641\u0639\u0627\u0644 \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f
 no_active_enrollments_exist=\u0634\u0645\u0648\u0644\u06cc\u062a \u0641\u0639\u0627\u0644 \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u0647\u0646\u0648\u0632 \u062b\u0628\u062a \u0646\u0627\u0645 \u0646\u0634\u062f\u0647.\u062b\u0628\u062a \u06cc\u0627\u062f\u062f\u0627\u0634\u062a \u0646\u0627\u0645\u0645\u06a9\u0646 \u0627\u0633\u062a.
 not_yet_enrolled_report=\u0647\u0646\u0648\u0632 \u062b\u0628\u062a \u0646\u0627\u0645 \u0646\u0634\u062f\u0647\u060c \u06af\u0632\u0627\u0631\u0634 \u062f\u0647\u06cc \u0646\u0627\u0645\u0645\u06a9\u0646 \u0627\u0633\u062a.
 no_data_report=\u0628\u0631\u0627\u06cc \u06af\u0632\u0627\u0631\u0634 \u062f\u0647\u06cc \u06a9\u062f\u0627\u0645 \u0631\u06a9\u0648\u0631\u062f\u06cc \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f
@@ -205,6 +206,7 @@ registered_data=\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u062b\u0628\u062a \u
 no_value=\u0628\u062f\u0648\u0646 \u0627\u0631\u0642\u0627\u0645/ \u0627\u0631\u0632\u0634
 no_data_found=\u0647\u06cc\u0686 \u0645\u0639\u0644\u0648\u0645\u0627\u062a\u06cc \u06cc\u0627\u0641\u062a \u0646\u0634\u062f
 no_data=\u0645\u0639\u0644\u0648\u0645\u0627\u062a\u06cc \u0648\u062c\u0648\u062f \u0646\u062f\u0627\u0631\u062f
+mo_matching_data=No data matching your search criteria
 data_exists=\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0645\u0648\u062c\u0648\u062f
 data_registerd=\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u062b\u0628\u062a \u0646\u0634\u062f\u0647
 no_visit_made=\u0647\u06cc\u0686 \u0645\u0644\u0627\u0642\u0627\u062a\u06cc \u0627\u0646\u062c\u0627\u0645 \u0646\u0634\u062f\u0647
@@ -352,6 +354,7 @@ advanced_search=\u062c\u0633\u062a\u062c\u0648\u06cc \u067e\u06cc\u0634\u0631\u0
 profile=\u0645\u0634\u062e\u0635\u0627\u062a
 applications=\u0646\u0631\u0645 \u0627\u0641\u0632\u0627\u0631
 more_applications=\u0646\u0631\u0645 \u0627\u0641\u0632\u0627\u0631\u0647\u0627\u06cc \u0628\u06cc\u0634\u062a\u0631
+manage=Manage
 settings=\u062a\u0646\u0638\u06cc\u0645\u0627\u062a
 account=\u062d\u0633\u0627\u0628
 help=\u06a9\u0645\u06a9
@@ -575,6 +578,7 @@ top_bar_settings=Top bar settings
 show=\u0685\u0631\u06ab\u0646\u062f \u06cc\u06d0 \u06a9\u0693\u0626
 sort_order=\u0645\u0631\u062a\u0628 \u0633\u0627\u0632\u06cc
 activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
 remove_widget=Remove widget?
 remove_widget_info=You are about to remove a widget. Do you want to proceed?
 lock_default_layout=Lock layout for all users
diff --git a/i18n/i18n_app_ps.properties b/i18n/i18n_app_ps.properties
index 07eb295a2..514b2d346 100644
--- a/i18n/i18n_app_ps.properties
+++ b/i18n/i18n_app_ps.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u062a\u0631 \u0627\u0648\u0633\u0647 \u0646\u0647 \
 not_yet_enrolled_enrollment=\u0647\u06d0\u0685 \u0646\u0648\u0645 \u0644\u06cc\u06a9\u0646\u0647 \u0634\u062a\u0648\u0646 \u0646\u0647 \u0644\u0631\u064a
 no_active_enrollment_exists=\u062f \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u0648\u064a \u067e\u0631\u0648\u06ab\u0631\u0627\u0645 \u0644\u067e\u0627\u0631\u0647 \u0647\u06d0\u0685 \u0641\u0639\u0627\u0644\u0647 \u0646\u0648\u0645 \u0644\u06cc\u06a9\u0646\u0647 \u0634\u062a\u0648\u0646 \u0646\u0647 \u0644\u0631\u064a
 no_active_enrollments_exist=\u0627\u0648\u0633\u0645\u0647\u0627\u0644 \u0641\u0639\u0627\u0644\u0647 \u0646\u0648\u0645 \u0644\u06cc\u06a9\u0646\u0647 \u0634\u062a\u0648\u0646 \u0646\u0647 \u0644\u0631\u064a
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u0644\u0627 \u0647\u0645 \u0646\u0647 \u062f\u06cc \u062b\u0628\u062a \u0634\u0648\u06cc. \u062f \u06cc\u0627\u062f\u062f\u0627\u069a\u062a \u0631\u06cc\u06a9\u0627\u0631\u0689\u06cc\u0646\u06ab \u0627\u0645\u06a9\u0627\u0646 \u0646\u0647 \u0644\u0631\u064a
 not_yet_enrolled_report=\u0644\u0627 \u0647\u0645 \u0646\u0647 \u062f\u06cc \u062b\u0628\u062a \u0634\u0648\u06cc. \u0631\u0627\u067e\u0648\u0631 \u0648\u0631\u06a9\u0648\u0644 \u0627\u0645\u06a9\u0627\u0646 \u0646\u0647 \u0644\u0631\u064a
 no_data_report=\u062f \u0631\u0627\u067e\u0648\u0631 \u0648\u0631\u06a9\u0648\u0644\u0648 \u0644\u067e\u0627\u0631\u0647 \u0647\u06d0\u0685 \u0631\u06cc\u06a9\u0627\u0631\u0689\u0648\u0646\u0647 \u0634\u062a\u0648\u0646 \u0646\u0647 \u0644\u0631\u064a
@@ -205,6 +206,7 @@ registered_data=\u0631\u0627\u062c\u0633\u067c\u0631 \u0634\u06d0 \u0689\u0627\u
 no_value=\u0647\u06d0\u0685 \u0627\u0631\u0632\u069a\u062a \u0646\u0634\u062a\u0647
 no_data_found=\u0647\u06d0\u0685 \u0689\u0627\u067c\u0627 \u06cc\u0627 \u0645\u0627\u0644\u0648\u0645\u0627\u062a \u0648\u0646\u0647 \u0645\u0648\u0646\u062f\u0644 \u0634\u0648\u0644
 no_data=\u062f \u0645\u0627\u0644\u0648\u0645\u0627\u062a\u0648 (\u0689\u0627\u067c\u0627) \u0646\u0634\u062a\u0648\u0627\u0644\u06cd
+mo_matching_data=No data matching your search criteria
 data_exists=\u0689\u0627\u067c\u0627 \u06cc\u0627 \u0645\u0627\u0644\u0648\u0645\u0627\u062a \u0634\u062a\u0648\u0646 \u0644\u0631\u064a
 data_registerd=\u0647\u06d0\u0685 \u0689\u0627\u067c\u0627 \u06cc\u0627 \u0645\u0627\u0644\u0648\u0645\u0627\u062a \u0646\u0647 \u062f\u064a \u0631\u0627\u062c\u0633\u067c\u0631 \u0634\u0648\u064a
 no_visit_made=\u0647\u06d0\u0685 \u0689\u0648\u0644 \u0644\u06cc\u062f\u0646\u0647 \u0646\u0647 \u062f\u0647 \u062a\u0631\u0633\u0631\u0647 \u0634\u0648\u06d0
@@ -352,6 +354,7 @@ advanced_search=\u067e\u0631\u0645\u062e\u062a\u0644\u0644\u06d0 \u067e\u0644\u0
 profile=\u0645\u0634\u062e\u0635\u0627\u062a \u06cc\u0627\u067e\u0631\u0648\u0641\u0627\u06cc\u0644
 applications=\u0627\u067e\u0644\u06cc\u06a9\u06d0\u0634\u0646 [ \u062f \u0627\u067e\u0644\u06cc\u06a9\u06d0\u0634\u0646 \u062a\u0646\u0638\u06cc\u0645\u0648\u0648\u0646\u06a9\u06cc ]
 more_applications=\u0646\u0648\u0631 \u0627\u067e\u0644\u06cc\u06a9\u06d0\u0634\u0646\u0648\u0646\u0647
+manage=Manage
 settings=\u062a\u0646\u0638\u06cc\u0645\u0627\u062a
 account=\u062d\u0633\u0627\u0628
 help=\u0645\u0631\u0633\u062a\u0647
@@ -575,6 +578,7 @@ top_bar_settings=Top bar settings
 show=\u0646\u0645\u0627\u06cc\u0634
 sort_order=\u062f \u0637\u0628\u0642\u0647 \u0628\u0646\u062f\u06cd \u06cc\u0627 \u062a\u0633\u0644\u0633\u0644 \u062a\u0631\u062a\u06cc\u0628
 activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
 remove_widget=Remove widget?
 remove_widget_info=You are about to remove a widget. Do you want to proceed?
 lock_default_layout=Lock layout for all users
diff --git a/i18n/i18n_app_pt.properties b/i18n/i18n_app_pt.properties
index 7c3ace61a..84958ead4 100644
--- a/i18n/i18n_app_pt.properties
+++ b/i18n/i18n_app_pt.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=N\u00e3o inscrito. Entrada de dado n\u00e3o poss\u00
 not_yet_enrolled_enrollment=Inscri\u00e7\u00e3o n\u00e3o existente.
 no_active_enrollment_exists=N\u00e3o existe inscri\u00e7\u00e3o activa para o programa seleccionado
 no_active_enrollments_exist=N\u00e3o existem inscri\u00e7\u00f5es activas
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Ainda n\u00e3o inscrito. Nota em grava\u00e7\u00e3o n\u00e3o \u00e9 poss\u00edvel
 not_yet_enrolled_report=N\u00e3o inscrita ainda. N\u00e3o \u00e9 poss\u00edvel reportar.
 no_data_report=N\u00e3o existem grava\u00e7\u00f5es para reportar
@@ -39,7 +40,7 @@ list=Lista
 lists=Lists
 invalid=Inv\u00e1lido
 selected_tei_is_invalid=A inst\u00e2ncia de entidade rastreada selecionada \u00e9 inv\u00e1lida
-required=Exigido
+required=Requerido
 number_required=Requer n\u00famero
 date_required=\u00c9 necess\u00e1ria a data
 number=N\u00famero
@@ -92,7 +93,7 @@ change_location=Gerir a localiza\u00e7\u00e3o
 details_history=Detalhes/hist\u00f3rico
 history=Hist\u00f3rico
 canceled=Cancelado
-delete=Apagar
+delete=Suprimir
 deleted=Eliminar
 remove=Remover
 entity=Entidade
@@ -118,7 +119,7 @@ incomplete=Incompleto
 reopen=Re-abrir
 validate=Validado
 validation_result=Resultado da valida\u00e7\u00e3o
-status=Estado
+status=Status
 event_completed=Evento conclu\u00eddo?
 details=Clique para ver mais detalhes
 _details=Detalhes
@@ -141,7 +142,7 @@ selected_search_attributes=Seleccionar atributos de busca
 selected_program=Seleccionar o programa
 other_programs=Outros programas
 search_for_dashboard=Procurar pelos items no painel de ferramentas
-dashboard=Gr\u00e1ficos
+dashboard=Painel de Instrumentos
 home=In\u00edcio
 back=Voltar
 enrollment=Inscri\u00e7\u00e3o
@@ -205,6 +206,7 @@ registered_data=Dado registado
 no_value=Sem Valor
 no_data_found=Dado n\u00e3o encontrado
 no_data=N\u00e3o ha dados
+mo_matching_data=No data matching your search criteria
 data_exists=Dado existente
 data_registerd=Dado n\u00e3o registado
 no_visit_made=Nenhuma visita feita
@@ -352,6 +354,7 @@ advanced_search=Pesquisa avan\u00e7ada
 profile=Perfil
 applications=Aplica\u00e7\u00f5es
 more_applications=Mais aplica\u00e7\u00f5es
+manage=Manage
 settings=Configura\u00e7\u00e3o
 account=Conta
 help=Ajuda
@@ -525,7 +528,7 @@ openstreetmap=OpenStreetMap
 googlemap=Google Maps
 missing_google_map_api_key=Falta a chave da API do Google Maps
 missing_mapzen_search_api_key=Chave da API de pesquisa Mapzen ausente. Isso pode ser configurado em Configura\u00e7\u00f5es do sistema (configura\u00e7\u00f5es de acesso).
-sms=Servi\u00e7o de mensagens curtas (SMS)
+sms=SMS
 email=e-mail
 email_address=Endere\u00e7o de E-Mail
 wrong_email=Por favor especifique um endere\u00e7o de e-mail v\u00e1lido
@@ -575,6 +578,7 @@ top_bar_settings=Configura\u00e7\u00f5es da barra superior
 show=Mostrar
 sort_order=Ordena\u00e7\u00e3o
 activate_top_bar=Ativar barra superior
+use_as_top_bar=Use as top bar
 remove_widget=Remover widget?
 remove_widget_info=Voc\u00ea est\u00e1 prestes a remover um widget. Voc\u00ea quer prosseguir?
 lock_default_layout=Layout de bloqueio para todos os usu\u00e1rios
diff --git a/i18n/i18n_app_pt_BR.properties b/i18n/i18n_app_pt_BR.properties
new file mode 100644
index 000000000..03681f8c9
--- /dev/null
+++ b/i18n/i18n_app_pt_BR.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=You are online
+offline_notification=You are offline
+login_failed=Login failed, check your username and password and try again
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Programa
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=N\u00e3o selecionado
+create=Criar
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Exigido
+number_required=Number required
+date_required=Date required
+number=N\u00famero
+value_must_be_number=O valor deve ser um numero
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Valor deve ser um n\u00famero inteiro
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Nome
+filter=Filtro
+search=Pesquisar
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Ir para p\u00e1gina
+page=Page
+first=First
+previous=Previous
+next=Pr\u00f3ximo
+last=Last
+go_to_dashboard=Go to dashboard
+go=Ir
+find=Encontrar
+edit=Editar
+edit_profile=Editar Perfil
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Apagar
+deleted=deleted
+remove=Remover
+entity=Entity
+clear=Limpar
+add=Adicionar
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=N\u00famero de telefone
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Enviar
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Completo
+incomplete=Incompleto
+reopen=Reopen
+validate=Validado
+validation_result=Validation result
+status=Estado
+event_completed=Event completed?
+details=Click to see details
+_details=Detalhes
+created_by=Registered by
+date=Data
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=em
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=Gr\u00e1ficos
+home=Origem
+back=Voltar
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A esta para B
+b_is_to_a=B esta para A
+select=Seleccione
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indicadores
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Retroinformac\u00e3o
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=Relat\u00f3rios
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legenda
+event_color_legend=What do the colors mean?
+report=Relat\u00f3rio
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=Sem Valor
+no_data_found=Dado n\u00e3o encontrado
+no_data=N\u00e3o ha dados
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Unidade organizacional
+org_unit_scope=Organisation unit scope
+SELECTED=Seleccionado
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Elemento de dado
+value=Valor
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Fechar
+generate=Gerar
+print=Imprimir
+excel_export=Excel export
+download=Download as
+export=Exportar
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=Data de vencimento
+event_date=Event date
+report_date=Data do relat\u00f3rio
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Agendado/Planeado
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Data de in\u00edcio
+end_date=Data de t\u00e9rmino
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Maior do que
+GE=Maior ou Igual
+LT=Menor do que
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Sim
+no=nenhum
+records=Records
+record=Record
+_record=record
+_records=records
+found=Encontrado
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Corrente
+new=Novo
+add_new=Adicionar novo
+registration=Registration
+registration_date=Data de inscri\u00e7\u00e3o
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Erros
+error=Erro
+warning=Advert\u00eancia
+success=Sucesso
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Unidade organizacional
+category=Categoria
+entity_type=Entity type
+save=Salvar
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Voltar
+cancel=Cancelar
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Perfil
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=Configura\u00e7\u00f5es
+account=Conta
+help=Ajuda
+log_out=Sair
+about_dhis2=Acerca de DHIS2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Localize unidade de organizacional pelo nome
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Per\u00edodo
+jan=Janeiro
+feb=Fevereiro
+mar=Mar\u00e7o
+apr=Abril
+may=Maio
+jun=Junho
+jul=Julho
+aug=Agosto
+sep=Setembro
+oct=Outubro
+nov=Novembro
+dec=Dezembro
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Esconder menu
+extend_menu=Extend menu
+show_main_menu=Mostrar menu principal
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Programar
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Menu principal
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Descri\u00e7\u00e3o
+url=URL
+not_available=Not available
+attribute=Atributo
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=Servi\u00e7o de mensagens curtas (SMS)
+email=Correio electr\u00f3nico
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Mensagem
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Data de nascimento
+years=Anos
+months=Meses
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=Aprovado
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Mostrar
+sort_order=Ordem de classifica\u00e7\u00e3o
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Upload
+please_select_an_image=[Please select an image]
+all=Tudo
+ALL=Tudo
+completed=Completed
+active=Activo
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continuar
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Tipo
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=Nenhum
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_ru.properties b/i18n/i18n_app_ru.properties
index 77558c323..bbd321951 100644
--- a/i18n/i18n_app_ru.properties
+++ b/i18n/i18n_app_ru.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u041d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0
 not_yet_enrolled_enrollment=\u041d\u0435\u0442 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438.
 no_active_enrollment_exists=\u0414\u043b\u044f \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b \u043d\u0435\u0442 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
 no_active_enrollments_exist=\u041d\u0435\u0442 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u041d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d. \u0417\u0430\u043f\u0438\u0441\u044c \u0437\u0430\u043c\u0435\u0442\u043e\u043a \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u0430.
 not_yet_enrolled_report=\u041d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d. \u041e\u0442\u0447\u0435\u0442\u043d\u043e\u0441\u0442\u044c \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u0430.
 no_data_report=\u041d\u0435\u0442 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u0434\u043b\u044f \u043e\u0442\u0447\u0435\u0442\u043d\u043e\u0441\u0442\u0438
@@ -36,7 +37,7 @@ view_all=[\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0432\u0
 list_all_entities=\u0421\u043f\u0438\u0441\u043e\u043a \u0432\u0441\u0435\u0445 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
 list_all=\u0412\u0435\u0441\u044c \u0441\u043f\u0438\u0441\u043e\u043a
 list=\u0421\u043f\u0438\u0441\u043e\u043a
-lists=Lists
+lists=\u0421\u043f\u0438\u0441\u043a\u0438
 invalid=\u041d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439
 selected_tei_is_invalid=\u0412\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0435\u043c\u043e\u0433\u043e \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d
 required=\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439
@@ -53,7 +54,7 @@ negInt=\u041e\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043b\u044c\u043d\u043e\
 zeroPositiveInt=\u041d\u043e\u043b\u044c \u0438\u043b\u0438 \u043f\u043e\u043b\u043e\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0446\u0435\u043b\u043e\u0435 \u0447\u0438\u0441\u043b\u043e
 latitude_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0448\u0438\u0440\u043e\u0442\u044b \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432 \u043f\u0440\u0435\u0434\u0435\u043b\u0430\u0445 [-90 ... 90]
 longitude_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0433\u043e\u0442\u044b \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043c\u0435\u0436\u0434\u0443 [-180 ... 180]
-latitude_longitude_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432 \u0444\u043e\u0440\u043c\u0430\u0442\u0435 [-180 ... 180], [- 90 ... 90] \u0434\u043b\u044f \u0434\u043e\u043b\u0433\u043e\u0442\u044b, \u0448\u0438\u0440\u043e\u0442\u044b
+latitude_longitude_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432 \u0444\u043e\u0440\u043c\u0430\u0442\u0435 [-180 ... 180], [-90 ... 90] \u0434\u043b\u044f \u0434\u043e\u043b\u0433\u043e\u0442\u044b, \u0448\u0438\u0440\u043e\u0442\u044b
 future_date_not_allowed=\u0411\u0443\u0434\u0443\u0449\u0430\u044f \u0434\u0430\u0442\u0430 \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f
 option_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043e \u0438\u0437 \u0432\u044b\u043f\u0430\u0434\u0430\u044e\u0449\u0435\u0433\u043e \u0441\u043f\u0438\u0441\u043a\u0430
 bool_required=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u043c
@@ -145,7 +146,7 @@ dashboard=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u04
 home=\u0413\u043b\u0430\u0432\u043d\u0430\u044f
 back=\u041d\u0430\u0437\u0430\u0434
 enrollment=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f
-enrolling_orgunit=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439 \u0435\u0434\u0438\u043d\u0438\u0446\u044b
+enrolling_orgunit=\u041c\u0435\u0441\u0442\u043e \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
 delete_enrollment=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e
 cancel_enrollment=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e
 complete_enrollment=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e
@@ -205,6 +206,7 @@ registered_data=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u04
 no_value=\u041d\u0435\u0442 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f
 no_data_found=\u0414\u0430\u043d\u043d\u044b\u0435 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b
 no_data=\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445
+mo_matching_data=No data matching your search criteria
 data_exists=\u0414\u0430\u043d\u043d\u044b\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0442
 data_registerd=\u041d\u0435\u0442 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445
 no_visit_made=\u041d\u0435\u0442 \u043f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0439
@@ -326,7 +328,7 @@ save_and_go_back=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438 \
 save_and_continue=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c
 save_relationship=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044c
 delete_relationship=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044c
-can_not_delete_relationship=Can not delete relationship because of lacking write access.
+can_not_delete_relationship=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0432\u044f\u0437\u0438 \u0438\u0437-\u0437\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u044f \u043f\u0440\u0430\u0432 \u043d\u0430 \u0437\u0430\u043f\u0438\u0441\u044c.
 go_back=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f
 cancel=\u041e\u0442\u043c\u0435\u043d\u0430
 are_you_sure_to_delete_relationship=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044c?
@@ -352,6 +354,7 @@ advanced_search=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u04
 profile=\u041f\u0440\u043e\u0444\u0438\u043b\u044c
 applications=\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
 more_applications=\u0411\u043e\u043b\u044c\u0448\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+manage=Manage
 settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
 account=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
 help=\u041f\u043e\u043c\u043e\u0449\u044c
@@ -575,6 +578,7 @@ top_bar_settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0432\u
 show=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c
 sort_order=\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0438
 activate_top_bar=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0440\u0445\u043d\u044e\u044e \u043f\u0430\u043d\u0435\u043b\u044c
+use_as_top_bar=Use as top bar
 remove_widget=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0438\u0434\u0436\u0435\u0442?
 remove_widget_info=\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0438\u0434\u0436\u0435\u0442. \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c?
 lock_default_layout=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0430 \u043c\u0430\u043a\u0435\u0442\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
@@ -666,5 +670,5 @@ unflag=\u0421\u043d\u044f\u0442\u044c \u0444\u043b\u0430\u0436\u043e\u043a
 possible_duplicate_info_start=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u044b\u0439 \u0434\u0443\u0431\u043b\u0438\u043a\u0430\u0442: \u0434\u0430\u043d\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442
 possible_duplicate_info_end= \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043b\u0438\u0431\u043e \u0436\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u044b\u0435 \u0434\u0443\u0431\u043b\u0438\u043a\u0430\u0442\u044b \u0438, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e, \u0431\u044b\u043b \u043e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438.
 owned_by=\u041f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u0438\u0442:
-change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
-custom_working_list=Custom working list
+change_date_with_dependency_information=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0434\u0430\u0442\u044b \u043c\u043e\u0436\u0435\u0442 \u043f\u043e\u0442\u0440\u0435\u0431\u043e\u0432\u0430\u0442\u044c \u043e\u0442 \u0432\u0430\u0441 \u0434\u0430\u043b\u044c\u043d\u0435\u0439\u0448\u0438\u0445 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439. \u0421\u043e\u0431\u044b\u0442\u0438\u044f \u0432 \u044d\u0442\u043e\u0439 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435 \u0431\u044b\u043b\u0438 \u0437\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u044b \u043d\u0430 \u044d\u0442\u0443 \u0434\u0430\u0442\u0443, \u043d\u043e \u044d\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u044f \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0435\u043d\u044b \u043d\u0430 \u043d\u043e\u0432\u0443\u044e \u0434\u0430\u0442\u0443 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438. \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0434\u0430\u0442\u044b?
+custom_working_list=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0440\u0430\u0431\u043e\u0447\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a
diff --git a/i18n/i18n_app_sv.properties b/i18n/i18n_app_sv.properties
new file mode 100644
index 000000000..434da4dad
--- /dev/null
+++ b/i18n/i18n_app_sv.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=Du \u00e4r online
+offline_notification=You are offline
+login_failed=Inloggning misslyckades, kontrollera ditt anv\u00e4ndarnamn och l\u00f6senord och f\u00f6rs\u00f6k igen
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Skapa
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=N\u00f6dv\u00e4ndig
+number_required=Number required
+date_required=Date required
+number=Antal
+value_must_be_number=V\u00e4rdet m\u00e5ste vara ett nummer
+value_must_be_posInt=V\u00e4rdet m\u00e5ste vara ett positivt heltal
+value_must_be_negInt=V\u00e4rdet m\u00e5ste vara ett negativt heltal
+value_must_be_zeroPositiveInt=V\u00e4rdet m\u00e5ste vara noll eller ett positivt heltal
+value_must_be_int=V\u00e4rdet m\u00e5ste vara ett heltal
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Namn
+filter=Filtrera
+search=S\u00f6k
+_search=search
+search_by_name=S\u00f6k p\u00e5 namn
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Totalt
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Hoppa till sida
+page=Sida
+first=F\u00f6rst
+previous=Tidigare
+next=N\u00e4sta
+last=Sista
+go_to_dashboard=Go to dashboard
+go=G\u00e5
+find=Hitta
+edit=Redigera
+edit_profile=Redigera profil
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Radera
+deleted=deleted
+remove=Avl\u00e4gsna
+entity=Entity
+clear=Klar
+add=L\u00e4gg till
+add_note=L\u00e4gg till anteckning
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Telefonnummer
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Skicka
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=F\u00e4rdigt
+incomplete=Incomplete
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=Status
+event_completed=Event completed?
+details=Click to see details
+_details=detaljer
+created_by=Registered by
+date=Datum
+_date=date
+event_name=Event name
+new_event=Ny h\u00e4ndelse
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=at
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=instrumentbr\u00e4da
+home=Hem
+back=Tillbaka
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=inskrivning datum
+incident_date=infall datum
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationer
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Markera
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=indikatorer
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u00c5terkoppling
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=rapporter
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=No value
+no_data_found=No data found
+no_data=No data
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Aktiva program
+set_as_current=Set as current
+org_unit=Organisationsenhet
+org_unit_scope=Organisation unit scope
+SELECTED=Vald
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Uppgift
+value=V\u00e4rde
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=St\u00e4nga
+generate=Generate
+print=Print
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=F\u00f6rfallodatum
+event_date=H\u00e4ndelse datum
+report_date=Rapportdatum
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Registrera
+new_enrollment=New enrollment
+start_date=Start datum
+end_date=Slutdatum
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=St\u00f6rre \u00e4n
+GE=St\u00f6rre \u00e4n eller lika med
+LT=Mindre \u00e4n
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Ja
+no=Nej
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=AKTUELL
+new=Ny
+add_new=L\u00e4gg till ny
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=Fel
+warning=Varning
+success=Framg\u00e5ng
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Organisationsenhet
+category=Category
+entity_type=Entity type
+save=Spara
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=G\u00e5 tillbaka
+cancel=Avbryt
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Profil
+applications=appar
+more_applications=Fler appar
+manage=Manage
+settings=Inst\u00e4llningar
+account=Konto
+help=Hj\u00e4lp
+log_out=Logga ut
+about_dhis2=Ca dhis 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitud
+longitude=Longitud
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Leta upp organisationsenhet med namn
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Period
+jan=januari
+feb=februari
+mar=Mars
+apr=april
+may=Maj
+jun=juni
+jul=juli
+aug=augusti
+sep=september
+oct=oktober
+nov=november
+dec=december
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Inaktivera
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=d\u00f6lj meny
+extend_menu=str\u00e4cker meny
+show_main_menu=Visa huvudmenyn
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Section
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Remiss
+show_previous=Show previous
+show_next=Show next
+schedule_new=Planera nytt
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Huvudmeny
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Skapad
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Avklarad
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=\u00d6ppen
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Beskrivning
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Verkst\u00e4ll
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=E-post
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Meddelande
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=\u00c5r
+months=M\u00e5nader
+days=Dagar
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=ok
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Visa
+sort_order=Sort order
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Ladda upp
+please_select_an_image=[Please select an image]
+all=Alla
+ALL=Alla
+completed=Avklarad
+active=Aktiva
+cancelled=Avbruten
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=\u00d6ppen
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Typ
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=Ingen
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_tet.properties b/i18n/i18n_app_tet.properties
new file mode 100644
index 000000000..8f135a895
--- /dev/null
+++ b/i18n/i18n_app_tet.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=Itabo'ot online
+offline_notification=You are offline
+login_failed=La konsege Login, verifika itabo'ot nia utilizador nia naran no se\u00f1a, depois koko fali
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=Program
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=Not selected
+create=Kria
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=Neses\u00e1riu
+number_required=Number required
+date_required=Date required
+number=N\u00fameru
+value_must_be_number=Value must be a number
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=Value must be an integer
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=Naran
+filter=Filtru
+search=Search
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=Haksoit ba p\u00e1jina
+page=Page
+first=Dahuluk
+previous=Anterior
+next=Pr\u00f3ximu
+last=Ikus
+go_to_dashboard=Go to dashboard
+go=B\u00e1
+find=Buka
+edit=Edita
+edit_profile=Edita perfil
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=Soe
+deleted=deleted
+remove=Hasai
+entity=Entity
+clear=Ham\u00f3s
+add=Aumenta
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=Phone number
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=Haruka
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=Kompletu
+incomplete=Inkompletu
+reopen=Reopen
+validate=Validate
+validation_result=Validation result
+status=Estadu
+event_completed=Event completed?
+details=Click to see details
+_details=Detalles
+created_by=Registered by
+date=Data
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=iha
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=Painel Kontrolu
+home=P\u00e1jina inisial
+back=Ba kotuk
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=Enrollment date
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A is to B
+b_is_to_a=B is to A
+select=Selesiona
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=Indikadores
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=Feedback
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=Relat\u00f3rius
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=Legend
+event_color_legend=What do the colors mean?
+report=Report
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=Laiha valor
+no_data_found=No data found
+no_data=Laiha dadus
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=Unidade organizasional
+org_unit_scope=Organisation unit scope
+SELECTED=Selesionadu
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=Elementu dadus
+value=Valor
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=Taka
+generate=Generate
+print=Imprime
+excel_export=Excel export
+download=Download as
+export=Export
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=Due date
+event_date=Event date
+report_date=Report date
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=Scheduling
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=Data hah\u00fa
+end_date=Data remata
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=Greater than
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=Sim
+no=Lae
+records=Records
+record=Record
+_record=record
+_records=records
+found=Found
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=Current
+new=Foun
+add_new=Aumenta foun
+registration=Registration
+registration_date=Registration date
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=Erru
+warning=Avizu
+success=Susesu
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=Unidade organizasional
+category=Kategoria
+entity_type=Entity type
+save=Rai
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Fila ba kotuk
+cancel=Kansela
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=Perfil
+applications=Jestor apps
+more_applications=Apps seluk tan
+manage=Manage
+settings=Konfigurasaun
+account=Konta
+help=Ajuda
+log_out=Log out
+about_dhis2=Konab\u00e1 DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=Latitude
+longitude=Longitude
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=Lokaliza unidade organizasional tuir naran
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=Per\u00edodu
+jan=Janeiru
+feb=Fevereiru
+mar=Marsu
+apr=Abril
+may=Mai
+jun=Ju\u00f1u
+jul=Jullu
+aug=Agostu
+sep=Setembru
+oct=Outubru
+nov=Novembru
+dec=Dezembru
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=Subar menu
+extend_menu=Habelar menu
+show_main_menu=Hatudu menu prinsipal
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=Seksaun
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Imprime formul\u00e1riu
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=Schedule
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=Menu prinsipal
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modifika husi
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=Completed
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=Deskrisaun
+url=URL
+not_available=Not available
+attribute=Attribute
+data_entry=Data entry
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=SMS
+email=Email
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=Mensajen
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=Date of birth
+years=Tinan
+months=Fulan
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=Hatudu
+sort_order=Ordem klasifikasaun
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=Hasae
+please_select_an_image=[Please select an image]
+all=Hotu
+ALL=Hotu
+completed=Completed
+active=Ativu
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=Continue
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=Tipu
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=Nein ida
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_tg.properties b/i18n/i18n_app_tg.properties
new file mode 100644
index 000000000..c2ff64619
--- /dev/null
+++ b/i18n/i18n_app_tg.properties
@@ -0,0 +1,674 @@
+tracker_capture=Tracker capture
+online_notification=\u0428\u0443\u043c\u043e \u043e\u043d\u043b\u0430\u0439\u043d \u04b3\u0430\u0441\u0442\u0435\u0434
+offline_notification=You are offline
+login_failed=\u0412\u0443\u0440\u0443\u0434 \u0438\u04b7\u0440\u043e \u043d\u0430\u0448\u0443\u0434, \u043d\u043e\u043c\u0438 \u043a\u043e\u0440\u0431\u0430\u0440 \u0432\u0430 \u043f\u0430\u0440\u043e\u043b\u0438 \u0445\u0443\u0434\u0440\u043e \u0442\u0430\u0444\u0442\u0438\u0448 \u043a\u0430\u0440\u0434\u0430, \u0430\u0437 \u043d\u0430\u0432 \u043a\u04ef\u0448\u0438\u0448 \u043a\u0443\u043d\u0435\u0434
+tracked_entity_management=Tracked entity management
+registering_unit=Registering unit
+program=\u0411\u0430\u0440\u043d\u043e\u043c\u0430
+tracked_entity=Tracked entity
+tracked_entity_instance=Tracked entity instance
+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_relationship=Please select a relationship
+no_relationship=No relationships exist
+relationship_not_possible=No tracked entity instances, relationship not possible
+no_program_exists_enrollment=No programs exist for the selected org unit. Enrollment not possible.
+no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
+not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
+not_yet_enrolled_enrollment=No enrollment exists.
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+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
+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
+not_selected=\u0418\u043d\u0442\u0438\u0445\u043e\u0431 \u043d\u0430\u0448\u0443\u0434\u0430\u0430\u0441\u0442
+create=\u0421\u043e\u0445\u0442\u0430\u043d
+view_all=[View all]
+list_all_entities=List all entities
+list_all=List all
+list=List
+lists=Lists
+invalid=Invalid
+selected_tei_is_invalid=Selected tracked entity instance is invalid
+required=\u04b2\u0430\u0442\u043c\u04e3
+number_required=Number required
+date_required=Date required
+number=\u0420\u0430\u049b\u0430\u043c
+value_must_be_number=\u049a\u0438\u043c\u0430\u0442 \u0431\u043e\u044f\u0434 \u0430\u0434\u0430 \u0431\u043e\u0448\u0430\u0434
+value_must_be_posInt=Value must be a positive integer
+value_must_be_negInt=Value must be a negative integer
+value_must_be_zeroPositiveInt=Value must be zero or a positive integer
+value_must_be_int=\u049a\u0438\u043c\u0430\u0442 \u0431\u043e\u044f\u0434 \u0430\u0434\u0430\u0434\u0438 \u0431\u0443\u0442\u0443\u043d \u0431\u043e\u0448\u0430\u0434
+posInt=Positive integer
+negInt=Negative integer
+zeroPositiveInt=Zero or positive integer
+latitude_required=Latitude value must be between [-90 ... 90]
+longitude_required=Longitude value must be between [-180 ... 180]
+latitude_longitude_required=Value must be in the format of [-180 ... 180],[-90 ... 90] for longitude, latitude
+future_date_not_allowed=Future date is not allowed
+option_required=Value must be selected from the drop-down
+bool_required=Value must be a boolean
+name=\u041d\u043e\u043c
+filter=\u0424\u0438\u043b\u0442\u0440
+search=\u04b6\u0443\u0441\u0442\u0443\u04b7\u04ef
+_search=search
+search_by_name=Search by name
+search_by_data_element=Search by data element
+search_by_attribute=Search by attribute
+search_for=Search for
+type_your_search_criteria_here=Type your search criteria here
+search_input_required=Please specify a search criteria
+in_progress=In progress
+registered_entities=Registered entities
+empty=Empty
+form_is_empty_fill_at_least_one=Form is empty, please fill at least one
+no_event_exists=No event exists
+total=Total
+total_number_of_pages=Number of pages
+rows_per_page=Number of rows per page
+jump_to_page=\u0413\u0443\u0437\u0430\u0440\u0438\u0448 \u0431\u0430 \u0441\u0430\u04b3\u0438\u0444\u0430
+page=Page
+first=First
+previous=\u049a\u0430\u0431\u043b\u04e3
+next=\u041d\u0430\u0432\u0431\u0430\u0442\u04e3
+last=Last
+go_to_dashboard=Go to dashboard
+go=\u0411\u0430 \u043f\u0435\u0448
+find=\u0401\u0444\u0442\u0430\u043d
+edit=\u0422\u0430\u04b3\u0440\u0438\u0440
+edit_profile=\u0422\u0430\u04b3\u0440\u0438\u0440\u0438 \u043f\u0440\u043e\u0444\u0438\u043b
+tracker_associate=Tracker associate
+association=Manage associations
+change_location=Manage location
+details_history=Details/history
+history=History
+canceled=Canceled
+delete=\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d
+deleted=deleted
+remove=\u0422\u043e\u0437\u0430 \u043a\u0430\u0440\u0434\u0430\u043d
+entity=Entity
+clear=\u041f\u043e\u043a \u043a\u0430\u0440\u0434\u0430\u043d
+add=\u0418\u043b\u043e\u0432\u0430 \u043a\u0430\u0440\u0434\u0430\u043d
+add_note=Add note
+search_note=Search notes
+your_note_here=Your note here
+phone_number=\u0420\u0430\u049b\u0430\u043c\u0438 \u0442\u0435\u043b\u0435\u0444\u043e\u043d\u0438 \u043c\u043e\u0431\u0438\u043b\u04e3
+your_sms_message_here=Your SMS message here
+your_email_message_here=Your E-mail message here
+sms_send_status=SMS sending status
+send=\u0424\u0438\u0440\u0438\u0441\u0442\u043e\u0434\u0430\u043d
+add_new_event=Add new event
+add_new_event_for_stage=Add new event for stage
+schedule_new_event=Schedule new event
+schedule_new_event_for_stage=Schedule new event for stage
+refer_new_event_for_stage=Refer new event for stage
+skip=Skip
+unskip=Schedule back
+complete=\u0410\u043d\u04b7\u043e\u043c \u0451\u0444\u0442
+incomplete=\u0411\u0430 \u0430\u043d\u04b7\u043e\u043c \u043d\u0430\u0440\u0430\u0441\u0438\u0434\u0430\u0430\u0441\u0442
+reopen=Reopen
+validate=\u0421\u0430\u043d\u04b7\u0438\u0448\u0438 \u044d\u044a\u0442\u0438\u0431\u043e\u0440
+validation_result=Validation result
+status=\u04b2\u043e\u043b\u0430\u0442
+event_completed=Event completed?
+details=Click to see details
+_details=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u0438 \u043c\u0443\u0444\u0430\u0441\u0441\u0430\u043b
+created_by=Registered by
+date=\u0421\u0430\u043d\u0430
+_date=date
+event_name=Event name
+new_event=New event
+create_new_event=Create new event
+create_new_event_repeatable=Create new event from a repeatable stage
+toggle_table_view_on=Show events as tables where possible
+toggle_table_view_off=Show data entry forms for each event
+event_recorded_on=Event recorded on
+at=\u0434\u0430\u0440
+show_more=Click for more
+close_search=Close search
+search_attributes=Search attributes
+available_search_attributes=Available search attributes
+selected_search_attributes=Selected search attributes
+selected_program=Selected program
+other_programs=Other programs
+search_for_dashboard=Search for dashboard items
+dashboard=\u041b\u0430\u0432\u04b3\u0430\u0438 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442
+home=\u0421\u0430\u04b3\u0438\u0444\u0430\u0438 \u0430\u0441\u043e\u0441\u04e3
+back=\u0411\u0430 \u049b\u0430\u0444\u043e
+enrollment=Enrollment
+enrolling_orgunit=Enrolling organisation unit
+delete_enrollment=Delete enrollment
+cancel_enrollment=Cancel enrollment
+complete_enrollment=Complete enrollment
+reopen_enrollment=Reopen enrollment
+activate_enrollment=Activate enrollment
+deactivate_enrollment=Deactivate enrollment
+enrollment_date=\u0421\u0430\u043d\u0430\u0438 \u043d\u043e\u043c\u043d\u0430\u0432\u0438\u0441
+incident_date=Incident date
+notes=Notes
+relationship=Relationship
+relationshipTo=Outgoing relationships
+relationshipFrom=Incoming relationships
+relationships=Relationships
+add_relationship=Add relationship
+a_is_to_b=A \u043d\u0438\u0441\u0431\u0430\u0442\u0438 B
+b_is_to_a=B \u043d\u0438\u0441\u0431\u0430\u0442\u0438 A
+select=\u0418\u043d\u0442\u0438\u0445\u043e\u0431 \u043a\u0443\u043d\u0435\u0434
+please_add_some_text=Please add some text
+please_select_source=Please select source
+register_new=Register new
+search_from_existing=Search from existing
+dataentry=Timeline Data Entry
+dataentryTabular=Tabular Data Entry
+indicators=\u0418\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u04b3\u043e
+empty_inidcator_list=No indicators exist
+no_indicators_exist=No indicators exist
+feedback=\u0418\u0437\u04b3\u043e\u0440\u0438 \u043d\u0430\u0437\u0430\u0440
+no_feedback_exist=No feedback exist
+custom_form=Custom form
+default_form=Default form
+menu=Menu
+tracker_reports=Tracker Reports
+reports=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u04b3\u043e
+registration_and_data_entry=Registration and Data Entry
+program_summary_report=Program Summary Report
+program_summary=Program Summary
+program_summary_description=Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances and their records organized based on program stages.
+program_statistics_report=Program Statistics Report
+program_statistics=Program Statistics
+program_statistics_description=Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.
+upcoming_events=Upcoming Events
+upcoming_events_description=Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.
+overdue_events=Overdue Events
+overdue_events_description=Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.
+enrollment_stats=Enrollment statistics
+event_stats=Event statistics
+upcoming_event=Upcoming event
+legend=\u041c\u0430\u04b7\u043c\u04ef\u0438 \u0430\u043b\u043e\u043c\u0430\u0442\u04b3\u043e\u0438 \u0448\u0430\u0440\u0442\u04e3
+event_color_legend=What do the colors mean?
+report=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442
+_report=report
+visit_schedule=Visit Schedule
+mark_for_followup=Mark for follow-up
+unmark_for_followup=Remove from follow-up
+only_marked_for_followup=Only marked for follow-up
+registered_data=Registered data
+no_value=\u041b\u0443\u0442\u0444\u0430\u043d \u0438\u043d\u0442\u0438\u0445\u043e\u0431 \u043a\u0443\u043d\u0435\u0434
+no_data_found=\u042f\u0433\u043e\u043d \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442 \u0451\u0444\u0442 \u043d\u0430\u0448\u0443\u0434
+no_data=\u042f\u0433\u043e\u043d \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442 \u043d\u0435\u0441\u0442
+mo_matching_data=No data matching your search criteria
+data_exists=Data exists
+data_registerd=No data registered
+no_visit_made=No visit made
+visit_not_made=Visit not made
+_visit=visit
+visit=Visit
+visits=Visits
+current_selections=Current selections
+activePrograms=Active programs
+set_as_current=Set as current
+org_unit=\u0412\u043e\u04b3\u0438\u0434\u0438 \u0441\u043e\u0445\u0442\u043e\u0440\u04e3
+org_unit_scope=Organisation unit scope
+SELECTED=\u0418\u043d\u0442\u0438\u0445\u043e\u0431\u0448\u0443\u0434\u0430
+CHILDREN=Immediate children
+DESCENDANTS=All children
+ACCESSIBLE=All accessible
+data_element=\u0423\u043d\u0441\u0443\u0440\u0438 \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442
+value=\u049a\u0438\u043c\u0430\u0442
+provided_elsewhere=Provided elsewhere
+expand=Expand
+collapse=Collapse
+show_hide_columns=Show/hide columns
+select_columns_to_show=Select columns to show
+show_hide_widgets=Show/hide widgets
+select_widgets_to_show=Select widgets to show
+audit_history=Audit History
+hide_widget=Hide widget
+show_widget=Show widget
+hide_column=Hide column
+show_column=Show column
+close=\u041f\u04ef\u0448\u0438\u0434\u0430\u043d
+generate=\u0422\u0430\u04b3\u0438\u044f
+print=\u0427\u043e\u043f \u043a\u0430\u0440\u0434\u0430\u043d
+excel_export=Excel export
+download=Download as
+export=\u0412\u043e\u0440\u0438\u0434\u043e\u0442
+csv=CSV
+json=JSON
+xml=XML
+list_programs=List programs
+program_stage=Program stage
+due_date=\u0421\u0430\u043d\u0430\u0438 \u043f\u0435\u0448\u0431\u0438\u043d\u0438\u0448\u0443\u0434\u0430
+event_date=Event date
+report_date=\u0421\u0430\u043d\u0430\u0438 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442
+enable_rescheduling=Enable rescheduling
+disable_rescheduling=Disable rescheduling
+show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
+show_hide_messaging=Show/hide messaging form
+messaging=Messaging
+scheduling=\u0411\u0430\u043d\u0430\u049b\u0448\u0430\u0433\u0438\u0440\u04e3
+reschedule_duedate=Reschedule due date
+reschedule=Reschedule
+rescheduling=Rescheduling
+scheduling_messaging=Scheduling and messaging
+not_yet_enrolled_scheduling=Not yet enrolled, scheduling not possible
+schedule_details=Schedule details
+no_event_to_schedule=No events to schedule
+enroll=Enroll
+new_enrollment=New enrollment
+start_date=\u0421\u0430\u043d\u0430\u0438 \u043e\u0493\u043e\u0437
+end_date=\u0421\u0430\u043d\u0430\u0438 \u0430\u043d\u04b7\u043e\u043c
+from=From
+to=To
+exact_date=Exact date
+exact_value=Exact value
+EQ=Equal
+GT=>
+GE=>
+LT=<
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
+boolean=Boolean
+yes=\u04b2\u0430
+no=\u041d\u0435
+records=Records
+record=Record
+_record=record
+_records=records
+found=\u0401\u0444\u0442 \u0448\u0443\u0434
+move_to_selected=Move to selected
+move_all_to_selected=Move all to selected
+current=\u04b6\u043e\u0440\u04e3
+new=\u041d\u0430\u0432
+add_new=\u0418\u043b\u043e\u0432\u0430\u0438 \u043d\u0430\u0432
+registration=Registration
+registration_date=\u0421\u0430\u043d\u0430\u0438 \u0431\u0430\u049b\u0430\u0439\u0434\u0433\u0438\u0440\u04e3
+register=Register
+_register=register
+enrollment_error=Error in enrollment
+registration_error=Error in registration
+update_error=Error in update
+register_error=Error in registration
+event_creation_error=Error in event creation
+relationship_error=Error in relationship assignment
+tracker_associate_error=Error in tracker associate assignment
+searching_error=Searching Error
+form_invalid=Form is invalid. Please check for required fields.
+no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+errors=Errors
+error=\u0425\u0430\u0442\u043e\u0433\u04e3
+warning=\u041e\u0433\u043e\u04b3\u04e3
+success=\u041c\u0443\u0432\u0430\u0444\u0444\u0430\u049b\u0438\u044f\u0442
+unable_to_fetch_data_from_server=Unable to fetch data from server.
+access_denied=Access is Denied
+registration_complete=Registration is completed
+auto_generate_failed=Cannot register since auto generation of the attribute(s) failed.
+validation_error=Validation Error
+event_orgunit_name=\u0412\u043e\u04b3\u0438\u0434\u0438 \u0441\u043e\u0445\u0442\u043e\u0440\u04e3
+category=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f
+entity_type=Entity type
+save=\u0417\u0430\u0445\u0438\u0440\u0430 \u043a\u0430\u0440\u0434\u0430\u043d
+save_and_add_new=Save and add new
+save_and_go_back=Save and go back
+save_and_continue=Save and continue
+save_relationship=Save relationship
+delete_relationship=Delete relationship
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=\u0411\u0430 \u04b7\u0430\u0444\u043e \u0440\u0430\u0432\u0435\u0434
+cancel=\u0411\u0435\u043a\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d
+are_you_sure_to_delete_relationship=Are you sure you want to delete the relationship?
+are_you_sure_to_delete_enrollment=Are you sure you want to delete the selected enrollment? This will delete all events associated with this enrollment.
+would_you_like_to_complete_enrollment=Would you like to complete the current enrollment?
+are_you_sure_to_complete_enrollment=Are you sure you want to complete the selected enrollment?
+are_you_sure_to_deactivate_enrollment=Are you sure you want to deactivate the selected enrollment?
+are_you_sure_to_activate_enrollment=Are you sure you want to activate the selected enrollment?
+are_you_sure_to_reopen_enrollment=Are you sure you want to reopen the selected enrollment?
+are_you_sure_to_delete_event=Are you sure you want to delete the selected event?
+are_you_sure_to_delete_event_with_audit=Are you sure to remove the selected event? This will also remove all related audit values.
+are_you_sure_to_complete_event=Are you sure you want to complete the selected event?
+please_fix_errors_before_completing=Please review and fix the following error(s) before completing the event:
+are_you_sure_to_incomplete_event=Are you sure you want to edit the selected event?
+are_you_sure_to_skip_event=Are you sure you want to skip the selected event?
+are_you_sure_to_unskip_event=Are you sure you want to schedule back the selected event?
+do_you_want_to_proceed=Do you want to proceed with invalid criteria?
+are_you_sure_to_proceed=Are you sure you want to proceed?
+will_delete_all_data_associated=This will delete ALL DATA associated with this
+more=More
+under_construction=Under construction
+advanced_search=Advanced search
+profile=\u041f\u0440\u043e\u0444\u0438\u043b
+applications=Apps
+more_applications=More apps
+manage=Manage
+settings=\u0422\u0430\u043d\u0437\u0438\u043c\u043e\u0442
+account=\u04b2\u0438\u0441\u043e\u0431
+help=\u041a\u04ef\u043c\u0430\u043a
+log_out=\u0425\u043e\u0440\u0438\u04b7 \u0448\u0443\u0434\u0430\u043d
+about_dhis2=\u0414\u0430\u0440 \u0431\u043e\u0440\u0430\u0438 DHIS 2
+missing_translation_file=Missing translation file
+missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
+loading_tree=Loading organisation unit tree
+loading_metadata=Loading meta-data
+loading_components=Loading components
+latitude=\u0422\u04ef\u043b
+longitude=\u0410\u0440\u0437
+lat_lng=[Latitude Longitude]
+get=Get
+get_from_map=Get from map
+capture=Capture
+nothing_captured=Nothing is captured
+point_and_click_for_coordinate=Right click on map to set location
+value_must_be_between=Value must be between
+locate_organisation_unit_by_name=\u0412\u043e\u04b3\u0438\u0434\u0438 \u0441\u043e\u0445\u0442\u043e\u0440\u0438\u0440\u043e \u0430\u0437 \u0440\u04ef\u0438 \u043d\u043e\u043c \u043f\u0430\u0439\u0434\u043e \u043a\u0443\u043d\u0435\u0434
+dashboard_layout_saved=Dashboard layout saved
+dashboard_layout_saved_as_default=Dashboard layout saved as default
+dashboard_layout_not_saved=Dashboard layout not saved
+dashboard_layout_not_saved_as_default=Failed to save dashboard layout as default
+dashboard_layout_not_fetched=Failed to fetch the dashboard layout
+failed_to_fetch_enrollment=Failed to fetch the enrollment from the server
+failed_to_save_enrollment=Failed to save the enrollment to the server
+failed_to_update_enrollment=Failed to update the enrollment in the server
+ou_search_scope=Organisation unit scope
+zoom_in=Zoom in
+zoom_out=Zoom out
+center_map=Center map
+set_coordinate=Set coordinate
+coordinate=Coordinate
+show_active_only=Show only active ones
+all_enrollment=Any enrollment status
+active_enrollment=Only those with active enrollment
+cancelled_enrollment=Only those with cancelled enrollment
+completed_enrollment=Only those with completed enrollment
+filter_events=Filter events
+list_events=List all events
+prev_period=Previous periods
+nxt_period=Next periods
+period=\u0414\u0430\u0432\u0440\u0430
+jan=\u042f\u043d\u0432\u0430\u0440
+feb=\u0424\u0435\u0432\u0440\u0430\u043b
+mar=\u041c\u0430\u0440\u0442
+apr=\u0410\u043f\u0440\u0435\u043b
+may=\u041c\u0430\u0439
+jun=\u0418\u044e\u043d
+jul=\u0418\u044e\u043b
+aug=\u0410\u0432\u0433\u0443\u0441\u0442
+sep=\u0421\u0435\u043d\u0442\u044f\u0431\u0440
+oct=\u041e\u043a\u0442\u044f\u0431\u0440
+nov=\u041d\u043e\u044f\u0431\u0440
+dec=\u0414\u0435\u043a\u0430\u0431\u0440
+week=Week
+save_layout_as_default=Saved dashboard layout as default
+reset_layout=Reset dashboard layout
+is_expected_to_be=is expected to be
+but_found=but found
+equals_to=equals to
+less_than=less than
+greater_than=greater than
+inactive=Inactive
+activate=Activate
+deactivate=Deactivate
+tei_inactive_only_read=is inactive. Only read operations are allowed.
+hide_menu=\u041f\u0438\u043d\u04b3\u043e\u043d \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u043c\u0435\u043d\u044e
+extend_menu=\u0422\u0430\u0432\u0441\u0435\u0430\u0438 \u043c\u0435\u043d\u044e
+show_main_menu=\u041d\u0438\u0448\u043e\u043d \u0434\u043e\u0434\u0430\u043d\u0438 \u043c\u0435\u043d\u044e\u0438 \u0430\u0441\u043e\u0441\u04e3
+stick_right_widgets=Stick right side widgets
+unstick_right_widgets=Unstick right side widgets
+existing_associate=Existing associate
+value_not_unique=Value not unique
+custom_form_has_invalid_attribute=Custom form has an invalid attribute.
+custom_form_has_invalid_dataelement=Custom form has an invalid data element.
+events_today_persons=Only those with an event today
+section_has_no_dataelements=Section has no data elements
+section=\u049a\u0438\u0441\u043c
+display_mode=Display mode
+tracker_capture_display_mode=Tracker capture display mode
+events_today_all=All events today
+events_today_completeoractive=Complete or active
+events_today_skipped=Skipped
+events_today_scheduled=Scheduled
+multiple_records_warning=Multiple records found. Please be more specific.
+result=Result
+no_record_found=No record found
+no_record_found_create=No record was found. Do you want to create a new record?
+print_form=Print form
+value_must_be_email=Please enter a valid e-mail address
+click_to_edit_view_complete_notes=Click to edit/view complete notes
+complete_and_exit =Complete and exit
+are_you_sure_to_cancel_editing=Are you sure you want to cancel editing of this profile?
+are_you_sure_to_cancel_registration=Are you sure you want to cancel this registration?
+schedule=\u04b6\u0430\u0434\u0432\u0430\u043b
+scheduled_date=Scheduled date
+show_new_event_menu=Show new event menu
+no_stages_available=All the expected events are already present, cannot create more events.
+make_referral=Make referral
+referral=Referral
+show_previous=Show previous
+show_next=Show next
+schedule_new=Schedule new
+save_note=Save note
+add_justification=Add justification here
+please_complete_all_results_before_add = Please complete all results before adding a new one
+please_complete_all_results_before_schedule = Please complete all results before scheduling a new one
+please_complete_all_results_before_referral = Please complete all results first
+no_designation=No designation
+main_menu=\u041c\u0435\u043d\u044e\u0438 \u0430\u0441\u043e\u0441\u04e3
+complete_event_and_enrollment=Complete event and enrollment
+are_you_sure_to_complete_event_and_enrollment=Are you sure you want to complete this event and enrollment?
+enrollment_is_not_active=Enrollment is not active
+please_complete_all_events=Please complete all events first
+scheduling_disabled_for_programstage=Scheduling is disabled for this program stage
+event_already_scheduled=An event is already scheduled
+programstage_multiple_events_disabled=This program stage does not allow multiple events
+event_cant_be_created=New event can not be created
+created=Created
+auditType=Audit type
+modifiedBy=Modified by
+audit_history_unavailable=Audit history unavailable
+delete_error_audit=The event could not be deleted because it contains an audit log.
+are_you_sure_to_remove=Are you sure you want to remove?
+completed_label=\u0410\u043d\u04b7\u043e\u043c\u0451\u0444\u0442\u0430
+stage_completed=Event is completed
+stage_completed_label=All completed
+executed=Opened for data entry
+executed_label=Open
+stage_executed=Event is open
+stage_executed_label=Open found
+ontime=Scheduled
+ontime_label=Scheduled
+stage_ontime=Event is scheduled
+stage_ontime_label=Scheduled found
+overdue=Overdue
+overdue_label=Overdue
+stage_overdue=Event is overdue
+stage_overdue_label=Overdue found
+skipped=Skipped event
+skipped_label=Skipped event
+stage_empty=Empty
+stage_empty_label=Empty
+complete_active_events_before_completing_enrollment=Please complete active events before completing enrollment
+complete_enrollment_failed=Complete file failed
+are_you_sure_to_complete_enrollment_delete_schedule=Are you sure you want to complete this enrollment? Existing scheduled and overdue events will be deleted
+no_active_enrollment=No active enrollment. Please enroll from the enrollment widget.
+events_today=Events due today
+events_in_one_week=Events due in a week
+events_in_two_weeks=Events due in two weeks
+events_in_one_month=Events due in a month
+choose_the_dates=Choose the dates
+fill_all_category_options=Please fill all category options
+description=\u0422\u0430\u0432\u0441\u0438\u0444
+url=Url
+not_available=Not available
+attribute=\u041d\u0438\u0448\u043e\u043d\u0430
+data_entry=\u0412\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u0438\u0442\u0442\u0438\u043b\u043e\u043e\u0442
+invalid_coordinate_format=Invalid coordinate format
+latitude_longitude_format=Longitude,latitude
+missing_search_ous=User has no orgunits assigned to it
+cocbo_filter=Category and category option filter
+apply=Apply
+attribute_category_selection=Attribute category selection
+event_filter=Filter events by data element value, stage or org unit name
+validation_errors=Errors currently in the form:
+validation_warnings=Be aware of these warnings:
+openstreetmap=OpenStreetMap
+googlemap=Google Maps
+missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
+missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
+sms=\u0421\u041c\u0421
+email=\u041f\u043e\u0447\u0442\u0430\u0438 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u04e3
+email_address=E-mail address
+wrong_email=Please specify a valid e-mail address
+email_subject=Subject
+message=\u041f\u0430\u0451\u043c
+gridColumns_fetch_failed=Failed to fetch the grid columns to display
+gridColumns_invalid=Invalid grid columns returned from the server
+dasboard_layout_saving_failed=Failed to save the dashboard layout
+failed_to_register_tei=Failed to register the tracked entity instance in the server
+failed_to_update_tei=Failed to update the tracked entity instance in the server
+failed_to_generate_tracked_entity_attribute=Failed to generate attribute value
+failed_to_fetch_events=Failed to fetch events from the server
+failed_to_update_event=Failed to update the event in the server
+failed_to_send_message=Failed to send the message
+file_missing=File is missing
+file_upload_failed=File upload has failed
+missing_file_identifier= File identifier is missing
+unsupported_value_type=Unsupported value type
+event_date_out_of_range=The specified date cannot be set. Configured number of expiry days for the program have passed after the period containing the date.
+date_out_of_ou_period=The date is not within the start date and end date of the org unit.
+orgunit_closed= The orgunit is closed. Registration and editing are disabled.
+dob=\u0421\u0430\u043d\u0430\u0438 \u0442\u0430\u0432\u0430\u043b\u043b\u0443\u0434
+years=\u0421\u043e\u043b\u04b3\u043e
+months=\u041c\u043e\u04b3\u04b3\u043e
+days=Days
+age_fields_info=Age fields info
+reponse_from_server=Response from the server.
+loading-audit-data=Loading audit data.
+more_options_available=more options available, try searching...
+move_permanently=Move permanently
+onetime_referral=One-time referral
+are_you_sure_you_want_to_move_permanently=Are you sure you want to move patient permanently?
+ok=OK
+can_not_add_new_enrollment=Can not add a new enrollment because this program only allows one enrollment.
+switch_compare_form=Switch to compare form
+switch_default_form=Switch to default form
+switch_tabel_form=Switch to tabel form
+url_format=http(s)://
+url_error=Ensure that the URL is valid.
+time_error=Wrong time format
+no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
+not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
+both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+wrong_time_format=Please ensure that the time format (HH:MM) is followed.
+hours_and_minutes=HH:MM
+top_bar_settings=Top bar settings
+show=\u041d\u0438\u0448\u043e\u043d \u0434\u043e\u0434\u0430\u043d
+sort_order=\u0422\u0430\u0440\u0442\u0438\u0431\u0438 \u04b7\u0443\u0434\u043e\u043a\u0443\u043d\u04e3
+activate_top_bar=Activate top bar
+use_as_top_bar=Use as top bar
+remove_widget=Remove widget?
+remove_widget_info=You are about to remove a widget. Do you want to proceed?
+lock_default_layout=Lock layout for all users
+unlock_default_layout=Unlock layout for all users
+upload_image=\u0411\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d
+please_select_an_image=[Please select an image]
+all=\u04b2\u0430\u043c\u0430
+ALL=\u04b2\u0430\u043c\u0430
+completed=\u0410\u043d\u04b7\u043e\u043c\u0451\u0444\u0442\u0430
+active=\u0424\u0430\u044a\u043e\u043b
+cancelled=Cancelled
+enrollment_status=Enrollment status
+go_to_registration=Go to registration
+tracked_entity_instance_search_results_header={trackedEntityTypeName} search results
+tracked_entity_instance_search_matches_description=If none of the matches above is the {trackedEntityTypeName} you are searching for, choose "Go to registration".
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} found
+tracked_entity_instance_unique_found_description=A {trackedEntityTypeName} was found, in another {orgUnitLevelName}.
+no_tracked_entity_instance_found_header=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_description=No {trackedEntityTypeName} found.
+no_tracked_entity_instance_found_go_to_registration_description=No {trackedEntityTypeName} was found, click 'Go to registration' if you want to register as a new {trackedEntityTypeName}.
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+possible_duplicates_found=Possible duplicates found.
+view_x_candidates=View {count} candidates
+view_candidate=View candidate
+matching_tracked_entity_instance_register_description=Click to open any matching {trackedEntityTypeName} or go back and finish registration.
+review_possible_duplicates_before_registration=Review possible duplicates before registration
+review_possible_duplicates_description=Open any of the duplicate candidates above, or click to register as a new {trackedEntityTypeName}
+register_new_tracked_entity_instance=Register new {trackedEntityTypeName}
+large_number_of_search_results_warning=A large number of matches was found. Please go back and refine your search criteria or go to registration.
+too_many_search_results=Too many search results
+open=Open
+continue=\u0418\u0434\u043e\u043c\u0430 \u0434\u043e\u0434\u0430\u043d
+no_program_write_access=Program write authority needed to send messages
+show_all=Show all
+not_allowed=Not allowed
+you_do_not_have_the_necessary_authorities_to_delete=You do not have the necessary authorities to delete
+this=this
+delete_failed=Delete failed
+cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
+cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+drop_image=Drop image
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
+stage_write_required=Program stage write access required
+you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+no_polygon_captured=No polygon captured
+polygon_captured=Polygon captured
+no_geometry_captured=No geometry captured
+geometry=Geometry
+tracked_entity_type=Tracked entity type
+type=\u041d\u0430\u0432\u044a
+tracked_entity_type_has_no_attributes=Tracked entity type has no attributes.
+belongs_to_another_organisation_unit=belongs to another organization unit
+please_fill_in_a_reason_for_accessing=Please fill in a reason for accessing
+your_action_is_being_monitored=Your action is being monitored
+this=this
+saving_relationship_failed_conflicts=Saving relationship failed. Conflicts
+saving_relationship_failed=Saving relationship failed.
+open_tei_error=Failed to open TEI
+PROGRAM_ACCESS_CLOSED=No access to tracked entity instances outside of assigned data capture organisationunits.
+compare_form_previous=Compare form previous
+compare_form_all=Compare form all
+grid_form=Grid form
+pop_over_form=POP-over form
+failed_to_delete_enrollment=Failed to delete enrollment
+enrollment_polygon=Enrollment polygon
+enrollment_point=Enrollment point
+event_polygon=Event polygon
+event_point=Event point
+point_on_map=Point on map
+polygon_on_map=Polygon on map
+cancel_capturing_polygon=Cancel capturing polygon
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
+complete_stage=Complete stage?
+complete_stage_info=Do you want to set this stage to complete?
+assigned_user=Assigned user
+linked_events=Linked events
+user_assignment=User assignment
+specific_users=Specific users:
+none=\u042f\u0433\u043e\u043d\u0442\u043e
+any=Any
+no_requirement=No requirement
+the_record_has_is_possible_duplicate=The record has/is possible duplicate
+flag_possible_duplicate=Flag possible duplicate
+possible_duplicate=Possible duplicate
+unflag=Unflag
+possible_duplicate_info_start=Possible duplicate: This
+possible_duplicate_info_end= is, or has, a possible duplicate and has been flagged for review.
+owned_by=Owned by:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_uk.properties b/i18n/i18n_app_uk.properties
index 2683d9372..7b57ca015 100644
--- a/i18n/i18n_app_uk.properties
+++ b/i18n/i18n_app_uk.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u0429\u0435 \u043d\u0435 \u0437\u0430\u0440\u0435\u
 not_yet_enrolled_enrollment=\u0420\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u0457 \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
 no_active_enrollment_exists=\u0414\u043b\u044f \u043e\u0431\u0440\u0430\u043d\u043e\u0457 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0457 \u0440\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u0457 \u043d\u0435 \u0456\u0441\u043d\u0443\u0454
 no_active_enrollments_exist=\u0410\u043a\u0442\u0438\u0432\u043d\u043e\u0457 \u0440\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u0457 \u043d\u0435 \u0456\u0441\u043d\u0443\u0454
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u0429\u0435 \u043d\u0435 \u0437\u0430\u0440\u0435\u0454\u0441\u0442\u0440\u043e\u0432\u0430\u043d\u043e. \u0417\u0430\u043f\u0438\u0441 \u043d\u043e\u0442\u0430\u0442\u043a\u0438 \u043d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u0438\u0439.
 not_yet_enrolled_report=\u0429\u0435 \u043d\u0435 \u0437\u0430\u0440\u0435\u0454\u0441\u0442\u0440\u043e\u0432\u0430\u043d\u043e. \u0417\u0432\u0456\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u043d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u0435.
 no_data_report=\u041d\u0435\u043c\u0430\u0454 \u0437\u0430\u043f\u0438\u0441\u0456\u0432 \u0434\u043b\u044f \u0437\u0432\u0456\u0442\u0443\u0432\u0430\u043d\u043d\u044f
@@ -36,7 +37,7 @@ view_all=[\u041f\u043e\u0434\u0438\u0432\u0438\u0442\u0438\u0441\u044c \u0443\u0
 list_all_entities=\u0421\u043a\u043b\u0430\u0441\u0442\u0438 \u043f\u0435\u0440\u0435\u043b\u0456\u043a \u0443\u0441\u0456\u0445 \u044f\u0432\u0438\u0449
 list_all=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0432\u0441\u0456
 list=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438
-lists=Lists
+lists=\u0421\u043f\u0438\u0441\u043a\u0438
 invalid=\u041d\u0435\u0432\u0456\u0440\u043d\u0435
 selected_tei_is_invalid=\u041e\u0431\u0440\u0430\u043d\u0438\u0439 \u0432\u0438\u043f\u0430\u0434\u043e\u043a \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0443\u0432\u0430\u043d\u043e\u0433\u043e \u044f\u0432\u0438\u0449\u0430 \u0454 \u043d\u0435\u043a\u043e\u0440\u0435\u043a\u0442\u043d\u0438\u043c
 required=\u041e\u0431\u043e\u0432'\u044f\u0437\u043a\u043e\u0432\u0435
@@ -182,7 +183,7 @@ reports=\u0417\u0432\u0456\u0442\u0438
 registration_and_data_entry=\u0420\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u044f \u0456 \u0432\u0432\u0435\u0434\u0435\u043d\u043d\u044f \u0434\u0430\u043d\u0438\u0445
 program_summary_report=\u0417\u0432\u0456\u0442 \u0437\u0430 \u043a\u043e\u0440\u043e\u0442\u043a\u0438\u043c \u0432\u0438\u043a\u043b\u0430\u0434\u043e\u043c \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438
 program_summary=\u041a\u043e\u0440\u043e\u0442\u043a\u0438\u0439 \u0432\u0438\u043a\u043b\u0430\u0434 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438
-program_summary_description=\u0417\u0433\u0435\u043d\u0435\u0440\u0443\u0432\u0430\u0442\u0438 \u043a\u043e\u0440\u043e\u0442\u043a\u0438\u0439 \u043f\u0456\u0434\u0441\u0443\u043c\u043a\u043e\u0432\u0438\u0439 \u0437\u0432\u0456\u0442 \u0449\u043e\u0434\u043e \u043a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u043e\u0457 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438, \u043e\u0440\u0433\u0430\u043d\u0456\u0437\u0430\u0446\u0456\u0439\u043d\u043e\u0433\u043e \u043f\u0456\u0434\u0440\u043e\u0437\u0434\u0456\u043b\u0443 \u0442\u0430 \u0447\u0430\u0441\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u043e\u043c\u0456\u0436\u043a\u0443. \u0423 \u0437\u0432\u0456\u0442\u0456 \u0432\u043a\u0430\u0437\u0430\u043d\u043e \u043f\u0435\u0440\u0435\u043b\u0456\u043a \u043f\u0440\u0438\u043a\u043b\u0430\u0434\u0456\u0432 \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0443\u0432\u0430\u043d\u0438\u0445 \u044f\u0432\u0438\u0449 \u0442\u0430 \u0457\u0445 \u0437\u0430\u043f\u0438\u0441\u0438, \u043e\u0440\u0433\u0430\u043d\u0456\u0437\u043e\u0432\u0430\u043d\u0456 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0456 \u0435\u0442\u0430\u043f\u0456\u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438.
+program_summary_description=\u0417\u0433\u0435\u043d\u0435\u0440\u0443\u0432\u0430\u0442\u0438 \u043a\u043e\u0440\u043e\u0442\u043a\u0438\u0439 \u043f\u0456\u0434\u0441\u0443\u043c\u043a\u043e\u0432\u0438\u0439 \u0437\u0432\u0456\u0442 \u0449\u043e\u0434\u043e \u043a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u043e\u0457 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438, \u043e\u0440\u0433\u0430\u043d\u0456\u0437\u0430\u0446\u0456\u0439\u043d\u043e\u0433\u043e \u043f\u0456\u0434\u0440\u043e\u0437\u0434\u0456\u043b\u0443 \u0442\u0430 \u0447\u0430\u0441\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u043e\u043c\u0456\u0436\u043a\u0443. \u0423 \u0437\u0432\u0456\u0442\u0456 \u0432\u043a\u0430\u0437\u0430\u043d\u043e \u043f\u0435\u0440\u0435\u043b\u0456\u043a \u0432\u0438\u043f\u0430\u0434\u043a\u0456\u0432 \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0443\u0432\u0430\u043d\u0438\u0445 \u044f\u0432\u0438\u0449 \u0442\u0430 \u0457\u0445 \u0437\u0430\u043f\u0438\u0441\u0438, \u043e\u0440\u0433\u0430\u043d\u0456\u0437\u043e\u0432\u0430\u043d\u0456 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0456 \u0435\u0442\u0430\u043f\u0456\u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438.
 program_statistics_report=\u0417\u0432\u0456\u0442 \u0437\u0430 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043d\u043e\u044e \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u043e\u044e
 program_statistics=\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043d\u0430 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430
 program_statistics_description=\u0417\u0433\u0435\u043d\u0435\u0440\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u0447\u043d\u0438\u0439 \u0437\u0432\u0456\u0442 \u0449\u043e\u0434\u043e \u043a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u043e\u0457 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438. \u0417\u0432\u0456\u0442 \u043d\u0430\u0434\u0430\u0454, \u0437\u043e\u043a\u0440\u0435\u043c\u0430, \u043e\u0433\u043b\u044f\u0434 \u0440\u0456\u0432\u043d\u044f \u043f\u0440\u0438\u043f\u0438\u043d\u0435\u043d\u043d\u044f \u0443\u0447\u0430\u0441\u0442\u0456 \u0430\u0431\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u044f \u043f\u0440\u043e\u0442\u044f\u0433\u043e\u043c \u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u043c\u0456\u0436\u043a\u0443 \u0447\u0430\u0441\u0443 \u0432 \u043f\u0435\u0432\u043d\u043e\u043c\u0443 \u043e\u0440\u0433\u0430\u043d\u0456\u0437\u0430\u0446\u0456\u0439\u043d\u043e\u043c\u0443 \u043f\u0456\u0434\u0440\u043e\u0437\u0434\u0456\u043b\u0456.
@@ -205,6 +206,7 @@ registered_data=\u0417\u0430\u0440\u0435\u0454\u0441\u0442\u0440\u043e\u0432\u04
 no_value=\u041d\u0435\u043c\u0430\u0454 \u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f
 no_data_found=\u0414\u0430\u043d\u0438\u0445 \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e
 no_data=\u041d\u0435\u043c\u0430\u0454 \u0434\u0430\u043d\u0438\u0445
+mo_matching_data=No data matching your search criteria
 data_exists=\u0414\u0430\u043d\u0456 \u0456\u0441\u043d\u0443\u044e\u0442\u044c
 data_registerd=\u0414\u0430\u043d\u0438\u0445 \u043d\u0435 \u0437\u0430\u0440\u0435\u0454\u0441\u0442\u0440\u043e\u0432\u0430\u043d\u043e
 no_visit_made=\u041d\u0435 \u0437\u0434\u0456\u0439\u0441\u043d\u0435\u043d\u043e \u0436\u043e\u0434\u043d\u043e\u0433\u043e \u0432\u0456\u0437\u0438\u0442\u0443
@@ -246,7 +248,7 @@ json=JSON
 xml=XML
 list_programs=\u041f\u0435\u0440\u0435\u043b\u0456\u043a \u043f\u0440\u043e\u0433\u0440\u0430\u043c
 program_stage=\u0415\u0442\u0430\u043f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438
-due_date=\u0414\u0430\u0442\u0430 \u0432\u0438\u043a\u043e\u043d\u0430\u043d\u043d\u044f
+due_date=\u0417\u0430\u043f\u043b\u0430\u043d\u043e\u0432\u0430\u043d\u0430 \u0434\u0430\u0442\u0430
 event_date=\u0414\u0430\u0442\u0430 \u043f\u043e\u0434\u0456\u0457
 report_date=\u0414\u0430\u0442\u0430 \u0437\u0432\u0456\u0442\u0443
 enable_rescheduling=\u0412\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u043f\u0435\u0440\u0435\u043f\u043b\u0430\u043d\u0443\u0432\u0430\u043d\u043d\u044f
@@ -352,6 +354,7 @@ advanced_search=\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0438\u0439 \u0
 profile=\u041f\u0440\u043e\u0444\u0456\u043b\u044c
 applications=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u043d\u043a\u0438
 more_applications=\u0411\u0456\u043b\u044c\u0448\u0435 \u0437\u0430\u0441\u0442\u043e\u0441\u0443\u043d\u043a\u0456\u0432
+manage=\u0423\u043f\u0440\u0430\u0432\u043b\u0456\u043d\u043d\u044f
 settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
 account=\u041e\u0431\u043b\u0456\u043a\u043e\u0432\u0438\u0439 \u0437\u0430\u043f\u0438\u0441
 help=\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430
@@ -480,7 +483,7 @@ delete_error_audit=\u041f\u043e\u0434\u0456\u044e \u043d\u0435 \u0432\u0434\u043
 are_you_sure_to_remove=\u0427\u0438 \u0432\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0440\u0438\u0431\u0440\u0430\u0442\u0438?
 completed_label=\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e
 stage_completed=\u041f\u043e\u0434\u0456\u044e \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e
-stage_completed_label=\u0412\u0441\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e
+stage_completed_label=\u0412\u0441\u0456 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e
 executed=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0435 \u0434\u043b\u044f \u0432\u0432\u0435\u0434\u0435\u043d\u043d\u044f \u0434\u0430\u043d\u0438\u0445
 executed_label=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438
 stage_executed=\u041f\u043e\u0434\u0456\u044f \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0430
@@ -575,6 +578,7 @@ top_bar_settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u0
 show=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438
 sort_order=\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f
 activate_top_bar=\u0410\u043a\u0442\u0438\u0432\u0443\u0432\u0430\u0442\u0438 \u0432\u0435\u0440\u0445\u043d\u044e \u043f\u0430\u043d\u0435\u043b\u044c
+use_as_top_bar=\u0412\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u044f\u043a \u0432\u0435\u0440\u0445\u043d\u044e \u043f\u0430\u043d\u0435\u043b\u044c
 remove_widget=\u041f\u0440\u0438\u0431\u0440\u0430\u0442\u0438 \u0432\u0456\u0434\u0436\u0435\u0442?
 remove_widget_info=\u0412\u0438 \u0437\u0431\u0438\u0440\u0430\u0454\u0442\u0435\u0441\u044f \u043f\u0440\u0438\u0431\u0440\u0430\u0442\u0438 \u0432\u0456\u0434\u0436\u0435\u0442. \u0427\u0438 \u0445\u043e\u0447\u0435\u0442\u0435 \u0432\u0438 \u043f\u0440\u043e\u0434\u043e\u0432\u0436\u0438\u0442\u0438?
 lock_default_layout=\u0417\u0430\u0431\u043b\u043e\u043a\u0443\u0432\u0430\u0442\u0438 \u043c\u0430\u043a\u0435\u0442 \u0434\u043b\u044f \u0432\u0441\u0456\u0445 \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432
diff --git a/i18n/i18n_app_ur.properties b/i18n/i18n_app_ur.properties
index 8adf30430..f6228a327 100644
--- a/i18n/i18n_app_ur.properties
+++ b/i18n/i18n_app_ur.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u0627\u0628\u06be\u06cc \u062a\u06a9 \u062f\u0627\u
 not_yet_enrolled_enrollment=\u06a9\u0648\u0626\u06cc \u0627\u0646\u062f\u0631\u0627\u062c \u0646\u06c1\u06cc\u06ba \u06c1\u06d2.
 no_active_enrollment_exists=\u0645\u0646\u062a\u062e\u0628 \u06a9\u0631\u062f\u06c1 \u067e\u0631\u0648\u06af\u0631\u0627\u0645 \u06a9\u06d2 \u0644\u0626\u06d2 \u06a9\u0648\u0626\u06cc \u0641\u0639\u0627\u0644 \u0627\u0646\u062f\u0631\u0627\u062c \u0645\u0648\u062c\u0648\u062f \u0646\u06c1\u06cc\u06ba \u06c1\u06d2
 no_active_enrollments_exist=\u06a9\u0648\u0626\u06cc \u0641\u0639\u0627\u0644 \u0627\u0646\u062f\u0631\u0627\u062c \u0645\u0648\u062c\u0648\u062f \u0646\u06c1\u06cc\u06ba \u06c1\u06d2
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u0627\u0628\u06be\u06cc \u062a\u06a9 \u062f\u0627\u062e\u0644\u0627 \u0646\u06c1\u06cc\u06ba \u0646\u0648\u0679 \u0631\u06cc\u06a9\u0627\u0631\u0688\u0646\u06af \u0645\u0645\u06a9\u0646 \u0646\u06c1\u06cc\u06ba \u06c1\u06d2.
 not_yet_enrolled_report=\u0627\u0628\u06be\u06cc \u062a\u06a9 \u062f\u0627\u062e\u0644\u0627 \u0646\u06c1\u06cc\u06ba \u0631\u067e\u0648\u0631\u0679\u0646\u06af \u0645\u0645\u06a9\u0646 \u0646\u06c1\u06cc\u06ba.
 no_data_report=\u0631\u067e\u0648\u0631\u0679\u0646\u06af \u06a9\u06d2 \u0644\u0626\u06d2 \u06a9\u0648\u0626\u06cc \u0631\u06cc\u06a9\u0627\u0631\u0688 \u0645\u0648\u062c\u0648\u062f \u0646\u06c1\u06cc\u06ba \u06c1\u06d2
@@ -205,6 +206,7 @@ registered_data=\u0631\u062c\u0633\u0679\u0631\u0688 \u0688\u06cc\u0679\u0627
 no_value=\u00da\u00a9\u00d9\u0088\u00d8\u00a6\u00db\u008c \u00d9\u0082\u00d8\u00af\u00d8\u00b1 \u00d9\u0086\u00db\u0081\u00db\u008c\u00da\u00ba
 no_data_found=\u06a9\u0648\u0626\u06cc \u0688\u06cc\u0679\u0627 \u0646\u06c1\u06cc\u06ba \u0645\u0644\u0627
 no_data=\u06a9\u0648\u0626\u06cc \u0645\u0648\u0627\u062f \u0646\u06c1\u06cc\u06ba
+mo_matching_data=No data matching your search criteria
 data_exists=\u0688\u06cc\u0679\u0627 \u0645\u0648\u062c\u0648\u062f \u06c1\u06d2
 data_registerd=\u06a9\u0648\u0626\u06cc \u0688\u06cc\u0679\u0627 \u0631\u062c\u0633\u0679\u0631 \u0646\u06c1\u06cc\u06ba
 no_visit_made=\u06a9\u0648\u0626\u06cc \u062f\u0648\u0631\u06c1 \u0646\u06c1\u06cc\u06ba \u0628\u0646\u0627\u06cc\u0627 \u06af\u06cc\u0627
@@ -352,6 +354,7 @@ advanced_search=\u0627\u0639\u0644\u06cc \u062f\u0631\u062c\u06d2 \u06a9\u06cc \
 profile=\u067e\u0631\u0641\u0627\u0626\u0644
 applications=\u0627\u067e\u06cc\u0632
 more_applications=\u0645\u0632\u06cc\u062f \u0627\u06cc\u067e\u0632
+manage=Manage
 settings=\u00d8\u00aa\u00d8\u00b1\u00d8\u00aa\u00db\u008c\u00d8\u00a8\u00d8\u00a7\u00d8\u00aa
 account=\u0627\u06a9\u0627\u0624\u0646\u0679
 help=\u0645\u062f\u062f
@@ -575,6 +578,7 @@ top_bar_settings=\u0627\u0648\u067e\u0631 \u0628\u0627\u0631 \u062a\u0631\u062a\
 show=\u062f\u06a9\u06be\u0627\u0626\u06cc\u06ba
 sort_order=\u062a\u0631\u062a\u06cc\u0628
 activate_top_bar=\u0627\u0648\u067e\u0631 \u0628\u0627\u0631 \u0641\u0639\u0627\u0644 \u06a9\u0631\u06cc\u06ba
+use_as_top_bar=Use as top bar
 remove_widget=\u0648\u06cc\u062c\u06cc\u0679 \u06a9\u0648 \u06c1\u0679\u0627 \u062f\u06cc\u06ba\u061f
 remove_widget_info=\u0622\u067e \u0648\u06cc\u062c\u06cc\u0679 \u06a9\u0648 \u06c1\u0679\u0627 \u062f\u06cc\u06ba. \u06a9\u06cc\u0627 \u0622\u067e \u0622\u06af\u06d2 \u0628\u0691\u06be\u0646\u0627 \u0686\u0627\u06c1\u062a\u06d2 \u06c1\u06cc\u06ba\u061f
 lock_default_layout=\u062a\u0645\u0627\u0645 \u0635\u0627\u0631\u0641\u06cc\u0646 \u06a9\u06cc\u0644\u0626\u06d2 \u0644\u0627\u06a9 \u062a\u0631\u062a\u06cc\u0628
diff --git a/i18n/i18n_app_uz.properties b/i18n/i18n_app_uz.properties
new file mode 100644
index 000000000..02e6e30b1
--- /dev/null
+++ b/i18n/i18n_app_uz.properties
@@ -0,0 +1,674 @@
+tracker_capture=\u041a\u0443\u0437\u0430\u0442\u0443\u0432-\u041d\u0430\u0437\u043e\u0440\u0430\u0442
+online_notification=\u0421\u0438\u0437 \u043e\u043d\u043b\u0430\u0439\u043d
+offline_notification=\u0421\u0438\u0437 \u043e\u0444\u0444\u043b\u0430\u0439\u043d
+login_failed=\u041b\u043e\u0433\u0438\u043d \u0445\u0430\u0442\u043e, \u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438 \u0438\u0441\u043c\u0438 \u0432\u0430 \u043f\u0430\u0440\u043e\u043b\u043d\u0438 \u0442\u0435\u043a\u0448\u0438\u0440\u0438\u0431 \u049b\u0430\u0439\u0442\u0430 \u043a\u0438\u0440\u0438\u0442\u0438\u043d\u0433
+tracked_entity_management=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u043e\u0431\u044a\u0435\u043a\u0442\u0438 \u0431\u043e\u0448\u049b\u0430\u0440\u0443\u0432\u0438
+registering_unit=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u043c\u0443\u0430\u0441\u0441\u0430\u0441\u0430\u0441\u0438
+program=\u0414\u0430\u0441\u0442\u0443\u0440
+tracked_entity=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u043e\u0431\u044a\u0435\u043a\u0442\u0438
+tracked_entity_instance=\u041a\u0443\u0437\u0430\u0442\u0438\u043b\u0430\u0451\u0442\u0433\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0430\u043c\u0443\u043d\u0430\u0441\u0438
+tracked_entity_attribute=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u043e\u0431\u044a\u0435\u043a\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438
+select_or_search=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u0442\u0430\u043d\u043b\u0430\u043d\u0433 \u0451\u043a\u0438 \u049b\u0438\u0434\u0438\u0440\u0438\u043d\u0433
+please_select=[\u041c\u0430\u0440\u04b3\u0430\u043c\u0430\u0442 \u0442\u0430\u043d\u043b\u0430\u043d\u0433]
+please_select_a_program=[\u041c\u0430\u0440\u04b3\u0430\u043c\u0430\u0442 \u0434\u0430\u0441\u0442\u0443\u0440\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433]
+no_program_exists=[\u0414\u0430\u0441\u0442\u0443\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441]
+please_select_a_program_for_enrollment=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0443\u0447\u0443\u043d \u0434\u0430\u0441\u0442\u0443\u0440\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+please_select_program_report=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u0434\u0430 \u0438\u0448\u043b\u0430\u0448 \u0443\u0447\u0443\u043d \u0434\u0430\u0441\u0442\u0443\u0440\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+please_select_a_relationship=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u045e\u0437\u0430\u0440\u043e \u043c\u0443\u043d\u043e\u0441\u0430\u0431\u0430\u0442\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+no_relationship=\u040e\u0437\u0430\u0440\u043e \u043c\u0443\u043d\u043e\u0441\u0430\u0431\u0430\u0442\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+relationship_not_possible=\u041a\u0443\u0437\u0430\u0442\u0438\u043b\u0430\u0451\u0442\u0433\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0430\u043c\u0443\u043d\u0430\u0441\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441, \u0430\u043b\u043e\u049b\u0430 \u045e\u0440\u043d\u0430\u0442\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438\u044f\u0442\u0438 \u0439\u045e\u049b
+no_program_exists_enrollment=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u0438\u0440\u043b\u0438\u043a \u0443\u0447\u0443\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441. \u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u0439\u045e\u049b
+no_program_exists_report=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u0438\u0440\u043b\u0438\u043a \u0443\u0447\u0443\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441. \u04b2\u0438\u0441\u043e\u0431\u043e\u0442 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u0439\u045e\u049b
+not_yet_enrolled_data_entry=\u04b2\u0430\u043b\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u043c\u0430\u0433\u0430\u043d. \u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441.
+not_yet_enrolled_enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441.
+no_active_enrollment_exists=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u0443\u0447\u0443\u043d \u0444\u0430\u043e\u043b \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+no_active_enrollments_exist=\u0424\u0430\u043e\u043b \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+not_yet_enrolled_note=\u04b2\u0430\u043b\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u043c\u0430\u0433\u0430\u043d. \u0401\u0437\u0443\u0432\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441.
+not_yet_enrolled_report=\u04b2\u0430\u043b\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u043c\u0430\u0433\u0430\u043d. \u04b2\u0438\u0441\u043e\u0431\u043e\u0442 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u0439\u045e\u049b.
+no_data_report=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+no_notes_exist=\u0418\u0437\u043e\u04b3 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+event=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0422\u0430\u0434\u0431\u0438\u0440
+no_event_is_yet_created=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u04b3\u0435\u0447 \u049b\u0430\u043d\u0434\u0430\u0439 \u0442\u0430\u0434\u0431\u0438\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u044f\u0440\u0430\u0442\u0438\u043d\u0433.
+event_creation=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u049b\u0443\u0439\u0438\u0434\u0430\u0433\u0438\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0431\u0438\u0440\u0438\u0434\u0430\u043d \u044f\u0440\u0430\u0442\u0438\u043d\u0433
+not_selected=\u0422\u0430\u043d\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d
+create=\u042f\u0440\u0430\u0442\u0438\u0448
+view_all=[\u0411\u0430\u0440\u0447\u0430\u0441\u0438\u043d\u0438 \u043a\u045e\u0440\u0438\u0448]
+list_all_entities=\u0411\u0430\u0440\u0447\u0430 \u0441\u0443\u0431\u044a\u0435\u043a\u0442\u043b\u0430\u0440 \u0440\u045e\u0439\u0445\u0430\u0442\u0438
+list_all=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u0433\u0438\u043b\u0430\u0440\u043d\u0438 \u0441\u0430\u043d\u0430\u0431 \u045e\u0442\u0438\u0448
+list=\u041f\u0430\u0446\u0438\u0435\u043d\u0442\u043b\u0430\u0440 \u0420\u045e\u0439\u0445\u0430\u0442\u0438
+lists=\u0420\u045e\u0439\u0445\u0430\u0442\u043b\u0430\u0440
+invalid=\u042f\u0440\u043e\u049b\u0441\u0438\u0437
+selected_tei_is_invalid=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u0443\u0447\u0443\u043d \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442 \u043c\u0430\u043d\u0442\u0438\u049b\u0430\u043d \u044f\u0440\u043e\u049b\u0441\u0438\u0437
+required=\u041c\u0430\u0436\u0431\u0443\u0440\u0438\u0439
+number_required=\u0420\u0430\u049b\u0430\u043c \u0442\u0430\u043b\u0430\u0431 \u044d\u0442\u0438\u043b\u0430\u0434\u0438
+date_required=\u0421\u0430\u043d\u0430 \u0442\u0430\u043b\u0430\u0431 \u044d\u0442\u0438\u043b\u0430\u0434\u0438
+number=\u0422\u0430\u0440\u0442\u0438\u0431 \u0440\u0430\u049b\u0430\u043c\u0438
+value_must_be_number=\u049a\u0438\u0439\u043c\u0430\u0442 \u0440\u0430\u049b\u0430\u043c\u0434\u0430 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+value_must_be_posInt=\u049a\u0438\u0439\u043c\u0430\u0442 \u043c\u0443\u0441\u0431\u0430\u0442 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+value_must_be_negInt=\u049a\u0438\u0439\u043c\u0430\u0442 \u043c\u0430\u043d\u0444\u0438\u0439 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+value_must_be_zeroPositiveInt=\u049a\u0438\u0439\u043c\u0430\u0442 \u043d\u043e\u043b\u044c \u0451\u043a\u0438 \u043c\u0443\u0441\u0431\u0430\u0442 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+value_must_be_int=\u049a\u0438\u0439\u043c\u0430\u0442 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+posInt=\u041c\u0443\u0441\u0431\u0430\u0442 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d
+negInt=\u041c\u0430\u043d\u0444\u0438\u0439 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d
+zeroPositiveInt=\u041d\u043e\u043b\u044c \u0451\u043a\u0438 \u043c\u0443\u0441\u0431\u0430\u0442 \u0431\u0443\u0442\u0443\u043d \u0441\u043e\u043d
+latitude_required=\u041a\u0435\u043d\u0433\u043b\u0438\u043a \u049b\u0438\u0439\u043c\u0430\u0442\u0438 [-90 ... 90] \u043e\u0440\u0430\u043b\u0438\u0493\u0438\u0434\u0430 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+longitude_required=\u0423\u0437\u0443\u043d\u043b\u0438\u043a \u049b\u0438\u0439\u043c\u0430\u0442\u0438 [-180 ... 180] \u043e\u0440\u0430\u043b\u0438\u0493\u0438\u0434\u0430 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+latitude_longitude_required=\u049a\u0438\u0439\u043c\u0430\u0442\u043b\u0430\u0440 \u049b\u0443\u0439\u0438\u0434\u0430\u0433\u0438 \u0448\u0430\u043a\u043b\u0434\u0430 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c, \u0423\u0437\u0443\u043d\u043b\u0438\u043a [-180...180], \u041a\u0435\u043d\u0433\u043b\u0438\u043a [-90...90]
+future_date_not_allowed=\u041a\u0435\u043b\u0430\u0436\u0430\u043a\u0434\u0430\u0433\u0438 \u0441\u0430\u043d\u0430 \u0442\u0430\u043d\u043b\u043e\u0432\u0438\u0433\u0430 \u0440\u0443\u0445\u0441\u0430\u0442 \u0431\u0435\u0440\u0438\u043b\u043c\u0430\u0439\u0434\u0438
+option_required=\u049a\u0438\u0439\u043c\u0430\u0442 \u0442\u0430\u043a\u043b\u0438\u0444 \u049b\u0438\u043b\u0438\u043d\u0433\u0430\u043d \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u0442\u0430\u043d\u043b\u0430\u043d\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+bool_required=\u049a\u0438\u0439\u043c\u0430\u0442 \u043c\u0430\u043d\u0442\u0438\u049b\u0438\u0439 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+name=\u0418\u0441\u043c\u0438
+filter=\u0424\u0438\u043b\u044c\u0442\u0440
+search=\u049a\u0438\u0434\u0438\u0440\u0438\u0448
+_search=\u049b\u0438\u0434\u0438\u0440\u0438\u0448
+search_by_name=\u0418\u0441\u043c\u0438 \u043e\u0440\u049b\u0430\u043b\u0438 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+search_by_data_element=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0431\u045e\u0439\u0438\u0447\u0430 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+search_by_attribute=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u0430\u0440 \u0431\u045e\u0439\u0438\u0447\u0430 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+search_for=\u049a\u0438\u0434\u0438\u0440\u0438\u0448
+type_your_search_criteria_here=\u049a\u0438\u0434\u0438\u0440\u0438\u0448 \u043c\u0435\u0437\u043e\u043d\u043b\u0430\u0440\u0438\u043d\u0438 \u0448\u0443 \u0435\u0440\u0434\u0430 \u043a\u0438\u0440\u0438\u0442\u0438\u043d\u0433
+search_input_required=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u049b\u0438\u0434\u0438\u0440\u0438\u0448 \u043c\u0435\u0437\u043e\u043d\u043b\u0430\u0440\u0438\u043d\u0438 \u0430\u043d\u0438\u049b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+in_progress=\u0416\u0430\u0440\u0430\u0451\u043d\u0434\u0430
+registered_entities=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0433\u0430\u043d \u0448\u0430\u0445\u0441\u043b\u0430\u0440
+empty=\u0411\u045e\u0448
+form_is_empty_fill_at_least_one=\u0428\u0430\u043a\u043b \u0431\u045e\u0448, \u0438\u043b\u0442\u0438\u043c\u043e\u0441, \u043a\u0430\u043c\u0438\u0434\u0430 \u0431\u0438\u0442\u0442\u0430\u0441\u0438\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433
+no_event_exists=\u04b2\u0435\u0447 \u049b\u0430\u043d\u0434\u0430\u0439 \u0445\u043e\u0434\u0438\u0441\u0430 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+total=\u0416\u0430\u043c\u0438
+total_number_of_pages=\u0421\u0430\u04b3\u0438\u0444\u0430\u043b\u0430\u0440 \u0441\u043e\u043d\u0438
+rows_per_page=\u0421\u0430\u04b3\u0438\u0444\u0430\u0434\u0430\u0433\u0438 \u049b\u0430\u0442\u043e\u0440\u043b\u0430\u0440 \u0441\u043e\u043d\u0438
+jump_to_page=\u0421\u0430\u04b3\u0438\u0444\u0430\u0433\u0430 \u045e\u0442\u0438\u0448
+page=\u0421\u0430\u04b3\u0438\u0444\u0430
+first=\u0410\u0432\u0432\u0430\u043b\u0430\u043c\u0431\u043e\u0440
+previous=\u041e\u043b\u0434\u0438\u043d\u0433\u0438
+next=\u041a\u0435\u0439\u0438\u043d\u0433\u0438
+last=\u041a\u0435\u0439\u0438\u043d\u0433\u0438
+go_to_dashboard=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438\u0433\u0430 \u045e\u0442\u0438\u0448
+go=\u041e\u043b\u0434\u0438\u043d\u0433\u0430
+find=\u0422\u043e\u043f\u0438\u043d\u0433
+edit=\u0422\u0430\u04b3\u0440\u0438\u0440\u043b\u0430\u0448
+edit_profile=\u041f\u0440\u043e\u0444\u0438\u043b\u043d\u0438 \u0442\u0430\u04b3\u0440\u0438\u0440 \u049b\u0438\u043b\u0438\u0448
+tracker_associate=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u044f\u0441\u0438
+association=\u0410\u0441\u0441\u043e\u0446\u0438\u044f\u0430\u0446\u0438\u044f\u043d\u0438 \u0431\u043e\u0448\u049b\u0430\u0440\u0438\u0448
+change_location=\u0416\u043e\u0439\u043b\u0430\u0448\u0443\u0432\u043d\u0438 \u0431\u043e\u0448\u049b\u0430\u0440\u0438\u0448
+details_history=\u0422\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u043b\u0430\u0440/\u0442\u0430\u0440\u0438\u0445
+history=\u0422\u0430\u0440\u0438\u0445
+canceled=\u0411\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u043d\u0434\u0438
+delete=\u040e\u0447\u0438\u0440\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u0448
+deleted=\u040e\u0447\u0438\u0440\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043d\u0433\u0430\u043d
+remove=\u041e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u0448
+entity=\u041c\u0443\u0430\u0441\u0441\u0430\u0441\u0430
+clear=\u0422\u043e\u0437\u0430\u043b\u0430\u0448
+add=\u049a\u045e\u0448\u0438\u0448
+add_note=\u0418\u0437\u043e\u04b3 \u049b\u043e\u043b\u0434\u0438\u0440\u0438\u0448
+search_note=\u0418\u0437\u043e\u04b3\u043b\u0430\u0440\u0434\u0430 \u049b\u0438\u0434\u0438\u0440\u0438\u043d\u0433
+your_note_here=\u0421\u0438\u0437\u043d\u0438\u043d\u0433 \u044d\u0441\u043b\u0430\u0442\u043c\u0430\u043d\u0433\u0438\u0437 \u0448\u0443 \u0435\u0440\u0434\u0430
+phone_number=\u0422\u0435\u043b\u0435\u0444\u043e\u043d \u0440\u0430\u049b\u0430\u043c\u0438
+your_sms_message_here=\u0421\u0438\u0437\u043d\u0438\u043d\u0433 \u0421\u041c\u0421 \u0445\u0430\u0431\u0430\u0440\u0438\u043d\u0433\u0438\u0437 \u0448\u0443 \u0435\u0440\u0434\u0430
+your_email_message_here=\u0421\u0438\u0437\u043d\u0438\u043d\u0433 \u0435-\u0445\u0430\u0442\u0438\u043d\u0433\u0438\u0437 \u0448\u0443 \u0435\u0440\u0434\u0430
+sms_send_status=\u0421\u041c\u0421 \u044e\u0431\u043e\u0440\u0438\u043b\u0438\u0448 \u04b3\u043e\u043b\u0430\u0442\u0438
+send=\u042e\u0431\u043e\u0440\u0438\u0448
+add_new_event=\u042f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440 \u049b\u045e\u0448\u0438\u0448
+add_new_event_for_stage=\u0411\u043e\u0441\u049b\u0438\u0447 \u0443\u0447\u0443\u043d \u044f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440 \u049b\u045e\u0448\u0438\u0448
+schedule_new_event=\u042f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+schedule_new_event_for_stage=\u0411\u043e\u0441\u049b\u0438\u0447 \u0443\u0447\u0443\u043d \u044f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+refer_new_event_for_stage=\u0411\u043e\u0441\u049b\u0438\u0447 \u0443\u0447\u0443\u043d \u044f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440\u0433\u0430 \u043c\u0443\u0440\u043e\u0436\u0430\u0430\u0442 \u049b\u0438\u043b\u0438\u043d\u0433
+skip=\u040e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u0448
+unskip=\u0420\u0435\u0436\u0430\u043d\u0438 \u049b\u045e\u043b\u043b\u0430\u0448
+complete=\u0422\u045e\u043b\u0434\u0438\u0440\u0438\u0448
+incomplete=\u0422\u0443\u0433\u0430\u0442\u0438\u043b\u043c\u0430\u0433\u0430\u043d
+reopen=\u049a\u0430\u0439\u0442\u0430 \u043e\u0447\u0438\u0448
+validate=\u0422\u0430\u0441\u0434\u0438\u049b\u043b\u0430\u0448
+validation_result=\u0422\u0430\u0441\u0434\u0438\u049b\u043b\u0430\u0448 \u043d\u0430\u0442\u0438\u0436\u0430\u0441\u0438
+status=\u0421\u0442\u0430\u0442\u0443\u0441
+event_completed=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0422\u0430\u0434\u0431\u0438\u0440 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0434\u0438\u043c\u0438?
+details=\u0422\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0442\u0443\u0433\u043c\u0430\u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433
+_details=\u0422\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u043b\u0430\u0440\u0438
+created_by=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0433\u0430\u043d
+date=\u0421\u0430\u043d\u0430
+_date=\u0441\u0430\u043d\u0430
+event_name=\u0422\u0430\u0434\u0431\u0438\u0440 \u043d\u043e\u043c\u0438
+new_event=\u042f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440
+create_new_event=\u042f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u043d\u0433
+create_new_event_repeatable=\u0422\u0430\u043a\u0440\u043e\u0440\u043b\u0430\u043d\u0430\u0434\u0438\u0433\u0430\u043d \u0431\u043e\u0441\u049b\u0438\u0447\u0434\u0430\u043d \u044f\u043d\u0433\u0438 \u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u043d\u0433
+toggle_table_view_on=\u04b2\u043e\u0434\u0438\u0441\u0430\u043b\u0430\u0440\u043d\u0438 \u0438\u043b\u043e\u0436\u0438 \u0431\u043e\u0440\u0438\u0447\u0430 \u0436\u0430\u0434\u0432\u0430\u043b \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043d\u0433
+toggle_table_view_off=\u04b2\u0430\u0440 \u0431\u0438\u0440 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u0443\u0447\u0443\u043d \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448 \u0448\u0430\u043a\u043b\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043d\u0433
+event_recorded_on=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u049b\u0430\u0439\u0434 \u044d\u0442\u0438\u043b\u0434\u0438
+at=\u0434\u0430
+show_more=\u049a\u045e\u0448\u0438\u043c\u0447\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u0443\u0447\u0443\u043d \u0442\u0443\u0433\u043c\u0430\u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433
+close_search=\u049a\u0438\u0434\u0438\u0440\u0443\u0432\u043d\u0438 \u0451\u043f\u043c\u043e\u049b
+search_attributes=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u0430\u0440\u043d\u0438 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+available_search_attributes=\u041c\u0430\u0432\u0436\u0443\u0434 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u0430\u0440\u0434\u0430 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+selected_search_attributes=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u0430\u0440\u0434\u0430 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+selected_program=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440
+other_programs=\u0411\u043e\u0448\u049b\u0430 \u0434\u0430\u0441\u0442\u0443\u0440\u043b\u0430\u0440
+search_for_dashboard=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+dashboard=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438
+home=\u0411\u043e\u0448 \u0441\u0430\u04b3\u0438\u0444\u0430
+back=\u041e\u0440\u049b\u0430\u0433\u0430
+enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448
+enrolling_orgunit=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c\u0438
+delete_enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u043a\u0430\u0437\u0438\u0448 \u045e\u0447\u0438\u0440\u0438\u043b\u0441\u0438\u043d 
+cancel_enrollment=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448\u043d\u0438 \u0431\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u043d\u0441\u0438\u043d
+complete_enrollment=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0441\u0438\u043d
+reopen_enrollment=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448\u043d\u0438 \u049b\u0430\u0439\u0442\u0430 \u043e\u0447\u0438\u0448
+activate_enrollment=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448\u043d\u0438 \u0444\u0430\u043e\u043b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+deactivate_enrollment=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448\u043d\u0438 \u0444\u0430\u043e\u043b\u0441\u0438\u0437\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448
+enrollment_date=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u043b\u0433\u0430\u043d \u0441\u0430\u043d\u0430
+incident_date=\u04b2\u043e\u0434\u0438\u0441\u0430 \u0441\u0430\u043d\u0430\u0441\u0438
+notes=\u0418\u0437\u043e\u04b3\u043b\u0430\u0440
+relationship=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430
+relationshipTo=\u0427\u0438\u049b\u0443\u0432\u0447\u0438 \u045e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440
+relationshipFrom=\u041a\u0438\u0440\u0443\u0432\u0447\u0438 \u045e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440
+relationships=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440
+add_relationship=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430 \u049b\u045e\u0448\u0438\u0448
+a_is_to_b=\u0410 - \u0412 \u0433\u0430
+b_is_to_a=\u0412 - \u0410 \u0433\u0430
+select=\u0422\u0430\u043d\u043b\u0430\u043d\u0433
+please_add_some_text=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043c\u0430\u0442\u043d \u043a\u0438\u0440\u0438\u0442\u0438\u043d\u0433
+please_select_source=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043c\u0430\u043d\u0431\u0430\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+register_new=\u042f\u043d\u0433\u0438\u043d\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433
+search_from_existing=\u041c\u0430\u0432\u0436\u0443\u0434 \u0431\u045e\u043b\u0433\u0430\u043d\u043b\u0430\u0440\u0434\u0430\u043d \u049b\u0438\u0434\u0438\u0440\u0438\u0448
+dataentry=\u0425\u0440\u043e\u043d\u043e\u043b\u043e\u0433\u0438\u044f \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448
+dataentryTabular=\u0416\u0430\u0434\u0432\u0430\u043b \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448
+indicators=\u041a\u045e\u0440\u0441\u0430\u0442\u0433\u0438\u0447\u043b\u0430\u0440
+empty_inidcator_list=\u041a\u045e\u0440\u0441\u0430\u0442\u0433\u0438\u0447\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+no_indicators_exist=\u041a\u045e\u0440\u0441\u0430\u0442\u0433\u0438\u0447\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+feedback=\u0424\u0438\u043a\u0440-\u043c\u0443\u043b\u043e\u04b3\u0430\u0437\u0430
+no_feedback_exist=\u0424\u0438\u043a\u0440-\u043c\u0443\u043b\u043e\u04b3\u0430\u0437\u0430 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+custom_form=\u041c\u0430\u0445\u0441\u0443\u0441 \u0448\u0430\u043a\u043b
+default_form=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0448\u0430\u043a\u043b
+menu=\u041c\u0435\u043d\u044e
+tracker_reports=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u0438
+reports=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u043b\u0430\u0440
+registration_and_data_entry=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448 \u0432\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448
+program_summary_report=\u0414\u0430\u0441\u0442\u0443\u0440 \u04b3\u0430\u049b\u0438\u0434\u0430 \u049b\u0438\u0441\u049b\u0430\u0447\u0430 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442
+program_summary=\u0414\u0430\u0441\u0442\u0443\u0440 \u0431\u045e\u0439\u0438\u0447\u0430 \u049b\u0438\u0441\u049b\u0430\u0447\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442
+program_summary_description=\u041c\u0443\u0430\u0439\u044f\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u0443\u0447\u0443\u043d \u0441\u043e\u043b\u0438\u0448\u0442\u0438\u0440\u043c\u0430 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448, \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0432\u0430 \u0434\u0430\u0432\u0440 \u0447\u0435\u0433\u0430\u0440\u0430\u0441\u0438\u0434\u0430. \u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u0434\u0430 \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441\u043b\u0430\u0440 \u0440\u045e\u0439\u0445\u0430\u0442\u0438 \u0432\u0430 \u0443\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0451\u0437\u0443\u0432\u043b\u0430\u0440\u0438 \u0430\u043a\u0441 \u044d\u0442\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d, \u0434\u0430\u0441\u0442\u0443\u0440 \u0431\u043e\u0441\u049b\u0438\u0447\u043b\u0430\u0440\u0438 \u043a\u0435\u0442\u043c\u0430-\u043a\u0435\u0442\u043b\u0438\u0433\u0438 \u0431\u0438\u043b\u0430\u043d.
+program_statistics_report=\u0414\u0430\u0441\u0442\u0443\u0440 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430\u0441\u0438 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u0438
+program_statistics=\u0414\u0430\u0441\u0442\u0443\u0440 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430\u0441\u0438
+program_statistics_description=\u041c\u0443\u0430\u0439\u044f\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u0443\u0447\u0443\u043d \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u043d\u0433. \u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u0434\u0430 \u0430\u043a\u0441 \u044d\u0442\u0442\u0438\u0440\u0438\u043b\u0430\u0434\u0438, \u043c\u0438\u0441\u043e\u043b \u0443\u0447\u0443\u043d, \u043c\u0430\u044a\u043b\u0443\u043c \u0434\u0430\u0432\u0440\u0434\u0430 \u043c\u0430\u044a\u043b\u0443\u043c \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c\u0434\u0430 \u045e\u049b\u0443\u0432 \u043c\u0430\u0448\u0493\u0443\u043b\u043e\u0442\u043b\u0430\u0440\u0438 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u0438, \u045e\u049b\u0443\u0432 \u043a\u0443\u0440\u0441\u0438\u043d\u0438 \u0442\u0430\u0440\u043a \u044d\u0442\u0433\u0430\u043d\u043b\u0430\u0440 \u0432\u0430 \u043c\u0443\u0432\u0430\u0444\u0444\u0430\u049b\u0438\u044f\u0442\u043b\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u0433\u0430\u043d\u043b\u0430\u0440
+upcoming_events=\u041a\u0435\u043b\u0433\u0443\u0441\u0438 \u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+upcoming_events_description=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u0432\u0430 \u0434\u0430\u0432\u0440 \u043c\u043e\u0431\u0430\u0439\u043d\u0438\u0434\u0430 \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441\u043b\u0430\u0440 \u0432\u0430 \u0443\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0431\u045e\u043b\u0493\u0443\u0441\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0430\u0434\u0438\u0433\u0430\u043d \u04b3\u0438\u0441\u043e\u0431\u043e\u0442\u043d\u0438 \u0436\u0430\u0434\u0432\u0430\u043b \u043a\u045e\u0440\u0438\u043d\u0438\u0448\u0438\u0434\u0430 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u043d\u0433. \u0423\u0441\u0442\u0443\u043d\u043b\u0430\u0440 \u0431\u045e\u0439\u043b\u0430\u0431 \u049b\u0438\u0434\u0438\u0440\u0443\u0432, \u0441\u0430\u0440\u0430\u043b\u0430\u0448 \u0432\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f\u043b\u0430\u0440\u0438 \u0431\u045e\u043b\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d.
+overdue_events=\u041a\u0435\u0447\u0438\u043a\u043a\u0430\u043d \u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+overdue_events_description=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440 \u0443\u0447\u0443\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0440\u045e\u0439\u0445\u0430\u0442\u0438\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u043d\u0433.  \u04b2\u0438\u0441\u043e\u0431\u043e\u0442\u0434\u0430 \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441\u043b\u0430\u0440 \u0440\u045e\u0439\u0445\u0430\u0442\u0438 \u0432\u0430 \u045e\u0437 \u0432\u0430\u049b\u0442\u0438\u0434\u0430 \u0431\u0430\u0436\u0430\u0440\u0438\u043b\u043c\u0430\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043b\u0430\u0434\u0438. \u0428\u0443\u043d\u0438\u043d\u0433\u0434\u0435\u043a \u0441\u0430\u0440\u0430\u043b\u0430\u0448 \u0432\u0430 \u049b\u0438\u0434\u0438\u0440\u0443\u0432 \u04b3\u0430\u043c \u0431\u045e\u043b\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d.
+enrollment_stats=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430\u0441\u0438
+event_stats=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430\u0441\u0438
+upcoming_event=\u041a\u0435\u043b\u0433\u0443\u0441\u0438 \u0442\u0430\u0434\u0431\u0438\u0440
+legend=\u0422\u0430\u044a\u0440\u0438\u0444
+event_color_legend=\u0420\u0430\u043d\u0433\u043b\u0430\u0440 \u043d\u0438\u043c\u0430\u043d\u0438 \u0430\u043d\u0433\u043b\u0430\u0442\u0430\u0434\u0438?
+report=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442
+_report=\u04b3\u0438\u0441\u043e\u0431\u043e\u0442
+visit_schedule=\u0420\u0435\u0436\u0430\u043d\u0438 \u043a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u0448
+mark_for_followup=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u0443\u0447\u0443\u043d \u0431\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u0433
+unmark_for_followup=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u043d \u0447\u0438\u049b\u0430\u0440\u0438\u043d\u0433
+only_marked_for_followup=\u0424\u0430\u049b\u0430\u0442 \u043a\u0443\u0437\u0430\u0442\u0443\u0432 \u0443\u0447\u0443\u043d \u0431\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u0433
+registered_data=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433\u0430\u043d\u0434\u0430\u0433\u0438 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440
+no_value=\u049a\u0438\u0439\u043c\u0430\u0442 \u0439\u045e\u049b
+no_data_found=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438
+no_data=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u0439\u045e\u049b
+mo_matching_data=No data matching your search criteria
+data_exists=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434
+data_registerd=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u049b\u0430\u0439\u0434 \u044d\u0442\u0438\u043b\u043c\u0430\u0433\u0430\u043d
+no_visit_made=\u049a\u0430\u0431\u0443\u043b \u0439\u045e\u049b
+visit_not_made=\u049a\u0430\u0431\u0443\u043b \u049b\u0438\u043b\u0438\u043d\u043c\u0430\u0434\u0438
+_visit=\u0442\u0430\u0448\u0440\u0438\u0444
+visit=\u0422\u0430\u0448\u0440\u0438\u0444
+visits=\u0422\u0430\u0448\u0440\u0438\u0444\u043b\u0430\u0440
+current_selections=\u0416\u043e\u0440\u0438\u0439 \u0442\u0430\u043d\u043b\u043e\u0432\u043b\u0430\u0440
+activePrograms=\u0424\u0430\u043e\u043b \u0434\u0430\u0441\u0442\u0443\u0440\u043b\u0430\u0440
+set_as_current=\u0416\u043e\u0440\u0438\u0439 \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u0436\u043e\u0439\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+org_unit=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c
+org_unit_scope=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u04b3\u0443\u049b\u0443\u049b \u0432\u0430 \u0431\u0443\u0440\u0447\u043b\u0430\u0440\u0438
+SELECTED=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d
+CHILDREN=\u0411\u0435\u0432\u043e\u0441\u0438\u0442\u0430 \u0431\u043e\u043b\u0430\u043b\u0430\u0440
+DESCENDANTS=\u0411\u0430\u0440\u0447\u0430 \u0431\u043e\u043b\u0430\u043b\u0430\u0440
+ACCESSIBLE=\u0411\u0430\u0440\u0447\u0430\u0433\u0430 \u043a\u0438\u0440\u0438\u0448 \u043c\u0443\u043c\u043a\u0438\u043d
+data_element=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438
+value=\u049a\u0438\u0439\u043c\u0430\u0442
+provided_elsewhere=\u0411\u043e\u0448\u049b\u0430 \u0436\u043e\u0439\u043b\u0430\u0440\u0433\u0430 \u0442\u0430\u049b\u0434\u0438\u043c \u044d\u0442\u0438\u043b\u0433\u0430\u043d
+expand=\u041a\u0435\u043d\u0433\u0430\u0439\u0442\u0438\u0440\u0438\u043d\u0433
+collapse=\u0419\u0438\u049b\u0438\u043b\u0438\u0448
+show_hide_columns=\u0423\u0441\u0442\u0443\u043d\u043b\u0430\u0440 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+select_columns_to_show=\u0423\u0441\u0442\u0443\u043d\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+show_hide_widgets=\u0412\u0438\u0434\u0436\u0435\u0442\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+select_widgets_to_show=\u0412\u0438\u0434\u0436\u0435\u0442\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+audit_history=\u0410\u0443\u0434\u0438\u0442 \u0442\u0430\u0440\u0438\u0445\u0438
+hide_widget=\u0412\u0438\u0434\u0436\u0435\u0442\u043d\u0438 \u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+show_widget=\u0412\u0438\u0434\u0436\u0435\u0442\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+hide_column=\u0423\u0441\u0442\u0443\u043d\u043d\u0438 \u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+show_column=\u0423\u0441\u0442\u0443\u043d\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+close=\u0401\u043f\u043c\u043e\u049b
+generate=\u042f\u0440\u0430\u0442\u0438\u043d\u0433
+print=\u0427\u043e\u043f \u044d\u0442\u0438\u0448
+excel_export=Excel \u0433\u0430 \u044d\u043a\u0441\u043f\u043e\u0440\u0442
+download=\u042e\u043a\u043b\u0430\u0448, \u049b\u0430\u0439\u0441\u0438\u0434\u0438\u0440 \u0441\u0438\u0444\u0430\u0442\u0434\u0430
+export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
+csv=CSV
+json=JSON
+xml=XML
+list_programs=\u0414\u0430\u0441\u0442\u0443\u0440\u043b\u0430\u0440 \u0440\u045e\u0439\u0445\u0430\u0442\u0438
+program_stage=\u0414\u0430\u0441\u0442\u0443\u0440 \u0431\u043e\u0441\u049b\u0438\u0447\u0438
+due_date=\u041c\u0443\u0434\u0434\u0430\u0442\u0438
+event_date=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0422\u0430\u0434\u0431\u0438\u0440 \u0441\u0430\u043d\u0430\u0441\u0438
+report_date=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442 \u0441\u0430\u043d\u0430\u0441\u0438
+enable_rescheduling=\u049a\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448\u0433\u0430 \u0440\u0443\u0445\u0441\u0430\u0442
+disable_rescheduling=\u049a\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448 \u045e\u0447\u0438\u0440\u0438\u043b\u0433\u0430\u043d
+show_hide_scheduling=\u0420\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448 \u0448\u0430\u043a\u043b\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+show_hide_notes=\u0418\u0437\u043e\u04b3 \u0448\u0430\u043a\u043b\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+show_hide_messaging=\u0425\u0430\u0431\u0430\u0440 \u0448\u0430\u043a\u043b\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448/\u0431\u0435\u0440\u043a\u0438\u0442\u0438\u0448
+messaging=\u0425\u0430\u0431\u0430\u0440 \u0430\u043b\u043c\u0430\u0448\u0438\u043d\u0443\u0432\u0438
+scheduling=\u0420\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+reschedule_duedate=\u0410\u043c\u0430\u043b \u049b\u0438\u043b\u0438\u0448 \u043c\u0443\u0434\u0434\u0430\u0442\u0438\u043d\u0438 \u049b\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+reschedule=\u049a\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u043d\u0433
+rescheduling=\u049a\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+scheduling_messaging=\u0420\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448 \u0432\u0430 \u0445\u0430\u0431\u0430\u0440\u043b\u0430\u0448\u0438\u0448
+not_yet_enrolled_scheduling=\u0410\u0444\u0441\u0443\u0441 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u043c\u0430\u0434\u0438, \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+schedule_details=\u0420\u0435\u0436\u0430 \u0442\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u043b\u0430\u0440\u0438
+no_event_to_schedule=\u0420\u0435\u0436\u0430\u0434\u0430 \u0442\u0430\u0434\u0431\u0438\u0440 \u0439\u045e\u049b
+enroll=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043a\u0438\u0440\u0438\u0442\u0438\u0448
+new_enrollment=\u042f\u043d\u0433\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448
+start_date=\u0411\u043e\u0448\u043b\u0430\u043d\u0438\u0448 \u0441\u0430\u043d\u0430\u0441\u0438
+end_date=\u042f\u043a\u0443\u043d\u043b\u0430\u043d\u0438\u0448 \u0441\u0430\u043d\u0430\u0441\u0438
+from=\u041a\u0438\u043c\u0434\u0430\u043d
+to=\u041a\u0438\u043c\u0433\u0430
+exact_date=\u0410\u043d\u0438\u049b \u0441\u0430\u043d\u0430
+exact_value=\u0410\u043d\u0438\u049b \u049b\u0438\u0439\u043c\u0430\u0442
+EQ=\u0422\u0435\u043d\u0433
+GT=\u0423\u043d\u0434\u0430\u043d \u043a\u0430\u0442\u0442\u0430\u0440\u043e\u049b
+GE=\u0423\u043d\u0434\u0430\u043d \u043a\u0430\u0442\u0442\u0430\u0440\u043e\u049b \u0451\u043a\u0438 \u0442\u0435\u043d\u0433
+LT=\u0423\u043d\u0434\u0430\u043d \u043a\u0430\u043c\u0440\u043e\u049b
+LE=\u0423\u043d\u0434\u0430\u043d \u043a\u0430\u043c\u0440\u043e\u049b \u0451\u043a\u0438 \u0442\u0435\u043d\u0433
+NE=\u0422\u0435\u043d\u0433 \u044d\u043c\u0430\u0441
+IS=\u0428\u0443\u043d\u0434\u0430\u0439
+RANGE=\u041e\u0440\u0430\u043b\u0438\u049b
+like=\u041a\u0430\u0431\u0438, \u045e\u0445\u0448\u0430\u0448
+not_like=\u0401\u049b\u043c\u0430\u0439\u0434\u0438
+boolean=\u041c\u0430\u043d\u0442\u0438\u049b\u0438\u0439
+yes=\u04b2\u0430
+no=\u0419\u045e\u049b
+records=\u0401\u0437\u0443\u0432\u043b\u0430\u0440
+record=\u0401\u0437\u0438\u0431 \u043e\u043b\u0438\u0448
+_record=\u0451\u0437\u0438\u0431 \u043e\u043b\u0438\u0448
+_records=\u0451\u0437\u0443\u0432\u043b\u0430\u0440
+found=\u0422\u043e\u043f\u0438\u043b\u0434\u0438
+move_to_selected=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0442\u043e\u043c\u043e\u043d\u0433\u0430 \u043a\u045e\u0447\u0438\u0440\u0438\u0448
+move_all_to_selected=\u0411\u0430\u0440\u0447\u0430\u0441\u0438\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0442\u043e\u043c\u043e\u043d\u0433\u0430 \u043a\u045e\u0447\u0438\u0440\u0438\u0448
+current=\u0416\u043e\u0440\u0438\u0439
+new=\u042f\u043d\u0433\u0438
+add_new=\u042f\u043d\u0433\u0438\u0441\u0438\u043d\u0438 \u049b\u045e\u0448\u0438\u0448
+registration=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448
+registration_date=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433\u0430\u043d \u0441\u0430\u043d\u0430
+register=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448
+_register=\u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448
+enrollment_error=\u0420\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+registration_error=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+update_error=\u042f\u043d\u0433\u0438\u043b\u0430\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a \u044e\u0437 \u0431\u0435\u0440\u0434\u0438
+register_error=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+event_creation_error=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+relationship_error=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u0431\u0435\u043b\u0433\u0438\u043b\u0430\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+tracker_associate_error=\u041a\u0443\u0437\u0430\u0442\u0443\u0432 \u0430\u0441\u0441\u043e\u0441\u0438\u0430\u0446\u0438\u044f\u043b\u0430\u0440\u0438\u043d\u0438 \u0442\u0430\u0439\u0438\u043d\u043b\u0430\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+searching_error=\u049a\u0438\u0434\u0438\u0440\u0443\u0432\u0434\u0430 \u0445\u0430\u0442\u043e
+form_invalid=\u0428\u0430\u043a\u043b \u043d\u043e\u0442\u045e\u0493\u0440\u0438. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0442\u0430\u043b\u0430\u0431 \u049b\u0438\u043b\u0438\u043d\u0433\u0430\u043d \u0441\u043e\u04b3\u0430\u043b\u0430\u0440\u043d\u0438 \u0442\u0435\u043a\u0448\u0438\u0440\u0438\u043d\u0433
+no_entity_for_tracker_associate_attribute=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0434\u0430 \u044f\u0440\u043e\u049b\u0441\u0438\u0437 \u043a\u0443\u0437\u0430\u0442\u0443\u0432 \u0431\u0438\u0440\u043b\u0438\u0433\u0438 \u043c\u0430\u0432\u0436\u0443\u0434
+errors=\u0425\u0430\u0442\u043e\u043b\u0438\u043a\u043b\u0430\u0440
+error=\u0425\u0430\u0442\u043e\u043b\u0438\u043a
+warning=\u041e\u0433\u043e\u04b3\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448
+success=\u041c\u0443\u0432\u0430\u0444\u0444\u0430\u049b\u0438\u044f\u0442
+unable_to_fetch_data_from_server=\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0430\u043d \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u0431\u045e\u043b\u043c\u0430\u0434\u0438
+access_denied=\u041a\u0438\u0440\u0438\u0448 \u0442\u0430\u044a\u049b\u0438\u049b\u043b\u0430\u043d\u0434\u0438
+registration_complete=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0434\u0438
+auto_generate_failed=\u0410\u0442\u0440\u0438\u0431\u0443\u0442(\u043b\u0430\u0440) \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u043a \u044f\u0440\u0430\u0442\u0438\u043b\u043c\u0430\u0433\u0430\u043d\u043b\u0438\u0433\u0438 \u0441\u0430\u0431\u0430\u0431\u043b\u0438, \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a \u044e\u0437 \u0431\u0435\u0440\u0434\u0438.
+validation_error=\u0422\u0430\u0441\u0434\u0438\u049b\u043b\u0430\u0448\u0434\u0430 \u0425\u0430\u0442\u043e\u043b\u0438\u043a
+event_orgunit_name=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c
+category=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f
+entity_type=\u041c\u0443\u0430\u0441\u0441\u0430\u0441\u0430 \u0442\u0443\u0440\u0438
+save=\u0421\u0430\u049b\u043b\u0430\u0448
+save_and_add_new=\u0421\u0430\u049b\u043b\u0430\u0448 \u0432\u0430 \u044f\u043d\u0433\u0438\u0441\u0438\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448\u0433\u0430 \u045e\u0442\u0438\u0448
+save_and_go_back=\u0421\u0430\u049b\u043b\u0430\u043d\u0433 \u0432\u0430 \u043e\u0440\u049b\u0430\u0433\u0430 \u049b\u0430\u0439\u0442\u0438\u043d\u0433
+save_and_continue=\u0421\u0430\u049b\u043b\u0430\u0448 \u0432\u0430 \u0434\u0430\u0432\u043e\u043c \u044d\u0442\u0438\u0448
+save_relationship=\u0410\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u043d\u0433
+delete_relationship=\u0410\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u043d\u0433
+can_not_delete_relationship=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u0440\u0443\u0445\u0441\u0430\u0442 \u0439\u045e\u049b\u043b\u0438\u0433\u0438 \u0441\u0430\u0431\u0430\u0431\u043b\u0438 \u045e\u0437\u0430\u0440\u043e \u0431\u043e\u0493\u043b\u0438\u049b \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438.
+go_back=\u041e\u0440\u049b\u0430\u0433\u0430 \u049b\u0430\u0439\u0442\u0438\u043d\u0433
+cancel=\u0411\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u0448
+are_you_sure_to_delete_relationship=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0443\u0448\u0431\u0443 \u045e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043d\u0438 \u045e\u0447\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_delete_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433\u0430\u043d\u043b\u0430\u0440\u0434\u0430\u043d \u0443\u0448\u0431\u0443 \u0442\u0430\u043d\u043b\u0430\u0433\u0430\u043d\u0438\u043d\u0433\u0438\u0437\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0448\u043d\u0438 \u0445\u043e\u0445\u043b\u0430\u0439\u0441\u0438\u0437\u043c\u0438? \u0411\u0443 \u04b3\u0430\u0440\u0430\u043a\u0430\u0442 \u0430\u0441\u0441\u043e\u0446\u0438\u0440\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u04b3\u0430\u043c \u045e\u0447\u0438\u0440\u0438\u043b\u0438\u0448\u0438\u0433\u0430 \u043e\u043b\u0438\u0431 \u043a\u0435\u043b\u0430\u0434\u0438.
+would_you_like_to_complete_enrollment=\u0416\u0430\u0440\u0430\u0451\u043d\u0434\u0430\u0433\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u043d\u0438 \u0442\u0443\u0433\u0430\u0442\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_complete_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0442\u0443\u0433\u0430\u0442\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_deactivate_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0444\u0430\u043e\u043b\u0441\u0438\u0437\u043b\u0430\u043d\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_activate_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0444\u0430\u043e\u043b\u043b\u0430\u0448\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_reopen_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u049b\u0430\u0439\u0442\u0430 \u043e\u0447\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_delete_event=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_delete_event_with_audit=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u043e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437? \u0411\u0443 \u0448\u0443\u043d\u0438\u043d\u0433\u0434\u0435\u043a \u0431\u0430\u0440\u0447\u0430 \u045e\u0437\u0430\u0440\u043e \u0431\u043e\u0493\u043b\u0430\u043d\u0433\u0430\u043d \u0430\u0443\u0434\u0438\u0442 \u049b\u0438\u0439\u043c\u0430\u0442\u043b\u0430\u0440\u0438\u043d\u0438\u043d\u0433 \u045e\u0447\u0438\u0440\u0438\u043b\u0438\u0448\u0438\u0433\u0430 \u043e\u043b\u0438\u0431 \u043a\u0435\u043b\u0430\u0434\u0438.
+are_you_sure_to_complete_event=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u0442\u0443\u0433\u0430\u0442\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+please_fix_errors_before_completing=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u0442\u0443\u0433\u0430\u0442\u0438\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u049b\u0443\u0439\u0438\u0434\u0430\u0433\u0438 \u0445\u0430\u0442\u043e\u043b\u0430\u0440\u043d\u0438 \u049b\u0430\u0439\u0442\u0430 \u043a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u043d\u0433:
+are_you_sure_to_incomplete_event=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u04b3\u0440\u0438\u0440\u043b\u0430\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_skip_event=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u045e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_unskip_event=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0442\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u049b\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+do_you_want_to_proceed=\u042f\u0440\u043e\u049b\u0441\u0438\u0437 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u044f\u043b\u0430\u0440 \u0431\u0438\u043b\u0430\u043d \u0438\u0448\u043d\u0438 \u044d\u0442\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_proceed=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0434\u0430\u0432\u043e\u043c \u044d\u0442\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+will_delete_all_data_associated=\u0423\u0448\u0431\u0443 \u0431\u0438\u043b\u0430\u043d \u0430\u0441\u0441\u043e\u0446\u0438\u0440\u043b\u0430\u043d\u0433\u0430\u043d \u0411\u0410\u0420\u0427\u0410 \u041c\u0410\u042a\u041b\u0423\u041c\u041e\u0422\u041b\u0410\u0420 \u045e\u0447\u0438\u0440\u0438\u043b\u0430\u0434\u0438
+more=\u041a\u045e\u043f\u0440\u043e\u049b
+under_construction=\u0418\u0448\u043b\u0430\u0431 \u0447\u0438\u049b\u0438\u0448 \u0436\u0430\u0440\u0430\u0451\u043d\u0438\u0434\u0430
+advanced_search=\u041a\u0435\u043d\u0433\u0430\u0439\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d \u049b\u0438\u0434\u0438\u0440\u0443\u0432
+profile=\u041f\u0440\u043e\u0444\u0438\u043b
+applications=\u0418\u043b\u043e\u0432\u0430
+more_applications=\u042f\u043d\u0430 \u0431\u043e\u0448\u049b\u0430 \u0438\u043b\u043e\u0432\u0430\u043b\u0430\u0440
+manage=\u0411\u043e\u0448\u049b\u0430\u0440\u0438\u0448
+settings=\u0421\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440
+account=\u0420\u0430\u049b\u0430\u043c\u0438
+help=\u0401\u0440\u0434\u0430\u043c
+log_out=\u0427\u0438\u049b\u0438\u0448
+about_dhis2=DHIS2 \u04b3\u0430\u049b\u0438\u0434\u0430
+missing_translation_file=\u0422\u0430\u0440\u0436\u0438\u043c\u0430 \u0444\u0430\u0439\u043b\u0438 \u0435\u0442\u0438\u0448\u043c\u0430\u044f\u043f\u0442\u0438
+missing_translation_using_default=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u043b\u043e\u043a\u0430\u043b \u0443\u0447\u0443\u043d \u0442\u0430\u0440\u0436\u0438\u043c\u0430 \u0444\u0430\u0439\u043b\u0438 \u0439\u045e\u049b. \u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0442\u0438\u043b \u0438\u0448\u043b\u0430\u0442\u0438\u043b\u0430\u0434\u0438 (\u0418\u043d\u0433\u043b\u0438\u0437).
+loading_tree=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0434\u0430\u0440\u0430\u0445\u0442\u0438 (\u0448\u0430\u0436\u0430\u0440\u0430\u0441\u0438) \u044e\u043a\u043b\u0430\u043d\u043c\u043e\u049b\u0434\u0430
+loading_metadata=\u041c\u0435\u0442\u0430-\u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u044e\u043a\u043b\u0430\u043d\u043c\u043e\u049b\u0434\u0430
+loading_components=\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043b\u0430\u0440 \u044e\u043a\u043b\u0430\u043d\u043c\u043e\u049b\u0434\u0430
+latitude=\u041a\u0435\u043d\u0433\u043b\u0438\u043a
+longitude=\u0423\u0437\u0443\u043d\u043b\u0438\u043a
+lat_lng=[\u041a\u0435\u043d\u0433\u043b\u0438\u043a \u0423\u0437\u0443\u043d\u043b\u0438\u043a]
+get=\u041e\u043b\u0438\u0448
+get_from_map=\u0425\u0430\u0440\u0438\u0442\u0430\u0434\u0430\u043d \u043e\u043b\u0438\u0448
+capture=\u041d\u0430\u0437\u043e\u0440\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448
+nothing_captured=\u04b2\u0435\u0447 \u043d\u0430\u0440\u0441\u0430 \u043d\u0430\u0437\u043e\u0440\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u043c\u0430\u0434\u0438
+point_and_click_for_coordinate=\u0416\u043e\u0439\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u0441\u0438\u0447\u049b\u043e\u043d\u0447\u0430\u043d\u0438\u043d\u0433 \u045e\u043d\u0433 \u0442\u0443\u0433\u043c\u0430\u0441\u0438\u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433
+value_must_be_between=\u049a\u0438\u0439\u043c\u0430\u0442 \u043e\u0440\u0430\u0441\u0438\u0434\u0430 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+locate_organisation_unit_by_name=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c\u043d\u0438 \u043d\u043e\u043c\u0438 \u043e\u0440\u049b\u0430\u043b\u0438 \u0442\u043e\u043f\u0438\u0448
+dashboard_layout_saved=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438 \u0441\u0430\u049b\u043b\u0430\u043d\u0434\u0438
+dashboard_layout_saved_as_default=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u0441\u0430\u049b\u043b\u0430\u043d\u0434\u0438
+dashboard_layout_not_saved=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438 \u0441\u0430\u049b\u043b\u0430\u043d\u043c\u0430\u0434\u0438
+dashboard_layout_not_saved_as_default=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u0441\u0430\u049b\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+dashboard_layout_not_fetched=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438\u043d\u0438 \u043e\u043b\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_fetch_enrollment=\u049a\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430\u043d \u043e\u043b\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_save_enrollment=\u049a\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430 \u0441\u0430\u049b\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_update_enrollment=\u049a\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430 \u044f\u043d\u0433\u0438\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+ou_search_scope=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u04b3\u0443\u049b\u0443\u049b \u0432\u0430 \u0431\u0443\u0440\u0447\u043b\u0430\u0440\u0438
+zoom_in=\u042f\u049b\u0438\u043d\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+zoom_out=\u0423\u0437\u043e\u049b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+center_map=\u0425\u0430\u0440\u0438\u0442\u0430\u043d\u0438 \u043c\u0430\u0440\u043a\u0430\u0437\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+set_coordinate=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0430\u043d\u0438 \u045e\u0440\u043d\u0430\u0442\u0438\u043d\u0433
+coordinate=\u041c\u0443\u0432\u043e\u0444\u0438\u049b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+show_active_only=\u0424\u0430\u049b\u0430\u0442 \u0444\u0430\u043e\u043b \u0431\u045e\u043b\u0433\u0430\u043d\u043b\u0430\u0440\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043d\u0433
+all_enrollment=\u04b2\u0430\u0440 \u049b\u0430\u043d\u0434\u0430\u0439 \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448 \u04b3\u043e\u043b\u0430\u0442\u0438
+active_enrollment=\u0424\u0430\u049b\u0430\u0442 \u0444\u0430\u043e\u043b \u049b\u0430\u0439\u0434\u0434\u0430\u0433\u0438\u043b\u0430\u0440
+cancelled_enrollment=\u0424\u0430\u049b\u0430\u0442 \u049b\u0430\u0439\u0434 \u0431\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u043d\u0433\u0430\u043d\u043b\u0430\u0440
+completed_enrollment=\u0424\u0430\u049b\u0430\u0442 \u049b\u0430\u0439\u0434 \u0442\u0443\u0433\u0430\u043b\u043b\u0430\u043d\u0433\u0430\u043d\u043b\u0430\u0440
+filter_events=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0444\u0438\u043b\u044c\u0442\u0440\u043b\u0430\u0448
+list_events=\u0411\u0430\u0440\u0447\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u0441\u0430\u043d\u0430\u0431 \u045e\u0442\u0438\u0448
+prev_period=\u041e\u043b\u0434\u0438\u043d\u0433\u0438 \u0434\u0430\u0432\u0440\u043b\u0430\u0440
+nxt_period=\u041a\u0435\u0439\u0438\u043d\u0433\u0438 \u0434\u0430\u0432\u0440\u043b\u0430\u0440
+period=\u0414\u0430\u0432\u0440
+jan=\u042f\u043d\u0432\u0430\u0440\u044c
+feb=\u0424\u0435\u0432\u0440\u0430\u043b\u044c
+mar=\u041c\u0430\u0440\u0442
+apr=\u0410\u043f\u0440\u0435\u043b\u044c
+may=\u041c\u0430\u0439
+jun=\u0418\u044e\u043d\u044c
+jul=\u0418\u044e\u043b\u044c
+aug=\u0410\u0432\u0433\u0443\u0441\u0442
+sep=\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c
+oct=\u041e\u043a\u0442\u044f\u0431\u0440\u044c
+nov=\u041d\u043e\u044f\u0431\u0440\u044c
+dec=\u0414\u0435\u043a\u0430\u0431\u0440\u044c
+week=\u04b2\u0430\u0444\u0442\u0430
+save_layout_as_default=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u0441\u0430\u049b\u043b\u0430\u043d\u0434\u0438
+reset_layout=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u0442\u0430\u0440\u0442\u0438\u0431\u0438\u043d\u0438 \u0442\u0438\u043a\u043b\u0430\u0448
+is_expected_to_be=\u0431\u045e\u043b\u0438\u0448\u0438 \u043a\u0443\u0442\u0438\u043b\u043c\u043e\u049b\u0434\u0430
+but_found=\u0430\u043c\u043c\u043e \u0442\u043e\u043f\u0438\u043b\u0434\u0438
+equals_to=\u0433\u0430 \u0442\u0435\u043d\u0433
+less_than=\u0434\u0430\u043d \u043a\u0430\u043c
+greater_than=\u0434\u0430\u043d \u043a\u0430\u0442\u0442\u0430
+inactive=\u0424\u0430\u043e\u043b \u044d\u043c\u0430\u0441
+activate=\u0424\u0430\u043e\u043b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+deactivate=\u0424\u0430\u043e\u043b\u0441\u0438\u0437\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448
+tei_inactive_only_read=\u0444\u0430\u043e\u043b \u044d\u043c\u0430\u0441. \u0424\u0430\u049b\u0430\u0442 \u045e\u049b\u0438\u0448 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f\u043b\u0430\u0440\u0438\u0433\u0430 \u0440\u0443\u0445\u0441\u0430\u0442 \u0431\u0435\u0440\u0438\u043b\u0433\u0430\u043d.
+hide_menu=\u041c\u0435\u043d\u044e \u0431\u0435\u0440\u043a\u0438\u0442\u0438\u043b\u0441\u0438\u043d
+extend_menu=\u041c\u0435\u043d\u044e\u043d\u0438 \u043a\u0435\u043d\u0433\u0430\u0439\u0442\u0438\u0440\u0438\u0448
+show_main_menu=\u0410\u0441\u043e\u0441\u0438\u0439 \u043c\u0435\u043d\u044e\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+stick_right_widgets=\u040e\u043d\u0433 \u0442\u043e\u043c\u043e\u043d\u0434\u0430\u0433\u0438 \u0432\u0438\u0434\u0436\u0435\u0442\u043b\u0430\u0440\u043d\u0438 \u0436\u043e\u0439\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448
+unstick_right_widgets=\u040e\u043d\u0433 \u0442\u043e\u043c\u043d\u0434\u0430\u0433\u0438 \u0432\u0438\u0434\u0436\u0435\u0442\u043b\u0430\u0440\u043d\u0438 \u0435\u0447\u0438\u0431 \u043e\u043b\u0438\u043d\u0433
+existing_associate=\u041c\u0430\u0432\u0436\u0443\u0434 \u0448\u0435\u0440\u0438\u043a
+value_not_unique=\u049a\u0438\u0439\u043c\u0430\u0442 \u043d\u043e\u0451\u0431 \u044d\u043c\u0430\u0441
+custom_form_has_invalid_attribute=\u041c\u0430\u0445\u0441\u0443\u0441 \u0448\u0430\u043a\u043b \u044f\u0440\u043e\u049b\u0441\u0438\u0437 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0433\u0430 \u044d\u0433\u0430.
+custom_form_has_invalid_dataelement=\u041c\u0430\u0445\u0441\u0443\u0441 \u0448\u0430\u043a\u043b \u044f\u0440\u043e\u049b\u0441\u0438\u0437 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438\u0433\u0430 \u044d\u0433\u0430.
+events_today_persons=\u0424\u0430\u049b\u0430\u0442 \u0431\u0443\u0433\u0443\u043d\u0434\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u0431\u043e\u043b\u0430\u0440
+section_has_no_dataelements=\u0421\u0435\u043a\u0441\u0438\u044f\u0434\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0439\u045e\u049b
+section=\u0411\u045e\u043b\u0438\u043c
+display_mode=\u042d\u043a\u0440\u0430\u043d\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0440\u0435\u0436\u0438\u043c\u0438
+tracker_capture_display_mode=\u041a\u0443\u0437\u0430\u0442\u0443\u0432-\u043d\u0430\u0437\u043e\u0440\u0430\u0442 \u0434\u0438\u0441\u043f\u043b\u0435\u0439\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0440\u0435\u0436\u0438\u043c\u0438
+events_today_all=\u0411\u0430\u0440\u0447\u0430 \u0431\u0443\u0433\u0443\u043d\u0433\u0438 \u04b3\u043e\u043b\u0430\u0442/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+events_today_completeoractive=\u0422\u045e\u043b\u0438\u049b \u0451\u043a\u0438 \u0444\u0430\u043e\u043b
+events_today_skipped=\u040e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u043b\u0434\u0438
+events_today_scheduled=\u0420\u0435\u0436\u0430 \u0431\u045e\u0439\u0438\u0447\u0430
+multiple_records_warning=\u0411\u0438\u0440 \u043d\u0435\u0447\u0430 \u049b\u0430\u0439\u0434\u043b\u0430\u0440 \u0442\u043e\u043f\u0438\u043b\u0434\u0438. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u044f\u043d\u0430\u0434\u0430 \u0430\u043d\u0438\u049b\u0440\u043e\u049b \u0431\u045e\u043b\u0438\u043d\u0433.
+result=\u041d\u0430\u0442\u0438\u0436\u0430
+no_record_found=\u0401\u0437\u0443\u0432 \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438
+no_record_found_create=\u0401\u0437\u0443\u0432 \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438. \u042f\u043d\u0433\u0438 \u0451\u0437\u0443\u0432 \u044f\u0440\u0430\u0442\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+print_form=\u0427\u043e\u043f \u044d\u0442\u0438\u0448 \u0448\u0430\u043a\u043b\u0438
+value_must_be_email=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u044f\u0440\u043e\u049b\u043b\u0438 \u0435-\u043f\u043e\u0447\u0442\u0430 \u043c\u0430\u0437\u0438\u043b\u0438\u043d\u0433\u0438\u0437\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u043d\u0433
+click_to_edit_view_complete_notes=\u0418\u0437\u043e\u04b3\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0442\u0430\u04b3\u0440\u0438\u0440/\u043a\u045e\u0440\u0438\u0448 \u0442\u0443\u0433\u043c\u0430\u0441\u0438\u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433
+complete_and_exit =\u042f\u043a\u0443\u043d\u043b\u0430\u0448 \u0432\u0430 \u0447\u0438\u049b\u0438\u0448
+are_you_sure_to_cancel_editing=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0443\u0448\u0431\u0443 \u043f\u0440\u043e\u0444\u0438\u043b \u0442\u0430\u04b3\u0440\u0438\u0440\u0438\u043d\u0438 \u045e\u0447\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+are_you_sure_to_cancel_registration=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0443\u0448\u0431\u0443 \u049b\u0430\u0439\u0434\u043d\u0438 \u0431\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+schedule=\u0420\u0435\u0436\u0430
+scheduled_date=\u0420\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d \u0441\u0430\u043d\u0430
+show_new_event_menu=\u042f\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u043c\u0435\u043d\u044e\u0441\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+no_stages_available=\u0411\u0430\u0440\u0447\u0430 \u043a\u0443\u0442\u0438\u043b\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u043c\u0430\u0432\u0436\u0443\u0434, \u043a\u045e\u043f\u0440\u043e\u049b \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u044f\u0440\u0430\u0442\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438.
+make_referral=\u0419\u045e\u043d\u0430\u043b\u0438\u0448 \u044f\u0440\u0430\u0442\u0438\u043d\u0433
+referral=\u0419\u045e\u043d\u0430\u043b\u0438\u0448\u043b\u0430\u0440\u0433\u0430
+show_previous=\u041e\u043b\u0434\u0438\u043d\u0433\u0438\u0441\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+show_next=\u041a\u0435\u0439\u0438\u043d\u0433\u0438\u0441\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+schedule_new=\u042f\u043d\u0433\u0438 \u0440\u0435\u0436\u0430 (\u0436\u0430\u0434\u0432\u0430\u043b)
+save_note=\u0418\u0437\u043e\u04b3\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u0448
+add_justification=\u0411\u0443 \u0435\u0440\u0433\u0430 \u0430\u0441\u043e\u0441 \u049b\u045e\u0448\u0438\u043d\u0433
+please_complete_all_results_before_add = \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u044f\u043d\u0433\u0438\u0441\u0438\u043d\u0438 \u049b\u045e\u0448\u0438\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u0431\u0430\u0440\u0447\u0430 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433
+please_complete_all_results_before_schedule = \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u044f\u043d\u0433\u0438 \u0440\u0435\u0436\u0430\u043d\u0438 \u049b\u045e\u0448\u0438\u0448\u0434\u0430\u043d \u0430\u0432\u0432\u0430\u043b \u0431\u0430\u0440\u0447\u0430 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433
+please_complete_all_results_before_referral = \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0430\u0432\u0432\u0430\u043b \u0431\u0430\u0440\u0447\u0430 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433
+no_designation=\u0411\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d
+main_menu=\u0410\u0441\u043e\u0441\u0438\u0439 \u043c\u0435\u043d\u044e
+complete_event_and_enrollment=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433 \u0432\u0430 \u049b\u0430\u0439\u0434 \u049b\u0438\u043b\u0438\u043d\u0433
+are_you_sure_to_complete_event_and_enrollment=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0443\u0448\u0431\u0443 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u0431 \u049b\u0430\u0439\u0434 \u049b\u0438\u043b\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+enrollment_is_not_active=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u043d\u043e\u0444\u0430\u043e\u043b
+please_complete_all_events=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0430\u0432\u0432\u0430\u043b \u0431\u0430\u0440\u0447\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0433
+scheduling_disabled_for_programstage=\u0414\u0430\u0441\u0442\u0443\u0440\u043d\u0438\u043d\u0433 \u0443\u0448\u0431\u0443 \u0431\u043e\u0441\u049b\u0438\u0447\u0438 \u0443\u0447\u0443\u043d \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u0448 \u045e\u0447\u0438\u0440\u0438\u0431 \u049b\u045e\u0439\u0438\u043b\u0433\u0430\u043d
+event_already_scheduled=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d
+programstage_multiple_events_disabled=\u0414\u0430\u0441\u0442\u0443\u0440 \u0443\u0448\u0431\u0443 \u0431\u043e\u0441\u049b\u0438\u0447\u0438\u0434\u0430 \u0431\u0438\u0440 \u043d\u0435\u0447\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u045e\u0442\u043a\u0430\u0437\u0438\u0448\u0433\u0430 \u0439\u045e\u043b \u049b\u045e\u0439\u043c\u0430\u0434\u0438
+event_cant_be_created=\u042f\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0434\u0438
+created=\u042f\u0440\u0430\u0442\u0438\u043b\u0433\u0430\u043d
+auditType=\u0410\u0443\u0434\u0438\u0442 \u0442\u0443\u0440\u0438
+modifiedBy=\u0422\u043e\u043c\u043e\u043d\u0438\u0434\u0430\u043d \u045e\u0437\u0433\u0430\u0440\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d
+audit_history_unavailable=\u0410\u0443\u0434\u0438\u0442 \u0442\u0430\u0440\u0438\u0445\u0438 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+delete_error_audit=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438, \u0447\u0443\u043d\u043a\u0438 \u0443\u043d\u0434\u0430 \u0430\u0443\u0434\u0438\u0442 \u0436\u0443\u0440\u043d\u0430\u043b\u043b\u0430\u0440\u0438 \u043c\u0430\u0432\u0436\u0443\u0434.
+are_you_sure_to_remove=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u043e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+completed_label=\u0422\u045e\u043b\u0434\u0438\u0440\u0438\u043b\u0434\u0438
+stage_completed=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0434\u0438
+stage_completed_label=\u0411\u0430\u0440\u0447\u0430\u0441\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0434\u0438
+executed=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u043d\u0438 \u043a\u0438\u0440\u0438\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u043e\u0447\u0438\u043b\u0433\u0430\u043d
+executed_label=\u041e\u0447\u0438\u049b
+stage_executed=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u043e\u0447\u0438\u049b
+stage_executed_label=\u0422\u043e\u043f\u0438\u043b\u043c\u0430 \u043e\u0447\u0438\u043b\u0434\u0438
+ontime=\u0420\u0435\u0436\u0430 \u0431\u045e\u0439\u0438\u0447\u0430
+ontime_label=\u0420\u0435\u0436\u0430 \u0431\u045e\u0439\u0438\u0447\u0430
+stage_ontime=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0434\u0438
+stage_ontime_label=\u0422\u043e\u043f\u0438\u043b\u043c\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d
+overdue=\u041c\u0443\u0434\u0434\u0430\u0442 \u045e\u0442\u0433\u0430\u043d
+overdue_label=\u041c\u0443\u0434\u0434\u0430\u0442 \u045e\u0442\u0433\u0430\u043d
+stage_overdue=\u04b2\u043e\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u043c\u0443\u0434\u0434\u0430\u0442\u0438 \u045e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u043b\u0433\u0430\u043d
+stage_overdue_label=\u0422\u043e\u043f\u0438\u043b\u043c\u0430 \u043c\u0443\u0434\u0434\u0430\u0442\u0438 \u045e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u043b\u0433\u0430\u043d
+skipped=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u045e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u043b\u0433\u0430\u043d
+skipped_label=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u045e\u0442\u043a\u0430\u0437\u0438\u0431 \u044e\u0431\u043e\u0440\u0438\u043b\u0433\u0430\u043d
+stage_empty=\u0411\u045e\u0448
+stage_empty_label=\u0411\u045e\u0448
+complete_active_events_before_completing_enrollment=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u0431\u0430\u0440\u0447\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u0442\u0443\u0433\u0430\u0442\u0438\u043d\u0433
+complete_enrollment_failed=\u0424\u0430\u0439\u043b \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0438\u0448\u0438 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+are_you_sure_to_complete_enrollment_delete_schedule=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u0443\u0448\u0431\u0443 \u049b\u0430\u0439\u0434\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437? \u041c\u0430\u0432\u0436\u0443\u0434 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d \u0432\u0430 \u043c\u0443\u0434\u0434\u0430\u0442\u0438 \u045e\u0442\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u045e\u0447\u0438\u0440\u0438\u043b\u0430\u0434\u0438
+no_active_enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u043d\u043e\u0444\u0430\u043e\u043b. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u049b\u0430\u0439\u0434 \u049b\u0438\u043b\u0438\u0448 \u0432\u0438\u0434\u0436\u0435\u0442\u0438\u0434\u0430\u043d \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0438\u043d\u0433.
+events_today=\u0411\u0443\u0433\u0443\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+events_in_one_week=\u04b2\u0430\u0444\u0442\u0430\u043b\u0438\u043a \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+events_in_two_weeks=\u0418\u043a\u043a\u0438 \u04b3\u0430\u0444\u0442\u0430\u043b\u0438\u043a \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+events_in_one_month=\u041e\u0439\u043b\u0438\u043a \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440
+choose_the_dates=\u0421\u0430\u043d\u0430\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433
+fill_all_category_options=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0431\u0430\u0440\u0447\u0430 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043d\u0433
+description=\u0422\u0430\u0432\u0441\u0438\u0444
+url=URL
+not_available=\u041c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+attribute=\u0410\u0442\u0440\u0438\u0431\u0443\u0442
+data_entry=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u043a\u0438\u0440\u0438\u0442\u0438\u0448
+invalid_coordinate_format=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0430\u043b\u0430\u0440 \u0444\u043e\u0440\u043c\u0430\u0442\u0438 \u043d\u043e\u0442\u045e\u0493\u0440\u0438
+latitude_longitude_format=\u0423\u0437\u0443\u043d\u043b\u0438\u043a, \u041a\u0435\u043d\u0433\u043b\u0438\u043a
+missing_search_ous=\u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438\u0433\u0430 \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c\u043b\u0430\u0440 \u0431\u0438\u0440\u0438\u043a\u0442\u0438\u0440\u0438\u043b\u043c\u0430\u0433\u0430\u043d
+cocbo_filter=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f \u0432\u0430 \u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043b\u0430\u0440\u0438 \u0444\u0438\u043b\u044c\u0442\u0440\u0438
+apply=\u041c\u0443\u0440\u043e\u0436\u0430\u0430\u0442 \u049b\u0438\u043b\u0438\u0448
+attribute_category_selection=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u0441\u0438\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u0448
+event_filter=\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u049b\u0438\u0439\u043c\u0430\u0442\u0438, \u0431\u043e\u0441\u049b\u0438\u0447\u0438 \u0451\u043a\u0438 \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u043d\u043e\u043c\u0438\u0433\u0430 \u043a\u045e\u0440\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0444\u0438\u043b\u044c\u0442\u0440\u0438
+validation_errors=\u0428\u0430\u043a\u043b\u0434\u0430\u0433\u0438 \u0436\u043e\u0440\u0438\u0439 \u0445\u0430\u0442\u043e\u043b\u0430\u0440:
+validation_warnings=\u0423\u0448\u0431\u0443 \u043e\u0433\u043e\u04b3\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448\u043b\u0430\u0440\u043d\u0438 \u044d\u0441\u0434\u0430 \u0442\u0443\u0442\u0438\u043d\u0433:
+openstreetmap=OpenStreetMap
+googlemap=Google \u0445\u0430\u0440\u0438\u0442\u0430\u043b\u0430\u0440
+missing_google_map_api_key=Google \u0425\u0430\u0440\u0438\u0442\u0430\u043b\u0430\u0440 API \u043a\u0430\u043b\u0438\u0442\u0438 \u0435\u0442\u0438\u0448\u043c\u0430\u044f\u043f\u0442\u0438. \u0411\u0443\u043d\u0438 \u0422\u0438\u0437\u0438\u043c \u0421\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440\u0438\u0434\u0430 \u0442\u045e\u0493\u0440\u0438\u043b\u0430\u0448 \u043c\u0443\u043c\u043a\u0438\u043d (\u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0438\u0448 \u04b3\u0443\u049b\u0443\u049b\u0438 \u0441\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440\u0438).
+missing_mapzen_search_api_key=Mapzen \u049b\u0438\u0434\u0438\u0440\u0443\u0432 API \u043a\u0430\u043b\u0438\u0442\u0438 \u0435\u0442\u0438\u0448\u043c\u0430\u044f\u043f\u0442\u0438. \u0411\u0443\u043d\u0438 \u0422\u0438\u0437\u0438\u043c \u0421\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440\u0438\u0434\u0430 \u0442\u045e\u0493\u0440\u0438\u043b\u0430\u0448 \u043c\u0443\u043c\u043a\u0438\u043d (\u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0438\u0448 \u04b3\u0443\u049b\u0443\u049b\u0438 \u0441\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440\u0438).
+sms=\u0421\u041c\u0421
+email=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d \u043f\u043e\u0447\u0442\u0430
+email_address=\u0415-\u043f\u043e\u0447\u0442\u0430 \u043c\u0430\u043d\u0437\u0438\u043b\u0438
+wrong_email=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0435-\u043f\u043e\u0447\u0442\u0430 \u043c\u0430\u0437\u0438\u043b\u0438\u043d\u0433\u0438\u0437\u043d\u0438 \u0430\u043d\u0438\u049b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+email_subject=\u041c\u0430\u0432\u0437\u0443
+message=\u0425\u0430\u0431\u0430\u0440
+gridColumns_fetch_failed=\u0423\u0441\u0442\u0443\u043d\u043b\u0430\u0440 \u0442\u045e\u0440\u0438\u043d\u0438 \u0434\u0438\u0441\u043f\u043b\u0435\u0439\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438 
+gridColumns_invalid=\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0430\u043d \u043d\u043e\u0442\u045e\u0493\u0440\u0438 \u0443\u0441\u0442\u0443\u043d\u043b\u0430\u0440 \u0442\u045e\u0440\u0438 \u049b\u0430\u0439\u0442\u0430\u0440\u0438\u043b\u0434\u0438
+dasboard_layout_saving_failed=\u0411\u043e\u0448\u049b\u0430\u0440\u0443\u0432 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0430\u043a\u0435\u0442\u0438\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u043d\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_register_tei=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0443\u0441\u0445\u0430\u0441\u0438\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430 \u0440\u045e\u0439\u0445\u0430\u0442\u0434\u0430\u043d \u045e\u0442\u043a\u0430\u0437\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_update_tei=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0443\u0441\u0445\u0430\u0441\u0438\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430 \u044f\u043d\u0433\u0438\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_generate_tracked_entity_attribute=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 \u049b\u0438\u0439\u043c\u0430\u0442\u0438\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_fetch_events=\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u0438\u043d\u0438 \u043e\u043b\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_update_event=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0430 \u044f\u043d\u0433\u0438\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+failed_to_send_message=\u0425\u0430\u0431\u0430\u0440\u043d\u0438 \u044e\u0431\u043e\u0440\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+file_missing=\u0424\u0430\u0439\u043b \u0439\u045e\u049b
+file_upload_failed=\u0424\u0430\u0439\u043b \u044f\u043d\u0433\u0438\u043b\u0430\u043d\u0438\u0448\u0438 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+missing_file_identifier= \u0424\u0430\u0439\u043b \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0438 \u0439\u045e\u049b
+unsupported_value_type=\u049a\u045e\u043b\u043b\u0430\u0431 \u049b\u0443\u0432\u0432\u0430\u0442\u043b\u0430\u043d\u043c\u0430\u0439\u0434\u0438\u0433\u0430\u043d \u049b\u0438\u0439\u043c\u0430\u0442 \u0442\u0443\u0440\u0438
+event_date_out_of_range=\u0411\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u0433\u0430\u043d \u0441\u0430\u043d\u0430\u043d\u0438 \u045e\u0440\u043d\u0430\u0442\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438. \u0414\u0430\u0441\u0442\u0443\u0440 \u0443\u0447\u0443\u043d \u0441\u043e\u0437\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0432\u0440 \u0441\u0430\u043d\u0430\u0441\u0438, \u0431\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u0433\u0430\u043d \u0441\u0430\u043d\u0430\u0434\u0430\u043d \u045e\u0442\u0433\u0430\u043d.
+date_out_of_ou_period=\u0421\u0430\u043d\u0430, \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0438\u0448 \u0431\u043e\u0448\u043b\u0430\u0433\u0430\u043d \u0432\u0430 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0441\u0430\u043d\u0430\u043b\u0430\u0440 \u0438\u0447\u0438\u0433\u0430 \u043a\u0438\u0440\u043c\u0430\u0439\u0434\u0438
+orgunit_closed= \u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0451\u043f\u0438\u043b\u0433\u0430\u043d. \u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0432\u0430 \u0442\u0430\u04b3\u0440\u0438\u0440\u043b\u0430\u0448 \u045e\u0447\u0438\u0440\u0438\u043b\u0433\u0430\u043d.
+dob=\u0422\u0443\u0493\u0438\u043b\u0433\u0430\u043d \u0441\u0430\u043d\u0430
+years=\u0419\u0438\u043b\u043b\u0430\u0440
+months=\u041e\u0439\u043b\u0430\u0440
+days=\u041a\u0443\u043d\u043b\u0430\u0440
+age_fields_info=\u0401\u0448 \u0431\u045e\u0439\u0438\u0447\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442
+reponse_from_server=\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0430\u043d \u0436\u0430\u0432\u043e\u0431.
+loading-audit-data=\u0410\u0443\u0434\u0438\u0442 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438 \u044e\u043a\u043b\u0430\u043d\u043c\u043e\u049b\u0434\u0430.
+more_options_available=\u043a\u045e\u043f\u0440\u043e\u049b \u0438\u043c\u043a\u043e\u043d\u0438\u044f\u0442\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434, \u049b\u0438\u0434\u0438\u0440\u0438\u0431 \u043a\u045e\u0440\u0438\u043d\u0433
+move_permanently=\u0414\u043e\u0438\u043c\u0438\u0439 \u0440\u0430\u0432\u0438\u0448\u0434\u0430 \u0445\u0430\u0440\u0430\u043a\u0430\u0442\u043b\u0430\u043d\u0438\u043d\u0433
+onetime_referral=\u0411\u0438\u0440 \u043c\u0430\u0440\u0442\u0430\u043b\u0438\u043a \u043c\u0443\u0440\u043e\u0436\u0430\u0430\u0442
+are_you_sure_you_want_to_move_permanently=\u04b2\u0430\u049b\u0438\u049b\u0430\u0442\u0434\u0430\u043d \u04b3\u0430\u043c \u043f\u0430\u0446\u0438\u0435\u043d\u0442\u043d\u0438 \u0434\u043e\u0438\u043c\u0438\u0439 \u04b3\u0430\u0440\u0430\u043a\u0430\u0442\u043b\u0430\u043d\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+ok=\u041e\u041a
+can_not_add_new_enrollment=\u042f\u043d\u0433\u0438 \u049b\u0430\u0439\u0434 \u049b\u045e\u0448\u0430 \u043e\u043b\u043c\u0430\u0439\u0441\u0438\u0437, \u0447\u0443\u043d\u043a\u0438 \u0443\u0448\u0431\u0443 \u0434\u0430\u0441\u0442\u0443\u0440 \u0444\u0430\u049b\u0430\u0442 \u0431\u0438\u0442\u0442\u0430 \u049b\u0430\u0439\u0434 \u043e\u043b\u0438\u0431 \u0431\u043e\u0440\u0438\u0448\u0433\u0430 \u0438\u043c\u043a\u043e\u043d \u0431\u0435\u0440\u0430\u0434\u0438
+switch_compare_form=\u0422\u0430\u049b\u049b\u043e\u0441\u043b\u0430\u0448 \u0448\u0430\u043a\u043b\u0438\u0433\u0430 \u045e\u0442\u0438\u0448
+switch_default_form=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0448\u0430\u043a\u043b\u0433\u0430 \u045e\u0442\u0438\u0448
+switch_tabel_form=\u0416\u0430\u0434\u0432\u0430\u043b \u0448\u0430\u043a\u043b\u0438\u0433\u0430 \u045e\u0442\u0438\u0448
+url_format=http(s)://
+url_error=URL \u043c\u0430\u043d\u0437\u0438\u043b\u0438 \u04b3\u0430\u049b\u0438\u049b\u0438\u0439\u043b\u0438\u0433\u0438\u0433\u0430 \u0438\u0448\u043e\u043d\u0447 \u04b3\u043e\u0441\u0438\u043b \u049b\u0438\u043b\u0438\u043d\u0433
+time_error=\u0412\u0430\u049b\u0442 \u0444\u043e\u0440\u043c\u0430\u0442\u0438 \u043d\u043e\u0442\u045e\u0493\u0440\u0438
+no_blank_date=\u0422\u0430\u0434\u0431\u0438\u0440 \u0443\u0447\u0443\u043d \u0441\u0430\u043d\u0430 \u043b\u043e\u0437\u0438\u043c. \u0410\u0433\u0430\u0440 \u0441\u0438\u0437 \u0443\u0448\u0431\u0443 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438 \u0431\u045e\u043b\u0441\u0430\u043d\u0433\u0438, \u0438\u043b\u0442\u0438\u043c\u043e\u0441, \u0443\u0448\u0431\u0443 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043d\u0433 \u0432\u0430 \u044f\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u0431 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433.
+not_authorized_to_uncomplete_event=\u0422\u0443\u0433\u0430\u043b\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0443\u0447\u0443\u043d \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f\u0434\u0430\u043d \u045e\u0442\u043c\u0430\u0433\u0430\u043d
+both_date_and_time=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0441\u0430\u043d\u0430 \u0432\u0430 \u0432\u0430\u049b\u0442 \u043c\u0430\u0439\u0434\u043e\u043d\u043b\u0430\u0440\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u043b\u0433\u0430\u043d\u043b\u0438\u0433\u0438\u0433\u0430 \u0432\u0430 \u0443\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0442\u045e\u0493\u0440\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0434\u0430 \u043c\u0443\u0432\u043e\u0444\u0438\u049b\u043b\u0438\u0433\u0438\u0433\u0430 \u0438\u0448\u043e\u043d\u0447 \u04b3\u043e\u0441\u0438\u043b \u049b\u0438\u043b\u0438\u043d\u0433. \u0410\u043a\u0441 \u04b3\u043e\u043b\u0434\u0430 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440 \u0441\u0430\u049b\u043b\u0430\u043d\u043c\u0430\u0439\u0434\u0438.
+wrong_time_format=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0432\u0430\u049b\u0442 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0434\u0430 (\u0421\u0421:\u0414\u0414 (\u0441\u043e\u0430\u0442:\u0434\u0430\u049b\u0438\u049b\u0430))\u0433\u0430 \u0440\u0438\u043e\u044f \u049b\u0438\u043b\u0438\u043d\u0433\u0430\u043d\u043b\u0438\u0433\u0438\u0433\u0430 \u0438\u0448\u043e\u043d\u0447 \u04b3\u043e\u0441\u0438\u043b \u049b\u0438\u043b\u0438\u043d\u0433.
+hours_and_minutes=\u0421\u0421:\u0414\u0414 (\u0441\u043e\u0430\u0442:\u0434\u0430\u049b\u0438\u049b\u0430)
+top_bar_settings=\u042e\u049b\u043e\u0440\u0438 \u0441\u0430\u0442\u0440 \u0441\u043e\u0437\u043b\u0430\u043c\u0430\u043b\u0430\u0440\u0438
+show=\u041a\u045e\u0440\u0441\u0430\u0442\u0438\u043d\u0433
+sort_order=\u0421\u0430\u0440\u0430\u043b\u0430\u0448 \u0442\u0430\u0440\u0442\u0438\u0431\u0438
+activate_top_bar=\u042e\u049b\u043e\u0440\u0438 \u0441\u0430\u0442\u0440 \u0444\u0430\u043e\u043b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433
+use_as_top_bar=\u042e\u049b\u043e\u0440\u0438 \u043f\u0430\u043d\u0435\u043b \u0441\u0438\u0444\u0430\u0442\u0438\u0434\u0430 \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0438\u0448
+remove_widget=\u0412\u0438\u0434\u0436\u0435\u0442 \u043e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043d\u0441\u0438\u043d\u043c\u0438?
+remove_widget_info=\u0421\u0438\u0437 \u0432\u0438\u0434\u0436\u0435\u0442\u043d\u0438 \u043e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043c\u043e\u049b\u0447\u0438\u0441\u0438\u0437. \u0414\u0430\u0432\u043e\u043c \u044d\u0442\u0438\u0448\u043d\u0438 \u0445\u043e\u0445\u043b\u0430\u0439\u0441\u0438\u0437\u043c\u0438?
+lock_default_layout=\u0411\u0430\u0440\u0447\u0430 \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438\u043b\u0430\u0440 \u0443\u0447\u0443\u043d \u043c\u0430\u043a\u0435\u0442\u043d\u0438 \u0431\u043b\u043e\u043a\u043b\u0430\u0448
+unlock_default_layout=\u0411\u0430\u0440\u0447\u0430 \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438\u043b\u0430\u0440 \u0443\u0447\u0443\u043d \u043c\u0430\u043a\u0435\u0442\u043d\u0438 \u0431\u043b\u043e\u043a\u0434\u0430\u043d \u0435\u0447\u0438\u0448
+upload_image=\u042e\u043a\u043b\u0430\u0448
+please_select_an_image=[\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0440\u0430\u0441\u043c\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433]
+all=\u0411\u0430\u0440\u0447\u0430\u0441\u0438
+ALL=\u0411\u0430\u0440\u0447\u0430\u0441\u0438
+completed=\u0422\u045e\u043b\u0434\u0438\u0440\u0438\u043b\u0434\u0438
+active=\u0424\u0430\u043e\u043b
+cancelled=\u0411\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u043d\u0434\u0438
+enrollment_status=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u04b3\u043e\u043b\u0430\u0442\u0438
+go_to_registration=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u0433\u0430 \u045e\u0442\u0438\u0448
+tracked_entity_instance_search_results_header={trackedEntityTypeName} \u049b\u0438\u0434\u0438\u0440\u0443\u0432 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u0438
+tracked_entity_instance_search_matches_description=\u0410\u0433\u0430\u0440 \u044e\u049b\u043e\u0440\u0438\u0434\u0430\u0433\u0438 \u04b3\u0435\u0447 \u0431\u0438\u0440\u0438 \u0441\u0438\u0437 \u049b\u0438\u0434\u0438\u0440\u0433\u0430\u043d\u0438\u043d\u0433\u0438\u0437 {trackedEntityTypeName} \u0431\u045e\u043b\u043c\u0430\u0441\u0430, "\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0441\u0430\u04b3\u0438\u0444\u0430\u0441\u0438" \u0433\u0430 \u045e\u0442\u0438\u043d\u0433
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} \u0442\u043e\u043f\u0438\u043b\u0434\u0438
+tracked_entity_instance_unique_found_description=\u0411\u043e\u0448\u049b\u0430 \u0431\u0438\u0440 {orgUnitLevelName} \u0434\u0430 {trackedEntityTypeName} \u0442\u043e\u043f\u0438\u043b\u0434\u0438.
+no_tracked_entity_instance_found_header={trackedEntityTypeName} \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438.
+no_tracked_entity_instance_found_description={trackedEntityTypeName} \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438.
+no_tracked_entity_instance_found_go_to_registration_description={trackedEntityTypeName} \u0434\u0430 \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438, \u0430\u0433\u0430\u0440 \u044f\u043d\u0433\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u043d\u0438 \u0445\u043e\u0445\u043b\u0430\u0441\u0430\u043d\u0433\u0438\u0437, \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u0433\u0430 \u045e\u0442\u0438\u0448\u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u043c\u0430\u0432\u0436\u0443\u0434
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u0431\u043e\u0448\u049b\u0430 {trackedEntityTypeName} \u0443\u0447\u0443\u043d \u043c\u0430\u0432\u0436\u0443\u0434. \u0423\u0448\u0431\u0443 {trackedEntityTypeName} \u043d\u0438 \u043e\u0447\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+possible_duplicates_found=\u042d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430\u043b\u0430\u0440 \u0430\u043d\u0438\u049b\u043b\u0430\u043d\u0434\u0438
+view_x_candidates=\u041a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u0448 {count} \u043c\u0438\u0436\u043e\u0437\u043b\u0430\u0440\u043d\u0438
+view_candidate=\u041c\u0438\u0436\u043e\u0437\u043b\u0430\u0440\u043d\u0438 \u043a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u0448
+matching_tracked_entity_instance_register_description=\u041c\u043e\u0441 \u043a\u0435\u043b\u0430\u0434\u0438\u0433\u0430\u043d\u0438\u043d\u0438 \u043e\u0447\u0438\u0448 \u0443\u0447\u0443\u043d \u0438\u0441\u0442\u0430\u043b\u0433\u0430\u043d {trackedEntityTypeName} \u043d\u0438 \u0431\u043e\u0441\u0438\u043d\u0433 \u0451\u043a\u0438 \u043e\u0440\u049b\u0430\u0433\u0430 \u049b\u0430\u0439\u0442\u0438\u043d\u0433 \u0432\u0430 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u043d\u0438 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0433
+review_possible_duplicates_before_registration=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u044d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430\u043b\u0430\u0440 \u0431\u043e\u0440\u043b\u0438\u0433\u0438\u043d\u0438 \u0442\u0435\u043a\u0448\u0438\u0440\u0438\u043d\u0433
+review_possible_duplicates_description=\u042e\u049b\u043e\u0440\u0438\u0434\u0430\u0433\u0438 \u0442\u0430\u043a\u0440\u043e\u0440\u043b\u0430\u043d\u0430\u0451\u0442\u0433\u0430\u043d \u043d\u0443\u0441\u0445\u0430\u043b\u0430\u0440\u0434\u0430\u043d \u0431\u0438\u0440\u0438\u043d\u0438 \u0451\u043a\u0438 \u044f\u043d\u0433\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448\u043d\u0438 \u0442\u0430\u043d\u043b\u0430\u043d\u0433 {trackedEntityTypeName}
+register_new_tracked_entity_instance=\u042f\u043d\u0433\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433 {trackedEntityTypeName}
+large_number_of_search_results_warning=\u041a\u045e\u043f \u0441\u043e\u043d\u043b\u0438 \u0442\u045e\u043f\u043b\u0430\u043c \u0442\u043e\u043f\u0438\u043b\u0434\u0438. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043e\u0440\u049b\u0430\u0433\u0430 \u049b\u0430\u0439\u0442\u0438\u043d\u0433 \u0432\u0430 \u049b\u0438\u0434\u0438\u0440\u0443\u0432 \u043c\u0435\u0437\u043e\u043d\u043b\u0430\u0440\u0438\u043d\u0438 \u0447\u0443\u049b\u0443\u0440\u0440\u043e\u049b \u0430\u043d\u0438\u049b\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043d\u0433 \u0451\u043a\u0438 \u0440\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u0441\u0430\u04b3\u0438\u0444\u0430\u0441\u0438\u0433\u0430 \u045e\u0442\u0438\u043d\u0433
+too_many_search_results=\u049a\u0438\u0434\u0438\u0440\u0443\u0432 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u0438 \u0436\u0443\u0434\u0430 \u043a\u045e\u043f
+open=\u041e\u0447\u0438\u049b
+continue=\u0414\u0430\u0432\u043e\u043c \u044d\u0442\u0438\u0448
+no_program_write_access=\u0425\u0430\u0431\u0430\u0440 \u0436\u045e\u043d\u0430\u0442\u0438\u0448 \u0443\u0447\u0443\u043d \u0434\u0430\u0441\u0442\u0443\u0440\u0434\u0430 \u0451\u0437\u0443\u0432 \u049b\u043e\u043b\u0434\u0438\u0440\u0438\u0448 \u04b3\u0443\u049b\u0443\u049b\u0438
+show_all=\u0411\u0430\u0440\u0447\u0430\u0433\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
+not_allowed=\u0420\u0443\u0445\u0441\u0430\u0442 \u0431\u0435\u0440\u0438\u043b\u043c\u0430\u0439\u0434\u0438
+you_do_not_have_the_necessary_authorities_to_delete=\u040e\u0447\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0437\u0430\u0440\u0443\u0440 \u0431\u045e\u043b\u0433\u0430\u043d \u04b3\u0443\u049b\u0443\u049b \u0441\u0438\u0437\u0434\u0430 \u043c\u0430\u0432\u0436\u0443\u0434 \u044d\u043c\u0430\u0441
+this=\u0431\u0443
+delete_failed=\u040e\u0447\u0438\u0440\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+cannot_delete_this_enrollment_because_it_already_contains_events=\u0423\u0448\u0431\u0443 \u049b\u0430\u0439\u0434\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438, \u0447\u0443\u043d\u043a\u0438 \u0443\u043d\u0434\u0430 \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u049b\u0430\u0439\u0434\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u043d\u0433
+cannot_delete_this_tei_because_it_already_contains_enrollments=\u0423\u0448\u0431\u0443 \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441 \u043d\u0430\u043c\u0443\u043d\u0430\u0441\u0438\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0431 \u0431\u045e\u043b\u043c\u0430\u0439\u0434\u0438, \u0447\u0443\u043d\u043a\u0438 \u0443\u043d\u0434\u0430 \u0430\u043b\u043b\u0430\u049b\u0430\u0447\u043e\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440 \u043c\u0430\u0432\u0436\u0443\u0434. \u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441 \u043d\u0430\u043c\u0443\u043d\u0430\u0441\u0438\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u0448\u0434\u0430\u043d \u043e\u043b\u0434\u0438\u043d \u049b\u0430\u0439\u0434\u043b\u0430\u0440\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u043d\u0433
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440\u0434\u0430 {trackedEntityTypeName} \u0442\u043e\u043f\u0438\u043b\u043c\u0430\u0434\u0438. \u0411\u043e\u0448\u049b\u0430 \u0434\u0430\u0441\u0442\u0443\u0440\u0434\u0430\u0433\u0438 \u043d\u0430\u0442\u0438\u0436\u0430\u043b\u0430\u0440\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448.
+drop_image=\u0422\u0430\u0441\u0432\u0438\u0440\u043d\u0438 \u0442\u0443\u0448\u0438\u0440\u0438\u0448
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=\u0414\u0430\u0441\u0442\u0443\u0440 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438\u0441\u0438\u0437 \u049b\u0438\u0434\u0438\u0440\u0443\u0432 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d, \u0441\u0438\u0437\u0434\u0430 \u043a\u0430\u043c\u0438\u0434\u0430 \u0431\u0438\u0440 \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u043a\u045e\u0440\u0438\u043d\u0438\u0448\u0438\u0433\u0430 \u0440\u0443\u0445\u0441\u0430\u0442 \u0431\u045e\u043b\u0438\u0448\u0438 \u043b\u043e\u0437\u0438\u043c
+missing_read_access_for_tracked_entity_type=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u0442\u0443\u0440\u0438 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u043a\u045e\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0440\u0443\u0445\u0441\u0430\u0442 \u0437\u0430\u0440\u0443\u0440
+stage_write_required=\u0414\u0430\u0441\u0442\u0443\u0440\u043d\u0438\u043d\u0433 \u0431\u0443 \u0431\u043e\u0441\u049b\u0438\u0447\u0438\u0434\u0430 \u0451\u0437\u0443\u0432 \u049b\u043e\u043b\u0434\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0440\u0443\u0445\u0441\u0430\u0442 \u0437\u0430\u0440\u0443\u0440
+you_need_write_to_program_stage_to_be_able_to_create_event=\u0414\u0430\u0441\u0442\u0443\u0440\u043d\u0438\u043d\u0433 \u0431\u0443 \u0431\u043e\u0441\u049b\u0438\u0447\u0438\u0434\u0430 \u044f\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u04b3\u0430\u049b\u0438\u0434\u0430 \u0451\u0437\u0443\u0432 \u049b\u043e\u043b\u0434\u0438\u0440\u0438\u0448 \u0443\u0447\u0443\u043d \u0440\u0443\u0445\u0441\u0430\u0442 \u0437\u0430\u0440\u0443\u0440
+no_polygon_captured=\u041a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u043a \u0443\u0448\u043b\u0430\u043d\u043c\u0430\u0434\u0438
+polygon_captured=\u041a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u043a \u0443\u0448\u043b\u0430\u043d\u0434\u0438
+no_geometry_captured=\u0413\u0435\u043e\u043c\u0435\u0442\u0440\u0438\u044f \u0443\u0448\u043b\u0430\u043d\u043c\u0430\u0434\u0438
+geometry=\u0413\u0435\u043e\u043c\u0435\u0442\u0440\u0438\u044f
+tracked_entity_type=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u0442\u0443\u0440\u0438
+type=\u0422\u0443\u0440\u0438
+tracked_entity_type_has_no_attributes=\u041a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u043e\u0431\u044a\u0435\u043a\u0442 \u0442\u0443\u0440\u0438, \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u043b\u0430\u0440\u0441\u0438\u0437.
+belongs_to_another_organisation_unit=\u0431\u043e\u0448\u049b\u0430 \u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u0438\u0440\u043b\u0438\u043a\u043a\u0430 \u0442\u0435\u0433\u0438\u0448\u043b\u0438
+please_fill_in_a_reason_for_accessing=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u043a\u0438\u0440\u0438\u0448\u0433\u0430 \u0440\u0443\u0445\u0441\u0430\u0442 \u043e\u043b\u0438\u0448 \u0443\u0447\u0443\u043d \u0441\u0430\u0431\u0430\u0431 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043d\u0433
+your_action_is_being_monitored=\u0421\u0438\u0437\u043d\u0438\u043d\u0433 \u04b3\u0430\u0440\u0430\u043a\u0430\u0442\u043b\u0430\u0440\u0438\u043d\u0433\u0438\u0437 \u043a\u0443\u0437\u0430\u0442\u0438\u043b\u043c\u043e\u049b\u0434\u0430
+this=\u0431\u0443
+saving_relationship_failed_conflicts=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438. \u041d\u043e\u043c\u0443\u0442\u0430\u043d\u043e\u0441\u0438\u0431\u043b\u0438\u043a
+saving_relationship_failed=\u040e\u0437\u0430\u0440\u043e \u0430\u043b\u043e\u049b\u0430\u043b\u0430\u0440\u043d\u0438 \u0441\u0430\u049b\u043b\u0430\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438.
+open_tei_error=TEI \u043e\u0447\u0438\u0448 \u0430\u043c\u0430\u043b\u0433\u0430 \u043e\u0448\u043c\u0430\u0434\u0438
+PROGRAM_ACCESS_CLOSED=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u0438\u0440\u043b\u0438\u043a\u0434\u0430\u043d \u0442\u0430\u0448\u049b\u0430\u0440\u0438 \u0431\u045e\u043b\u0433\u0430\u043d\u043b\u0438\u0433\u0438 \u0443\u0447\u0443\u043d \u043a\u0443\u0437\u0430\u0442\u0443\u0432\u0434\u0430\u0433\u0438 \u0448\u0430\u0445\u0441 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u043b\u0430\u0440\u0438\u043d\u0438 \u043e\u043b\u0438\u0448 \u0438\u043c\u043a\u043e\u043d\u0438 \u0439\u045e\u049b
+compare_form_previous=\u041e\u043b\u0434\u0438\u043d\u0433\u0438 \u0448\u0430\u043a\u043b\u043d\u0438 \u0442\u0430\u049b\u049b\u043e\u0441\u043b\u0430\u0448
+compare_form_all=\u0411\u0430\u0440\u0447\u0430 \u0448\u0430\u043a\u043b\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u049b\u049b\u043e\u0441\u043b\u0430\u0448
+grid_form=\u0422\u0430\u0440\u043c\u043e\u049b \u0448\u0430\u043a\u043b\u0438
+pop_over_form=POP - \u0451\u043d \u0448\u0430\u043a\u043b 
+failed_to_delete_enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0438\u0448 \u0436\u0430\u0440\u0430\u0451\u043d\u0438 \u045e\u0447\u0438\u0440\u0438\u043b\u0438\u0448\u0438\u0434\u0430 \u0445\u0430\u0442\u043e\u043b\u0438\u043a
+enrollment_polygon=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u043a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u0433\u0438
+enrollment_point=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u0448 \u043d\u0443\u049b\u0442\u0430\u0441\u0438
+event_polygon=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u043a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u0433\u0438
+event_point=\u04b2\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u043d\u0443\u049b\u0442\u0430\u0441\u0438
+point_on_map=\u0425\u0430\u0440\u0438\u0442\u0430\u0434\u0430 \u043d\u0443\u049b\u0442\u0430
+polygon_on_map=\u0425\u0430\u0440\u0438\u0442\u0430\u0434\u0430 \u043a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u043a
+cancel_capturing_polygon=\u041a\u045e\u043f\u0431\u0443\u0440\u0447\u0430\u043a\u043d\u0438 \u0448\u0430\u043a\u043b\u043b\u0430\u043d\u0442\u0438\u0440\u0438\u0448\u043d\u0438 \u0431\u0435\u043a\u043e\u0440 \u049b\u0438\u043b\u0438\u043d\u0433
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=\u0421\u0438\u0437 \u0440\u0430\u0441\u043c \u0447\u0438\u0437\u0438\u0448 \u0440\u0435\u0436\u0438\u043c\u0438\u0434\u0430. \u0422\u0443\u0433\u0430\u043b\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d \u045e\u0437\u0433\u0430\u0440\u0442\u0438\u0440\u0438\u0448\u043b\u0430\u0440 \u0439\u045e\u049b\u043e\u0442\u0438\u043b\u0430\u0434\u0438
+complete_stage=\u0411\u043e\u0441\u049b\u0438\u0447 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0441\u0438\u043d\u043c\u0438?
+complete_stage_info=\u0411\u0443 \u0431\u043e\u0441\u049b\u0438\u0447 \u0442\u0443\u0433\u0430\u0442\u0438\u043b\u0438\u0448\u0438\u043d\u0438 \u0445\u043e\u0445\u043b\u0430\u0439\u0441\u0438\u0437\u043c\u0438?
+assigned_user=\u0422\u0430\u0432\u0441\u0438\u044f \u044d\u0442\u0438\u043b\u0433\u0430\u043d \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438
+linked_events=\u0411\u043e\u0493\u043b\u0438\u049b \u04b3\u043e\u0434\u0438\u0441\u0430\u043b\u0430\u0440
+user_assignment=\u0424\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438 \u0442\u0430\u0439\u0438\u043d\u043b\u0430\u043d\u0438\u0448\u0438
+specific_users=\u041c\u0443\u0430\u0439\u044f\u043d \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438
+none=\u0419\u045e\u049b
+any=\u04b2\u0430\u0440 \u049b\u0430\u043d\u0434\u0430\u0439
+no_requirement=\u04b2\u0435\u0447 \u049b\u0430\u043d\u0434\u0430\u0439 \u0442\u0430\u043b\u0430\u0431 \u0439\u045e\u049b
+the_record_has_is_possible_duplicate=\u0401\u0437\u0443\u0432 \u0442\u0430\u0440\u043a\u0438\u0431\u0438\u0434\u0430/\u044d\u04b3\u0442\u0438\u043c\u043e\u043b \u043d\u0443\u0441\u0445\u0430\u0441\u0438
+flag_possible_duplicate=\u042d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430 \u0431\u0435\u043b\u0438\u043b\u0430\u043d\u0441\u0438\u043d
+possible_duplicate=\u042d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430
+unflag=\u0411\u0435\u043b\u0433\u0438\u043d\u0438 \u043e\u043b\u0438\u0431 \u0442\u0430\u0448\u043b\u0430\u043d\u0433
+possible_duplicate_info_start=\u042d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430: \u0411\u0443
+possible_duplicate_info_end= \u043c\u0443\u043c\u043a\u0438\u043d \u0431\u045e\u043b\u0433\u0430\u043d \u0451\u043a\u0438 \u044d\u04b3\u0442\u0438\u043c\u043e\u043b\u0438\u0439 \u043d\u0443\u0441\u0445\u0430\u0441\u0438 \u0432\u0430 \u043a\u045e\u0440\u0438\u0431 \u0447\u0438\u049b\u0438\u0448 \u0443\u0447\u0443\u043d \u0431\u0435\u043b\u0433\u0438\u043b\u0430\u043d\u0433\u0430\u043d
+owned_by=\u0422\u0435\u0433\u0438\u0448\u043b\u0438:
+change_date_with_dependency_information=\u0423\u0448\u0431\u0443 \u0441\u0430\u043d\u0430\u043d \u044f\u043d\u0433\u0438\u043b\u0430\u0448 \u0441\u0438\u0437\u0434\u0430\u043d \u049b\u045e\u0448\u0438\u043c\u0447\u0430 \u04b3\u0430\u0440\u0430\u043a\u0430\u0442\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u043b\u0430\u0431 \u049b\u0438\u043b\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d. \u0423\u0448\u0431\u0443 \u0434\u0430\u0441\u0442\u0443\u0440\u0434\u0430 \u0431\u043e\u0448\u049b\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440 \u0441\u0430\u043d\u0430\u043b\u0430\u0440\u0438 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d, \u0432\u0430\u04b3\u043e\u043b\u0430\u043d\u043a\u0438 \u0431\u0443 \u0442\u0430\u0434\u0431\u0438\u0440 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u043a \u049b\u0430\u0439\u0442\u0430 \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u043c\u0430\u0439\u0434\u0438. \u0421\u0430\u043d\u0430 \u044f\u043d\u0433\u0438\u043b\u0430\u043d\u0438\u0448\u0438\u043d\u0438 \u0434\u0430\u0432\u043e\u043c \u044d\u0442\u0442\u0438\u0440\u043c\u043e\u049b\u0447\u0438\u043c\u0438\u0441\u0438\u0437?
+custom_working_list=\u041c\u0430\u0445\u0441\u0443\u0441 \u0438\u0448\u0447\u0438 \u0440\u045e\u0439\u0445\u0430\u0442
diff --git a/i18n/i18n_app_uz_Latn.properties b/i18n/i18n_app_uz_Latn.properties
new file mode 100644
index 000000000..da6c0d876
--- /dev/null
+++ b/i18n/i18n_app_uz_Latn.properties
@@ -0,0 +1,674 @@
+tracker_capture=Kuzatuv-Nazorat
+online_notification= Siz onlayn
+offline_notification=Siz offlayn
+login_failed=Login xato, Foydalanuvchi ismi va parolni tekshirib qayta kiriting
+tracked_entity_management=Kuzatuv ob\u02bcekti boshqaruvi
+registering_unit=Ro\u02bcyxatga olish muassasasi
+program=Programma
+tracked_entity=Kuzatuv ob\u02bcekti
+tracked_entity_instance=Kuzatilayotgan ob\u02bcekt namunasi
+tracked_entity_attribute=Kuzatuv ob\u02bcekti atributi
+select_or_search=Ro\u02bcyxatdan tanlang yoki qidiring
+please_select=[Marhamat tanlang]
+please_select_a_program=[Marhamat dasturni tanlang]
+no_program_exists=[Dastur mavjud emas]
+please_select_a_program_for_enrollment=Iltimos, ro\u02bcyxatga olish uchun dasturni tanlang
+please_select_program_report=Iltimos, hisobotda ishlash uchun dasturni tanlang
+please_select_a_relationship=Iltimos, o\u02bczaro munosabatlarni tanlang
+no_relationship=O\u02bczaro munosabatlar mavjud emas
+relationship_not_possible=Kuzatilayotgan ob\u02bcekt namunasi mavjud emas, aloqa o\u02bcrnatish imkoniyati yo\u02bcq
+no_program_exists_enrollment=Tanlangan tashkiliy birlik uchun dastur mavjud emas. Ro\u02bcyxatga olish imkoni yo\u02bcq
+no_program_exists_report=Tanlangan tashkiliy birlik uchun dastur mavjud emas. Hisobot shakllantirish imkoni yo\u02bcq
+not_yet_enrolled_data_entry=Hali ro\u02bcyxatga olinmagan. Ma\u02bclumotlarni kiritish imkoni mavjud emas.
+not_yet_enrolled_enrollment=Ro\u02bcyxatga olish imkoni mavjud emas.
+no_active_enrollment_exists=Tanlangan dastur uchun faol ro\u02bcyxatga olish imkoni mavjud emas
+no_active_enrollments_exist=Faol ro\u02bcyxatga olish imkoni mavjud emas
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+not_yet_enrolled_note=Hali ro\u02bcyxatga olinmagan. Yozuvni saqlash imkoni mavjud emas.
+not_yet_enrolled_report=Hali ro\u02bcyxatga olinmagan. Hisobot shakllantirish imkoni yo\u02bcq.
+no_data_report=Hisobotni shakllantirish uchun ma\u02bclumotlar mavjud emas
+no_notes_exist=Izoh mavjud emas
+event=Tadbir
+no_event_is_yet_created=Ma\u02bclumotlarni kiritish uchun hech qanday tadbir mavjud emas. Iltimos, tadbirni yarating.
+event_creation=Iltimos, quyidagilarning biridan yarating
+not_selected=Tanlanmagan
+create=Yaratish
+view_all=[Barchasini ko\u02bcrish]
+list_all_entities=Barcha sub\u02bcektlar ro\u02bcyxati
+list_all=Ro\u02bcyxatdagilarni sanab o\u02bctish
+list=Patsientlar Ro\u02bcyxati
+lists=Lists
+invalid=Yaroqsiz
+selected_tei_is_invalid=Kuzatuv uchun tanlangan namuna mantiqan yaroqsiz
+required=Majburiy
+number_required=Raqam talab etiladi
+date_required=Sana talab etiladi
+number=Tartib raqami
+value_must_be_number=Qiymat raqamda bo\u02bclishi lozim
+value_must_be_posInt=Qiymat musbat butun son bo\u02bclishi lozim
+value_must_be_negInt=Qiymat manfiy butun son bo\u02bclishi lozim
+value_must_be_zeroPositiveInt=Qiymat nol\u044c yoki musbat butun son bo\u02bclishi lozim
+value_must_be_int=Qiymat butun son bo\u02bclishi lozim
+posInt=Musbat butun son
+negInt=Manfiy butun son
+zeroPositiveInt=Nol\u044c yoki musbat butun son
+latitude_required=Kenglik qiymati [-90 ... 90] oralig\u02bcida bo\u02bclishi lozim
+longitude_required=Uzunlik qiymati [-180 ... 180] oralig\u02bcida bo\u02bclishi lozim
+latitude_longitude_required=Qiymatlar quyidagi shaklda bo\u02bclishi lozim, Uzunlik [-180...180], Kenglik [-90...90]
+future_date_not_allowed=Kelajakdagi sana tanloviga ruchsat berilmaydi
+option_required=Qiymat taklif qilingan ro\u02bcyxatdan tanlanishi lozim
+bool_required=Qiymat mantiqiy bo\u02bclishi lozim
+name=Ismi
+filter=Fil\u044ctr
+search=Qidirish
+_search=search
+search_by_name=Ismi orqali qidirish
+search_by_data_element=Ma\u02bclumotlar elementi bo\u02bcyicha qidirish
+search_by_attribute=\u0410tributlar bo\u02bcyicha qidirish
+search_for=Qidirish
+type_your_search_criteria_here=Qidirish mezonlarini shu yerda kiriting
+search_input_required=Iltimos, qidirish mezonlarini aniqlashtiring
+in_progress=Jarayonda
+registered_entities=Ro\u02bcyxatdan o\u02bctgan shaxslar
+empty=Bo\u02bcsh
+form_is_empty_fill_at_least_one=Shakl bo\u02bcsh, iltimos, kamida bittasini to\u02bcldiring
+no_event_exists=Hech qanday xodisa mavjud emas
+total=Jami
+total_number_of_pages=Sahifalar soni
+rows_per_page=Sahifadagi qatorlar soni
+jump_to_page=Sahifaga o\u02bctish
+page=Sahifa
+first=\u0410vvalambor
+previous=Oldingi
+next=Keyingi
+last=Keyingi
+go_to_dashboard=Boshqaruv paneliga o\u02bctish
+go=Oldinga
+find=Toping
+edit=Tahrirlash
+edit_profile=Profilni tahrir qilish
+tracker_associate=Kuzatuv assotsiatsiyasi
+association=\u0410ssotsiyaatsiyani boshqarish
+change_location=Joylashuvni boshqarish
+details_history=Tafsilotlar/tarix
+history=Tarix
+canceled=Bekor qilindi
+delete=O\u02bcchirib tashlash
+deleted=O\u02bcchirib tashlangan
+remove=Olib tashlash
+entity=Muassasa
+clear=Tozalash
+add=Qo\u02bcshish
+add_note=Izoh qoldirish
+search_note=Izohlarda qidiring
+your_note_here=Sizning eslatmangiz shu yerda
+phone_number=Telefon raqami
+your_sms_message_here=Sizning SMS xabaringiz shu yerda
+your_email_message_here=Sizning ye-xatingiz shu yerda
+sms_send_status=SMS yuborilish holati
+send=Yuborish
+add_new_event=Yangi tadbir qo\u02bcshish
+add_new_event_for_stage=Bosqich uchun yangi tadbir qo\u02bcshish
+schedule_new_event=Yangi tadbirni rejalashtirish
+schedule_new_event_for_stage=Bosqich uchun yangi tadbirni rejalashtirish
+refer_new_event_for_stage=Bosqich uchun yangi tadbirga murojaat qiling
+skip=O\u02bctkazib yuborish
+unskip=Rejani qo\u02bcllash
+complete=To\u02bcldirish
+incomplete=To\u02bcliq emas
+reopen=Qayta ochish
+validate=Tasdiqlash
+validation_result=Tasdiqlash natijasi
+status=Status
+event_completed=Tadbir yakunlandimi?
+details=Tafsilotlarni krish uchun tugmani bosing
+_details=Tafsilotlari
+created_by=Ro\u02bcyxatdan o\u02bctgan
+date=Sana
+_date=sana
+event_name=Tadbir nomi
+new_event=Yangi hodisa
+create_new_event=Yangi tadbir yarating
+create_new_event_repeatable=Takrorlanadigan bosqichdan yangi tadbir yarating
+toggle_table_view_on=Hodisalarni iloji boricha jadval sifatida ko\u02bcrsating
+toggle_table_view_off=Har bir hodisa/tadbir uchun ma\u02bclumotlarni kiritish shaklini ko\u02bcrsating
+event_recorded_on=Hodisa/tadbir qayd etildi
+at=da
+show_more=qo\u02bcshimcha ma\u02bclumot uchun tugmani bosing
+close_search=Qidiruv yopilsin
+search_attributes=\u0410tributlarni qidirish
+available_search_attributes=Mavjud atributlarda qidirish
+selected_search_attributes=Tanlangan atributlarda qidirish
+selected_program=Tanlangan dastur
+other_programs=Boshqa dasturlar
+search_for_dashboard=Boshqaruv paneli elementlarini qidirish
+dashboard=Boshqaruv paneli
+home=Bosh sahifa
+back=Orqaga
+enrollment=Ro\u02bcyxatga olish
+enrolling_orgunit=Ro\u02bcyxatga olish tashkiliy bo\u02bclimi
+delete_enrollment=Ro\u02bcyxatdan o\u02bctkazish o\u02bcchirilsin
+cancel_enrollment=Ro\u02bcyxatdan o\u02bctkazish bekor qilinsin
+complete_enrollment=Ro\u02bcyxatdan o\u02bctkazish yakunlansin
+reopen_enrollment=Ro\u02bcyxatdan o\u02bctkazishni qayta oching
+activate_enrollment=Ro\u02bcyxatdan o\u02bctkazishni faollashtiring
+deactivate_enrollment=Qayd etishni faolsizlantirish
+enrollment_date=Qayd etilgan sana
+incident_date=Hodisa sanasi
+notes=Izohlar
+relationship=O\u02bczaro aloqa
+relationshipTo=Chiquvchi o\u02bczaro aloqalar
+relationshipFrom=Kiruvchi o\u02bczaro aloqalar
+relationships=O\u02bczaro aloqalar
+add_relationship=O\u02bczaro aloqa qo\u02bcshish
+a_is_to_b=\u0410 - \u0412 ga
+b_is_to_a=\u0412 - \u0410 ga
+select=Tanlang
+please_add_some_text=Iltimos, matn kiriting
+please_select_source=Iltimos, manbani tanlang
+register_new=Yangini ro\u02bcyxatga oling
+search_from_existing=Mavjud bo\u02bclganlardan qidirish
+dataentry=Xronologiya ma\u02bclumotlarini kiritish
+dataentryTabular=Jadval ma\u02bclumotlarini kiritish
+indicators=Indikatorlar
+empty_inidcator_list=Ko\u02bcrsatgich mavjud emas
+no_indicators_exist=Ko\u02bcrsatgich mavjud emas
+feedback=Fikr-mulohaza
+no_feedback_exist=Fikr-mulohaza mavjud emas
+custom_form=Maxsus shakl
+default_form=Standart shakl
+menu=Menyu
+tracker_reports=Kuzatuv hisoboti
+reports=Hisobotlar
+registration_and_data_entry=Ro\u02bcyxatdan o\u02bctish va ma\u02bclumotlarni kiritish
+program_summary_report=Dastur haqida qisqacha hisobot
+program_summary=Dastur bo\u02bcyicha qisqacha ma\u02bclumot
+program_summary_description=Muayyan dastur uchun solishtirma hisobotni shakllantirish, tashkiliy bo\u02bclim va davr chegarasida. Hisobotda kuzatuvdagi shaxslar ro\u02bcyxati va ularning yozuvlari aks ettirilgan, dastur bosqichlari ketma-ketligi bilan.
+program_statistics_report=Dastur statistikasi hisoboti
+program_statistics=Dastur statistikasi
+program_statistics_description=Muayyan dastur uchun statistik hisobotni shakllantiring. Hisobotda aks ettiriladi, misol uchun, ma\u02bclum davrda ma\u02bclum tashkiliy bo\u02bclimda o\u02bcquv mashg\u02bculotlari natijalari, o\u02bcquv kursini tark etganlar va muvaffaqiyatli yakunlaganlar
+upcoming_events=Kelgusi tadbirlar
+upcoming_events_description=Tanlangan dastur va davr mobaynida kuzatuvdagi shaxslar va ularning bo\u02bclg\u02bcusi hodisa/tadbirlarni ko\u02bcrsatadigan hisobotni jadval ko\u02bcrinishida shakllantiring. Ustunlar bo\u02bcylab qidiruv, saralash va ko\u02bcrsatish/berkitish operatsiyalari bo\u02bclishi mumkin.
+overdue_events=Kechikkan tadbirlar
+overdue_events_description=Tanlangan dastur uchun hodisa/tadbirlar ro\u02bcyxatini shakllantiring. Hisobotda kuzatuvdagi shaxslar ro\u02bcyxati va o\u02bcz vaqtida bajarilmagan hodisa/tadbirlar ko\u02bcrsatiladi. Shuningdek saralash va qidiruv ham bo\u02bclishi mumkin.
+enrollment_stats=Ro\u02bcyxatga olish statistikasi
+event_stats=Hodisa/tadbirlar statistikasi
+upcoming_event=Kelgusi tadbir
+legend=Ta\u02bcrif
+event_color_legend=Ranglar nimani anglatadi?
+report=Hisobot
+_report=report
+visit_schedule=Rejani ko\u02bcrib chiqish
+mark_for_followup=Kuzatuv uchun belgilang
+unmark_for_followup=Kuzatuvdan chiqaring
+only_marked_for_followup=Faqat kuzatuv uchun belgilang
+registered_data=Ro\u02bcyxatga olingandagi ma\u02bclumotlar
+no_value=Qiymat yo\u02bcq
+no_data_found=Ma\u02bclumotlar topilmadi
+no_data=Ma\u02bclumot yo\u02bcq
+mo_matching_data=No data matching your search criteria
+data_exists=Ma\u02bclumotlar mavjud
+data_registerd=Ma\u02bclumot qayd etilmagan
+no_visit_made=Qabul yo\u02bcq
+visit_not_made=Qabul qilinmadi
+_visit=tashrif
+visit=Visit
+visits=Tashriflar
+current_selections=Joriy tanlovlar
+activePrograms=Faol dasturlar
+set_as_current=Joriy sifatida joylashtiring
+org_unit=Tashkiliy birlik
+org_unit_scope=Tashkiliy bo\u02bclim huquq va burchlari
+SELECTED=Tanlangan
+CHILDREN=Bevosita bolalar
+DESCENDANTS=Barcha bolalar
+ACCESSIBLE=Barchaga kirish mumkin
+data_element=Ma\u02bclumotlar elementi
+value=Qiymat
+provided_elsewhere=Boshqa joylarga taqdim etilgan
+expand=Kengaytiring
+collapse=Yiqilish
+show_hide_columns=Ustunlar ko\u02bcrsatish/berkitish
+select_columns_to_show=Ustunni ko\u02bcrsatish uchun tanlang
+show_hide_widgets=Vidjetni ko\u02bcrsatish/berkitish
+select_widgets_to_show=Vidjetni ko\u02bcrsatish uchun tanlang
+audit_history=\u0410udit tarixi
+hide_widget=Vidjetni berkitish
+show_widget=Vidjetni ko\u02bcrsatish
+hide_column=Ustunni berkitish
+show_column=Ustunni ko\u02bcrsatish
+close=Yopiq
+generate=Yarating
+print=Chop etish
+excel_export=Excel ga eksport
+download=Yuklash, qaysidir sifatda
+export=Eksport
+csv=CSV
+json=JSON
+xml=XML
+list_programs=Dasturlar ro\u02bcyxati
+program_stage=Dastur bosqichi
+due_date=Muddati
+event_date=Tadbir sanasi
+report_date=Hisobot sanasi
+enable_rescheduling=Qayta rejalashtirishga ruxsat
+disable_rescheduling=Qayta rejalashtirish o\u02bcchirilgan
+show_hide_scheduling=Rejalashtirish shaklini ko\u02bcrsatish/berkitish
+show_hide_notes=Izoh shaklini ko\u02bcrsatish/berkitish
+show_hide_messaging=Xabar shaklini ko\u02bcrsatish/berkitish
+messaging=Xabar almashinuvi
+scheduling=Rejalashtiring
+reschedule_duedate=\u0410mal qilish muddatini qayta rejalashtirish
+reschedule=Qayta rejalang
+rescheduling=Qayta rejalashtirish
+scheduling_messaging=Rejalashtirish va xabarlashish
+not_yet_enrolled_scheduling=\u0410fsus ro\u02bcyxatga olinmadi, rejalashtirish imkoni mavjud emas
+schedule_details=Reja tafsilotlari
+no_event_to_schedule=Rejada tadbir yo\u02bcq
+enroll=Ro\u02bcyxatga olish
+new_enrollment=Yangi ro\u02bcyxatga olish
+start_date=Boshlanish sanasi
+end_date=Yakunlanish sanasi
+from=Kimdan
+to=Kimga
+exact_date=\u0410niq sana
+exact_value=\u0410niq qiymat
+EQ=Teng
+GT=Undan kattaroq
+GE=Undan kattaroq yoki teng
+LT=Undan kamroq
+LE=Undan kamroq yoki teng
+NE=Teng emas
+IS=Shunday
+RANGE=Oraliq
+like=Kabi, o\u02bcxshash
+not_like=Yoqmaydi
+boolean=Mantiqiy
+yes=Ha
+no=Yo\u02bcq
+records=Yozuvlar
+record=Yozib olish
+_record=record
+_records=records
+found=Topildi
+move_to_selected=Tanlangan tomonga ko\u02bcchirish
+move_all_to_selected=Barchasini tanlangan tomonga ko\u02bcchirish
+current=Joriy
+new=Yangi
+add_new=Yangisini qo\u02bcshish
+registration=Ro\u02bcyxatdan o\u02bctish
+registration_date=Ro\u02bcyxatga olingan sana
+register=Ro\u02bcyxatga olish
+_register=register
+enrollment_error=Ro\u02bcyxatdan o\u02bctishda xatolik
+registration_error=Ro\u02bcyxatga olishda xatolik
+update_error=Yangilashda xatolik yuz berdi
+register_error=Ro\u02bcyxatga olishda xatolik
+event_creation_error=Hodisa/tadbir yaratishda xatolik
+relationship_error=O\u02bczaro aloqalarni belgilashda xatolik
+tracker_associate_error=Kuzatuv assosiatsiyalarini tayinlashda xatolik
+searching_error=Qidiruvda xato
+form_invalid=Shakl noto\u02bcg\u02bcri. Iltimos, talab qilingan sohalarni tekshiring
+no_entity_for_tracker_associate_attribute=Tanlangan atributda yaroqsiz kuzatuv birligi mavjud
+errors=Xatoliklar
+error=Xato
+warning=Ogohlantirish
+success=Muvaffaqiyat
+unable_to_fetch_data_from_server=Serverdan ma\u02bclumot olish imkoni bo\u02bclmadi
+access_denied=Kirish ta\u02bcqiqlandi
+registration_complete=Ro\u02bcyxatga olish yakunlandi
+auto_generate_failed=\u0410tribut(lar) avtomatik yaratilmaganligi sababli, ro\u02bcyxatdan o\u02bctishda xatolik yuz berdi.
+validation_error=Validatsiya xato
+event_orgunit_name=Tashkiliy birlik
+category=Kategoriya
+entity_type=Muassasa turi
+save=Saqlash
+save_and_add_new=Saqlash va yangisini kiritishga o\u02bctish
+save_and_go_back=Saqlang va orqaga qayting
+save_and_continue=Saqlang va davom eting
+save_relationship=\u0410loqalarni saqlang
+delete_relationship=\u0410loqalarni o\u02bcchiring
+can_not_delete_relationship=Can not delete relationship because of lacking write access.
+go_back=Orqaga qayting
+cancel=Bekor qilish
+are_you_sure_to_delete_relationship=Ushbu o\u02bczaro aloqani o\u02bcchirishni haqiqatdan ham xoxlaysizmi?
+are_you_sure_to_delete_enrollment=Haqiqatdan ham ro\u02bcyxatga olinganlardan ushbu tanlaganingizni o\u02bcchirishni xoxlaysizmi? Bu harakat assotsirlangan hodisa/tadbirlarni ham o\u02bcchirilishiga olib keladi.
+would_you_like_to_complete_enrollment=Jarayondagi ro\u02bcyxatga olishni tugatmoqchimisiz?
+are_you_sure_to_complete_enrollment=Haqiqatdan ham tanlangan qaydlarni tugatmoqchimisiz?
+are_you_sure_to_deactivate_enrollment=Haqiqatdan ham tanlangan qaydlarni faolsizlantirmoqchimisiz?
+are_you_sure_to_activate_enrollment=Haqiqatdan ham tanlangan qaydlarni faollashtirmoqchimisiz?
+are_you_sure_to_reopen_enrollment=Haqiqatdan ham tanlangan qaydlarni qayta ochmoqchimisiz?
+are_you_sure_to_delete_event=Haqiqatdan ham tanlangan hodisa/tadbirlarni o\u02bcchirmoqchimisiz?
+are_you_sure_to_delete_event_with_audit=Haqiqatdan ham tanlangan hodisa/tadbirlarni olib tashlamoqchimisiz? Bu shuningdek barcha o\u02bczaro bog\u02bclangan audit qiymatlarining o\u02bcchirilishiga olib keladi.
+are_you_sure_to_complete_event=Haqiqatdan ham tanlangan hodisa/tadbirlarni tugatmoqchimisiz?
+please_fix_errors_before_completing=Hodisa/tadbirni tugatishdan oldin quyidagi xatolarni qayta ko\u02bcrib chiqing:
+are_you_sure_to_incomplete_event=Haqiqatdan ham tanlangan hodisa/tadbirlarni tahrirlamoqchimisiz?
+are_you_sure_to_skip_event=Haqiqatdan ham tanlangan hodisa/tadbirlarni o\u02bctkazib yubormoqchimisiz?
+are_you_sure_to_unskip_event=Haqiqatdan ham tanlangan hodisa/tadbirlarni qayta rejalashtirmoqchimisiz?
+do_you_want_to_proceed=Yaroqsiz kriteriyalar bilan ishni ettirmoqchimisiz?
+are_you_sure_to_proceed=Haqiqatdan ham davom etmoqchimisiz?
+will_delete_all_data_associated=Ushbu bilan assotsirlangan B\u0410RCh\u0410 M\u0410\u042aLUMOTL\u0410R o\u02bcchiriladi
+more=Ko\u02bcproq
+under_construction=Ishlab chiqish jarayonida
+advanced_search=Kengaytirilgan qidiruv
+profile=Profil
+applications=Ilova
+more_applications=Yana boshqa ilovalar
+manage=Manage
+settings=Sozlamalar
+account=Raqami
+help=Yordam
+log_out=Chiqish
+about_dhis2=DHIS2 haqida
+missing_translation_file=Tarjima fayli yetishmayapti
+missing_translation_using_default=Tanlangan lokal uchun tarjima fayli yo\u02bcq. Standart til ishlatiladi (Ingliz).
+loading_tree=Tashkiliy bo\u02bclim daraxti (shajarasi) yuklanmoqda
+loading_metadata=Meta-ma\u02bclumot yuklanmoqda
+loading_components=Komponentlar yuklanmoqda
+latitude=Kenglik
+longitude=Kenglik
+lat_lng=[Kenglik Uzunlik]
+get=Ol
+get_from_map=Xaritadan olish
+capture=Nazoratga olish
+nothing_captured=Hech narsa nazoratga olinmadi
+point_and_click_for_coordinate=Joyni ko\u02bcrsatish uchun sichqonchaning o\u02bcng tugmasini bosing
+value_must_be_between=Qiymat orasida bo\u02bclishi lozim
+locate_organisation_unit_by_name=Tashkiliy bo\u02bclimni nomi orqali topish
+dashboard_layout_saved=Monitoring paneli maketi saqlandi
+dashboard_layout_saved_as_default=Monitoring paneli maketi standart sifatida saqlandi
+dashboard_layout_not_saved=Monitoring paneli maketi saqlanmadi
+dashboard_layout_not_saved_as_default=Monitoring paneli maketi standart sifatida saqlash amalga oshmadi
+dashboard_layout_not_fetched=Boshqaruv paneli maketini olish amalga oshmadi
+failed_to_fetch_enrollment=Qaydlarni serverdan olish amalga oshmadi
+failed_to_save_enrollment=Qaydlarni serverda saqlash amalga oshmadi
+failed_to_update_enrollment=Qaydlarni serverda yangilash amalga oshmadi
+ou_search_scope=Tashkiliy bo\u02bclim huquq va burchlari
+zoom_in=Kattalashtirish
+zoom_out=Uzoqlashtirish
+center_map=Xaritani markazlashtirish
+set_coordinate=Koordinatani o\u02bcrnating
+coordinate=Muvofiqlashtirish
+show_active_only=Faqat faol bo\u02bclganlarni ko\u02bcrsating
+all_enrollment=Har qanday ro\u02bcyxatdan o\u02bctish holati
+active_enrollment=Faqat faol qayddagilar
+cancelled_enrollment=Faqat qayd bekor qilinganlar
+completed_enrollment=Faqat qayd tugallanganlar
+filter_events=Hodisa/tadbirlar fil\u044ctrlash
+list_events=Hodisa/Tadbirlar grafikasiga o\u02bctish
+prev_period=Oldingi davrlar
+nxt_period=Keyingi davrlar
+period=davr
+jan=Yanvar\u044c
+feb=Fevral\u044c
+mar=Mart
+apr=\u0410prel\u044c
+may=May
+jun=Iyun\u044c
+jul=Iyul\u044c
+aug=\u0410vgust
+sep=Sentyabr\u044c
+oct=Oktyabr\u044c
+nov=Noyabr\u044c
+dec=Dekabr\u044c
+week=Hafta
+save_layout_as_default=Boshqaruv paneli maketi standart sifatida saqlandi
+reset_layout=Boshqaruv paneli tartibini tiklash
+is_expected_to_be=bo\u02bclishi kutilmoqda
+but_found=ammo topildi
+equals_to=ga teng
+less_than=dan kamroq
+greater_than=dan katta
+inactive=Faol emas
+activate=Faollashtirish
+deactivate=Faolsizlantirish
+tei_inactive_only_read=faol emas. Faqat o\u02bcqish operatsiyalariga ruxsat berilgan
+hide_menu=Menyu berkitilsin
+extend_menu=Menyuni kengaytirish
+show_main_menu=\u0410sosiy menyuni ko\u02bcrsatish
+stick_right_widgets=O\u02bcng tomondagi vidjetlarni yopishtirish
+unstick_right_widgets=O\u02bcng tomndagi vidjetlarni yechib oling
+existing_associate=Mavjud sherik
+value_not_unique=Qiymat noyob emas
+custom_form_has_invalid_attribute=Maxsus shakl yaroqsiz atributga ega
+custom_form_has_invalid_dataelement=Maxsus shakl yaroqsiz ma\u02bclumot elementiga ega.
+events_today_persons=Faqat bugunda hodisa/tadbir bolar
+section_has_no_dataelements=Seksiyada ma\u02bclumotlar elementi yo\u02bcq
+section=Bo\u02bclim
+display_mode=Displeyda ko\u02bcrsatish rejimi
+tracker_capture_display_mode=Kuzatuv-nazorat displeyda ko\u02bcrsatish rejimi
+events_today_all=Barcha bugungi holat/tadbirlar
+events_today_completeoractive=To\u02bcliq yoki faol
+events_today_skipped=O\u02bctkazib yuborildi
+events_today_scheduled=Reja bo\u02bcyicha
+multiple_records_warning=Bir necha qaydlar topildi. Iltimos, yanada aniqroq bo\u02bcling.
+result=Natija
+no_record_found=Qayd topilmadi
+no_record_found_create=Qayd topilmadi. Yangi yozuv yaratmoqchimisiz?
+print_form=Chop etish shakli
+value_must_be_email=Iltimos, amaldagi ye-pochta mazilingizni kiriting
+click_to_edit_view_complete_notes=Izohni to\u02bcldirish uchun tahrir/ko\u02bcrish tugmasini bosing
+complete_and_exit =Yakunlash va chiqish
+are_you_sure_to_cancel_editing=Haqiqatdan ham ushbu profil tahririni o\u02bcchirmoqchimisiz?
+are_you_sure_to_cancel_registration=Haqiqatdan ham ushbu qaydni bekor qilmoqchimisiz?
+schedule=Jadval
+scheduled_date=Rejalashtirilgan sana
+show_new_event_menu=Yangi hodisa/tadbir menyusini ko\u02bcrsatish
+no_stages_available=Barcha kutilgan hodisa/tadbirlar allaqachon mavjud, ko\u02bcproq hodisa/tadbirlar yaratib bo\u02bclmaydi.
+make_referral=Yo\u02bcnalish yarating
+referral=Yo\u02bcnalishlarga
+show_previous=Oldingisini ko\u02bcrsatish
+show_next=Keyingisini ko\u02bcrsatish
+schedule_new=Yangi reja (jadval)
+save_note=Izohni saqlash
+add_justification=bu yerga asos qo\u02bcshing
+please_complete_all_results_before_add = Iltimos, yangisini qo\u02bcshishdan oldin barcha natijalarni tugating
+please_complete_all_results_before_schedule = Iltimos, yangi rejani qo\u02bcshishdan avval barcha natijalarni tugating
+please_complete_all_results_before_referral = Iltimos, avval barcha natijalarni to\u02bcldiring
+no_designation=Belgilanmagan
+main_menu=\u0410sosiy menyu
+complete_event_and_enrollment=Hodisa/tadbirni to\u02bcldiring va qayd qiling
+are_you_sure_to_complete_event_and_enrollment=Haqiqatdan ham ushbu hodisa/tadbirni yakunlab qayd qilmoqchimisiz?
+enrollment_is_not_active=Ro\u02bcyxatga olish nofaol
+please_complete_all_events=Iltimos, avval barcha hodisa/tadbirlarni yakunlang
+scheduling_disabled_for_programstage=Dasturning ushbu bosqichi uchun rejalashtirish o\u02bcchirib qo\u02bcyilgan
+event_already_scheduled=Hodisa/tadbir allaqachon rejalashtirilgan
+programstage_multiple_events_disabled=Dastur ushbu bosqichida bir necha hodisa/tadbirlar o\u02bctkazishga yo\u02bcl qo\u02bcymadi
+event_cant_be_created=Yangi hodisa/tadbir yaratib bo\u02bclmadi
+created=Yaratildi
+auditType=\u0410udit turi
+modifiedBy=Tomonidan o\u02bczgartirilgan
+audit_history_unavailable=\u0410udit tarixi mavjud emas
+delete_error_audit=Hodisa/tadbirni o\u02bcchirib bo\u02bclmaydi, chunki unda audit jurnallari mavjud.
+are_you_sure_to_remove=Haqiqatdan olib tashlamoqchimisiz?
+completed_label=To\u02bcldirildi
+stage_completed=Hodisa/tadbir yakunlandi
+stage_completed_label=Barchasi yakunlandi
+executed=Ma\u02bclumotlarni kiritish uchun ochilgan
+executed_label=Ochish
+stage_executed=Hodisa/tadbir ochiq
+stage_executed_label=Topilma ochildi
+ontime=Reja bo\u02bcyicha
+ontime_label=Reja bo\u02bcyicha
+stage_ontime=Hodisa/tadbir rejalashtirildi
+stage_ontime_label=Topilma rejalashtirilgan
+overdue=Muddat o\u02bctgan
+overdue_label=Muddat o\u02bctgan
+stage_overdue=Hoisa/tadbirlar muddati o\u02bctkazib yuborilgan
+stage_overdue_label=Topilma muddati o\u02bctkazib yuborilgan
+skipped=Hodisa/tadbir o\u02bctkazib yuborilgan
+skipped_label=Hodisa/tadbir o\u02bctkazib yuborilgan
+stage_empty=Bo\u02bcsh
+stage_empty_label=Bo\u02bcsh
+complete_active_events_before_completing_enrollment=Iltimos, ro\u02bcyxatga olishni yakunlashdan oldin barcha hodisa/tadbirlarni tugating
+complete_enrollment_failed=Fayl yakunlanishi amalga oshmadi
+are_you_sure_to_complete_enrollment_delete_schedule=Haqiqatdan ham ushbu qaydni yakunlamoqchimisiz? Mavjud rejalashtirilgan va muddati o\u02bctgan hodisa/tadbirlar o\u02bcchiriladi
+no_active_enrollment=Ro\u02bcyxatga olish nofaol. Iltimos, ro\u02bcyxatdan o\u02bctish uchun qayd qilish vidjetidan foydalaning.
+events_today=Bugungi hodisa/tadbirlar
+events_in_one_week=Haftalik hodisa/tadbirlar
+events_in_two_weeks=Ikki haftalik hodisa/tadbirlar
+events_in_one_month=Oylik hodisa/tadbirlar
+choose_the_dates=Sanalarni tanlang
+fill_all_category_options=Iltimos, kategoriyalarning barcha variantlarini to\u02bcldiring
+description=Tavsif
+url=URL
+not_available=Mavjud emas
+attribute=\u0410tribut
+data_entry=Ma\u02bclumot kiritish
+invalid_coordinate_format=Koordinatalar formati noto\u02bcg\u02bcri
+latitude_longitude_format=Uzunlik, Kenglik
+missing_search_ous=Foydalanuvchi unga biriktirilgan tashkiliy bo\u02bclimlarga ega emas
+cocbo_filter=Kategoriya va Kategoriya variantlari fil\u044ctri
+apply=Murojaat qilish
+attribute_category_selection=\u0410tribut kategoriyasini tanlash
+event_filter=Ma\u02bclumot elementi qiymatiga ko\u02bcra hodisa/tadbirlar fil\u044ctri, bosqichi yoki tashkiliy bo\u02bclim nomi
+validation_errors=Shakldagi joriy xatolar:
+validation_warnings=Ushbu ogohlantirishlarni esda tuting:
+openstreetmap=OpenStreetMap
+googlemap=Google xaritalar
+missing_google_map_api_key=Google Xaritalar API kaliti yetishmayapti. Buni Tizim sozlamalarida to\u02bcg\u02bcrilash mumkin (Foydalanish huquqi sozlamalari).
+missing_mapzen_search_api_key=Mapzen qidiruv API kaliti yetishmayapti. Buni Tizim Sozlamalarida to\u02bcg\u02bcrilash mumkin (Foydalanish huquqi sozlamalari).
+sms=SMS
+email=Elektron pochta
+email_address=Ye-pochta manzili
+wrong_email=Iltimos, ye-pochta mazilingizni aniqlashtiring
+email_subject=Mavzu
+message=Xabar
+gridColumns_fetch_failed=Ustunlar to\u02bcrini displeyda ko\u02bcrsatish amalga oshmadi
+gridColumns_invalid=Serverdan noto\u02bcg\u02bcri ustunlar to\u02bcri qaytarildi
+dasboard_layout_saving_failed=Boshqaruv paneli maketini saqlanish amalga oshmadi
+failed_to_register_tei=Kuzatuvdagi ob\u02bcekt nusxasini serverda ro\u02bcyxatdan o\u02bctkazib bo\u02bclmadi
+failed_to_update_tei=Kuzatuvdagi ob\u02bcekt nusxasini serverda yangilash amalga oshmadi
+failed_to_generate_tracked_entity_attribute=\u0410tribut qiymatini shakllantirish amalga oshmadi
+failed_to_fetch_events=Serverdan hodisa/tadbirlar ma\u02bclumotini olish amalga oshmadi
+failed_to_update_event=Hodisa/tadbirlarni serverda yangilash amalga oshmadi
+failed_to_send_message=Xabarni yuborish amalga oshmadi
+file_missing=Fayl yo\u02bcq
+file_upload_failed=Fayl yangilanishi amalga oshmadi
+missing_file_identifier= Fayl identifikatori yo\u02bcq
+unsupported_value_type=Qo\u02bcllab quvvatlanmaydigan qiymat turi
+event_date_out_of_range=Belgilangan sanani o\u02bcrnatib bo\u02bclmaydi. Dastur uchun sozlangan davr sanasi, belgilangan sanadan o\u02bctgan.
+date_out_of_ou_period=Sana, tashkiliy bo\u02bclim ish boshlagan va yakunlangan sanalar ichiga kirmaydi
+orgunit_closed= Tashkiliy bo\u02bclim yopilgan. Ro\u02bcyxatga olish va tahrirlash o\u02bcchirilgan.
+dob=Tug\u02bcilgan sana
+years=Yillar
+months=Oylar
+days=Kunlar
+age_fields_info=Yosh bo\u02bcyicha ma\u02bclumot
+reponse_from_server=Serverdan javob.
+loading-audit-data=\u0410udit ma\u02bclumotlari yuklanmoqda.
+more_options_available=ko\u02bcproq imkoniyatlar mavjud, qidirib ko\u02bcring
+move_permanently=Doimiy xarakatda bo\u02bcling
+onetime_referral=Bir martalik murojaat
+are_you_sure_you_want_to_move_permanently=Haqiqatdan ham patsientni doimiy harakatlantirmoqchimisiz?
+ok=OK
+can_not_add_new_enrollment=Yangi qayd qo\u02bcsha olmaysiz, chunki ushbu dastur faqat bitta qayd olib borishga imkon beradi
+switch_compare_form=Taqqoslash shakliga o\u02bctish
+switch_default_form=Standart shaklga o\u02bctish
+switch_tabel_form=Jadval shakliga o\u02bctish
+url_format=http(s)://
+url_error=URL manzili haqiqiyligiga ishonch hosil qiling
+time_error=Vaqt formati noto\u02bcg\u02bcri
+no_blank_date=Tadbir uchun sana lozim. \u0410gar siz ushbu hodisa/tadbirni rejalashtirmoqchi bo\u02bclsangi, iltimos, ushbu hodisa/tadbirni o\u02bcchirib tashlang va yangi hodisa/tadbir yaratib rejalashtiring.
+not_authorized_to_uncomplete_event=Tugallanmagan hodisa/tadbirlar uchun avtorizatsiyadan o\u02bctmagan
+both_date_and_time=Iltimos, sana va vaqt maydonlari to\u02bcldirilganligiga va ularning to\u02bcg\u02bcri formatda muvofiqligiga ishonch hosil qiling. \u0410ks holda ma\u02bclumotlar saqlanmaydi.
+wrong_time_format=Iltimos, vaqt formatida (SS:DD (soat:daqiqa))ga rioya qilinganligiga ishonch hosil qiling.
+hours_and_minutes=SS:DD (soat:daqiqa)
+top_bar_settings=Yuqori satr sozlamalari
+show=Ko\u02bcrsating
+sort_order=Saralash tartibi
+activate_top_bar=Yuqori satr faollashtiring
+use_as_top_bar=Use as top bar
+remove_widget=Vidjet olib tashlansinmi?
+remove_widget_info=Siz vidjetni olib tashlamoqchisiz. Davom etishni xoxlaysizmi?
+lock_default_layout=Barcha foydalanuvchilar uchun maketni bloklash
+unlock_default_layout=Barcha foydalanuvchilar uchun maketni blokdan yechish
+upload_image=Yuklash
+please_select_an_image=[Iltimos, rasmni tanlang]
+all=Barchasi
+ALL=Barchasi
+completed=To\u02bcldirildi
+active=Faol
+cancelled=Bekor qilindi
+enrollment_status=Ro\u02bcyxatga olish holati
+go_to_registration=Ro\u02bcyxatga olishga o\u02bctish
+tracked_entity_instance_search_results_header={trackedEntityTypeName} qidiruv natijalari
+tracked_entity_instance_search_matches_description=\u0410gar yuqoridagi hech biri siz qidirganingiz {trackedEntityTypeName} bo\u02bclmasa, "Ro\u02bcyxatga olish sahifasi" ga o\u02bcting
+tracked_entity_instance_unique_found_header={trackedEntityTypeName} topildi
+tracked_entity_instance_unique_found_description=Boshqa bir {orgUnitLevelName} da {trackedEntityTypeName} topildi.
+no_tracked_entity_instance_found_header={trackedEntityTypeName} topilmadi.
+no_tracked_entity_instance_found_description={trackedEntityTypeName} topilmadi.
+no_tracked_entity_instance_found_go_to_registration_description={trackedEntityTypeName} da topilmadi, agar yangi ro\u02bcyxatga olishni xoxlasangiz, ro\u02bcyxatga olishga o\u02bctishni bosing
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} allaqachon mavjud
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} allaqachon boshqa {trackedEntityTypeName} uchun mavjud. Ushbu {trackedEntityTypeName} ni ochmoqchimisiz?
+possible_duplicates_found=Ehtimoliy nusxalar aniqlandi
+view_x_candidates=Ko\u02bcrib chiqish {count} mijozlarni
+view_candidate=Mijozlarni ko\u02bcrib chiqish
+matching_tracked_entity_instance_register_description=Mos keladiganini ochish uchun istalgan {trackedEntityTypeName} ni bosing yoki orqaga qayting va ro\u02bcyxatga olishni yakunlang
+review_possible_duplicates_before_registration=Ro\u02bcyxatga olishdan oldin ehtimoliy nusxalar borligini tekshiring
+review_possible_duplicates_description=Yuqoridagi takrorlanayotgan nusxalardan birini yoki yangi ro\u02bcyxatga olishni tanlang {trackedEntityTypeName}
+register_new_tracked_entity_instance=Yangi ro\u02bcyxatga oling {trackedEntityTypeName}
+large_number_of_search_results_warning=Ko\u02bcp sonli to\u02bcplam topildi. Iltimos, orqaga qayting va qidiruv mezonlarini chuqurroq aniqlashtiring yoki ro\u02bcyxatga olish sahifasiga o\u02bcting
+too_many_search_results=Qidiruv natijalari juda ko\u02bcp
+open=Ochish
+continue=Davom etish
+no_program_write_access=Xabar jo\u02bcnatish uchun dasturda yozuv qoldirish huquqi
+show_all=Barchaga ko\u02bcrsatish
+not_allowed=Ruxsat berilmaydi
+you_do_not_have_the_necessary_authorities_to_delete=O\u02bcchirish uchun zarur bo\u02bclgan huquq sizda mavjud emas
+this=bu
+delete_failed=O\u02bcchirish amalga oshmadi
+cannot_delete_this_enrollment_because_it_already_contains_events=Ushbu qaydni o\u02bcchirib bo\u02bclmaydi, chunki unda allaqachon hodisa/tadbirlar mavjud. Iltimos, qaydni o\u02bcchirishdan oldin hodisa/tadbirlarni o\u02bcchiring
+cannot_delete_this_tei_because_it_already_contains_enrollments=Ushbu kuzatuvdagi shaxs namunasini o\u02bcchirib bo\u02bclmaydi, chunki unda allaqachon qaydlar mavjud. Iltimos, kuzatuvdagi shaxs namunasini o\u02bcchirishdan oldin qaydlarni o\u02bcchiring
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=Tanlangan dasturda {trackedEntityTypeName} topilmadi. Boshqa dasturdagi natijalarni ko\u02bcrsatish.
+drop_image=Tasvirni tushirish
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=Dastur ma\u02bclumotlarisiz qidiruv shakllantirish uchun, sizda kamida bir kuzatuvdagi ob\u02bcekt ko\u02bcrinishiga ruxsat bo\u02bclishi lozim
+missing_read_access_for_tracked_entity_type=Kuzatuvdagi ob\u02bcekt turi ma\u02bclumotlarini ko\u02bcrish uchun ruxsat zarur
+stage_write_required=Dasturning bu bosqichida yozuv qoldirish uchun ruxsat zarur
+you_need_write_to_program_stage_to_be_able_to_create_event=Dasturning bu bosqichida yangi hodisa/tadbir haqida yozuv qoldirish uchun ruxsat zarur
+no_polygon_captured=Ko\u02bcpburchak ushlanmadi
+polygon_captured=Ko\u02bcpburchak ushlandi
+no_geometry_captured=Geometriya ushlanmadi
+geometry=Geometriya
+tracked_entity_type=Kuzatuvdagi ob\u02bcekt turi
+type=Turi
+tracked_entity_type_has_no_attributes=Kuzatuvdagi ob\u02bcekt turi, atributllarsiz.
+belongs_to_another_organisation_unit=boshqa tashkiliy birlikka tegishli
+please_fill_in_a_reason_for_accessing=Iltimos, kirishga ruxsat olish uchun sabab ko\u02bcrsating
+your_action_is_being_monitored=Sizning harakatlaringiz kuzatilmoqda
+this=bu
+saving_relationship_failed_conflicts=O\u02bczaro aloqalarni saqlash amalga oshmadi. Nomutanosiblik
+saving_relationship_failed=O\u02bczaro aloqalarni saqlash amalga oshmadi.
+open_tei_error=TEI ochish amalga oshmadi
+PROGRAM_ACCESS_CLOSED=Tashkiliy birlikdan tashqari bo\u02bclganligi uchun kuzatuvdagi shaxs ma\u02bclumotlarini olish imkoni yo\u02bcq
+compare_form_previous=Oldingi shaklni taqqoslash
+compare_form_all=Barcha shakllarni taqqoslash
+grid_form=Tarmoq shakli
+pop_over_form=POP - yon shakl
+failed_to_delete_enrollment=Ro\u02bcyxatga olinish jarayoni o\u02bcchirilishida xatolik
+enrollment_polygon=Ro\u02bcyxatga olish ko\u02bcpburchagi
+enrollment_point=Ro\u02bcyxatga olish nuqtasi
+event_polygon=Hodisa/tadbir ko\u02bcpburchagi
+event_point=Hodisa/tadbir nuqtasi
+point_on_map=Xaritada nuqta
+polygon_on_map=Xaritada ko\u02bcpburchak
+cancel_capturing_polygon=Ko\u02bcpburchakni shakllantirishni bekor qiling
+you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=Siz rasm chizish rejimida. Tugallanmagan o\u02bczgartirishlar yo\u02bcqotiladi
+complete_stage=Bosqich yakunlansinmi?
+complete_stage_info=Bu bosqich tugatilishini xoxlaysizmi?
+assigned_user=Tavsiya etilgan foydalanuvchi
+linked_events=Bog\u02bcliq hodisalar
+user_assignment=Foydalanuvchi tayinlanishi
+specific_users=Muayyan foydalanuvchi
+none=Yo\u02bcq
+any=Har qanday
+no_requirement=Hech qanday talab yo\u02bcq
+the_record_has_is_possible_duplicate=Yozuv tarkibida/ehtimol nusxasi
+flag_possible_duplicate=Ehtimoliy nusxa belilansin
+possible_duplicate=Ehtimoliy nusxa
+unflag=Belgini olib tashlang
+possible_duplicate_info_start=Ehtimoliy nusxa: Bu
+possible_duplicate_info_end= mumkin bo\u02bclgan yoki ehtimoliy nusxasi va ko\u02bcrib chiqish uchun belgilangan
+owned_by=Tegishli:
+change_date_with_dependency_information=Updating this date might require further action from you. Events in this program have been scheduled based on this date, but these events will not be rescheduled automatically. Do you want to continue with the date update?
+custom_working_list=Custom working list
diff --git a/i18n/i18n_app_vi.properties b/i18n/i18n_app_vi.properties
index 5fdab0ccd..1e8e34f60 100644
--- a/i18n/i18n_app_vi.properties
+++ b/i18n/i18n_app_vi.properties
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=Ch\u01b0a \u0111\u0103ng k\u00fd. Kh\u00f4ng th\u1ec
 not_yet_enrolled_enrollment=Kh\u00f4ng c\u00f3 \u0111\u0103ng k\u00fd.
 no_active_enrollment_exists=Kh\u00f4ng c\u00f3 \u0111\u0103ng k\u00fd hi\u1ec7u l\u1ef1c trong ch\u01b0\u01a1ng tr\u00ecnh \u0111\u00e3 ch\u1ecdn
 no_active_enrollments_exist=Kh\u00f4ng c\u00f3 \u0111\u0103ng k\u00fd hi\u1ec7u l\u1ef1c
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=Ch\u01b0a \u0111\u0103ng k\u00fd. Kh\u00f4ng th\u1ec3 l\u01b0u ghi ch\u00fa.
 not_yet_enrolled_report=Ch\u01b0a \u0111\u0103ng k\u00fd. Kh\u00f4ng th\u1ec3 b\u00e1o c\u00e1o
 no_data_report=Kh\u00f4ng c\u00f3 d\u1eef li\u1ec7u t\u1ed3n t\u1ea1i cho vi\u1ec7c b\u00e1o c\u00e1o
@@ -193,7 +194,7 @@ overdue_events_description=Xu\u1ea5t danh s\u00e1ch s\u1ef1 ki\u1ec7n c\u1ee7a c
 enrollment_stats=Th\u1ed1ng K\u00ea \u0110\u0103ng K\u00fd
 event_stats=Th\u1ed1ng K\u00ea S\u1ef1 Ki\u1ec7n
 upcoming_event=S\u1ef1 Ki\u1ec7n S\u1eafp \u0110\u1ebfn
-legend=Ch\u00fa Th\u00edch
+legend=Ch\u00fa gi\u1ea3i
 event_color_legend=M\u00e0u s\u1eafc c\u00f3 \u00fd ngh\u0129a g\u00ec?
 report=B\u00e1o c\u00e1o
 _report=b\u00e1o c\u00e1o
@@ -205,6 +206,7 @@ registered_data=D\u1eef li\u1ec7u \u0111\u00e3 \u0111\u0103ng k\u00fd
 no_value=Kh\u00f4ng c\u00f3 gi\u00e1 tr\u1ecb
 no_data_found=Kh\u00f4ng t\u00ecm th\u1ea5y d\u1eef li\u1ec7u
 no_data=Kh\u00f4ng c\u00f3 d\u1eef li\u1ec7u
+mo_matching_data=No data matching your search criteria
 data_exists=D\u1eef li\u1ec7u t\u1ed3n t\u1ea1i
 data_registerd=Ch\u01b0a \u0111\u0103ng k\u00fd d\u1eef li\u1ec7u
 no_visit_made=L\u1ea7n h\u1eb9n g\u1eb7p \u0111\u00e3 th\u1ef1c hi\u1ec7n
@@ -352,6 +354,7 @@ advanced_search=T\u00ecm ki\u1ebfm n\u00e2ng cao
 profile=H\u1ed3 s\u01a1
 applications=\u1ee8ng d\u1ee5ng
 more_applications=Hi\u1ec3n th\u1ecb th\u00eam
+manage=Manage
 settings=C\u00e0i \u0111\u1eb7t
 account=T\u00e0i kho\u1ea3n
 help=Gi\u00fap \u0111\u1ee1
@@ -400,7 +403,7 @@ jan=Th\u00e1ng m\u1ed9t
 feb=Th\u00e1ng hai
 mar=Th\u00e1ng ba
 apr=Th\u00e1ng t\u01b0
-may=Th.5
+may=Th\u00e1ng n\u0103m
 jun=Th\u00e1ng s\u00e1u
 jul=Th\u00e1ng b\u1ea3y
 aug=Th\u00e1ng t\u00e1m
@@ -563,7 +566,7 @@ can_not_add_new_enrollment=Kh\u00f4ng th\u1ec3 th\u00eam \u0111\u0103ng k\u00fd
 switch_compare_form=M\u1edf bi\u1ec3u so s\u00e1nh
 switch_default_form=M\u1edf bi\u1ec3u m\u1eb7c \u0111\u1ecbnh
 switch_tabel_form=Switch to tabel form
-url_format=http(s)://
+url_format=http (s): //
 url_error=H\u00e3y ch\u1eafc ch\u1eafn r\u1eb1ng URL h\u1ee3p l\u1ec7
 time_error=\u0110\u1ecbnh d\u1ea1ng th\u1eddi gian kh\u00f4ng \u0111\u00fang
 no_blank_date=C\u1ea7n ng\u00e0y cho s\u1ef1 ki\u1ec7n. N\u1ebfu b\u1ea1n mu\u1ed1n l\u1eadp k\u1ebf ho\u1ea1ch cho s\u1ef1 ki\u1ec7n, xin vui l\u00f2ng xoa s\u1ef1 ki\u1ec7n n\u00e0y v\u00e0 t\u1ea1o m\u1ed9t s\u1ef1 ki\u1ec7n c\u00f3 k\u1ebf ho\u1ea1ch m\u1edbi.
@@ -575,6 +578,7 @@ top_bar_settings=C\u00e0i \u0111\u1eb7t thanh tr\u00ean c\u00f9ng
 show=Hi\u1ec7n
 sort_order=Th\u1ee9 t\u1ef1 s\u1eafp x\u1ebfp
 activate_top_bar=K\u00edch ho\u1ea1t thanh tr\u00ean c\u00f9ng
+use_as_top_bar=Use as top bar
 remove_widget=B\u1ecf ti\u1ec7n \u00edch?
 remove_widget_info=B\u1ea1n \u0111ang chu\u1ea9n b\u1ecb b\u1ecf m\u1ed9t ti\u1ec7n \u00edch. B\u1ea1n c\u00f3 mu\u1ed1n ti\u1ebfp t\u1ee5c kh\u00f4ng?
 lock_default_layout=Kh\u00f3a b\u1ed1 c\u1ee5c \u0111\u1ed1i v\u1edbi t\u1ea5t c\u1ea3 ng\u01b0\u1eddi d\u00f9ng
@@ -617,14 +621,14 @@ delete_failed=Kh\u00f4ng th\u1ec3 x\u00f3a
 cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
 cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
 no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
-drop_image=Drop image
+drop_image=Th\u00eam h\u00ecnh \u1ea3nh
 you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
 missing_read_access_for_tracked_entity_type=Missing read access for tracked entity type
 stage_write_required=Program stage write access required
 you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
-no_polygon_captured=No polygon captured
-polygon_captured=Polygon captured
-no_geometry_captured=No geometry captured
+no_polygon_captured=Kh\u00f4ng c\u00f3 \u0111a gi\u00e1c n\u00e0o \u0111\u01b0\u1ee3c th\u00eam
+polygon_captured=\u0110a gi\u00e1c \u0111\u01b0\u1ee3c th\u00eam
+no_geometry_captured=Kh\u00f4ng c\u00f3 h\u00ecnh n\u00e0o \u0111\u01b0\u1ee3c th\u00eam
 geometry=Geometry
 tracked_entity_type=Tracked entity type
 type=Lo\u1ea1i
@@ -652,7 +656,7 @@ cancel_capturing_polygon=Cancel capturing polygon
 you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=You are currently in draw mode. All unfinished changes will be lost.
 complete_stage=Complete stage?
 complete_stage_info=Do you want to set this stage to complete?
-assigned_user=Assigned user
+assigned_user=Ng\u01b0\u1eddi d\u00f9ng \u0111\u01b0\u1ee3c ch\u1ec9 \u0111\u1ecbnh
 linked_events=Linked events
 user_assignment=User assignment
 specific_users=Specific users:
diff --git a/i18n/i18n_app_zh.properties b/i18n/i18n_app_zh.properties
index 62ac7bf57..65fefe605 100644
--- a/i18n/i18n_app_zh.properties
+++ b/i18n/i18n_app_zh.properties
@@ -1,53 +1,54 @@
 tracker_capture=\u8ddf\u8e2a\u968f\u8bbf
-online_notification=\u4f60\u5728\u7ebf
+online_notification=\u4f60\u5df2\u7ecf\u5728\u7ebf
 offline_notification=\u4f60\u5df2\u7ecf\u79bb\u7ebf
-login_failed=\u767b\u5f55\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5\u4f60\u7684\u7528\u6237\u540d\u548c\u53e3\u4ee4\u518d\u8bd5
-tracked_entity_management=\u8ddf\u8e2a\u5b9e\u4f53\u7ba1\u7406
-registering_unit=\u767b\u8bb0\u673a\u6784
+login_failed=\u767b\u5f55\u5931\u8d25\uff0c\u68c0\u67e5\u7528\u6237\u548c\u53e3\u4ee4\u540e\u91cd\u8bd5
+tracked_entity_management=\u8ddf\u8e2a\u968f\u8bbf\u5b9e\u4f53\u7ba1\u7406
+registering_unit=\u6ce8\u518c\u673a\u6784
 program=\u9879\u76ee
-tracked_entity=\u8ddf\u8e2a\u5b9e\u4f53
-tracked_entity_instance=\u8ddf\u8e2a\u7684\u5b9e\u4f53
-tracked_entity_attribute=\u8ddf\u8e2a\u5b9e\u4f53\u5c5e\u6027
-select_or_search=\u4ece\u5217\u8868\u9009\u62e9\u6216\u641c\u7d22
+tracked_entity=\u8ddf\u8e2a\u7684\u5b9e\u4f53
+tracked_entity_instance=\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b
+tracked_entity_attribute=Tracked entity attribute
+select_or_search=\u4ece\u5217\u8868\u4e2d\u641c\u7d22\u6216\u9009\u62e9
 please_select=[\u8bf7\u9009\u62e9]
-please_select_a_program=[\u8bf7\u9009\u62e9\u9879\u76ee]
-no_program_exists=\u3010\u4e0d\u5b58\u5728\u9879\u76ee\u3011
-please_select_a_program_for_enrollment=\u8bf7\u9009\u62e9\u8981\u6ce8\u518c\u7684\u9879\u76ee
-please_select_program_report=\u8bf7\u9009\u62e9\u8981\u586b\u62a5\u7684\u9879\u76ee
-please_select_a_relationship=\u8bf7\u9009\u62e9\u5173\u7cfb
-no_relationship=\u8fd8\u4e0d\u5b58\u5728\u5173\u7cfb
-relationship_not_possible=\u65e0\u8ddf\u8e2a\u5b9e\u4f53\uff0c\u5efa\u5173\u7cfb\u4e0d\u53ef\u80fd
-no_program_exists_enrollment=\u9009\u62e9\u7684\u673a\u6784\u65e0\u76f8\u5173\u9879\u76ee\uff0c\u4e0d\u80fd\u6ce8\u518c
-no_program_exists_report=\u9009\u62e9\u7684\u673a\u6784\u65e0\u76f8\u5173\u9879\u76ee\uff0c\u4e0d\u80fd\u62a5\u544a
+please_select_a_program=[\u8bf7\u9009\u62e9\u4e00\u4e2a\u9879\u76ee]
+no_program_exists=[\u6ca1\u6709\u9879\u76ee\u5b58\u5728]
+please_select_a_program_for_enrollment=\u8bf7\u9009\u62e9\u4e00\u4e2a\u6ce8\u518c\u9879\u76ee
+please_select_program_report=\u8bf7\u9009\u62e9\u4e00\u4e2a\u62a5\u544a\u9879\u76ee
+please_select_a_relationship=\u8bf7\u9009\u62e9\u4e00\u4e2a\u5173\u7cfb
+no_relationship=\u6ca1\u6709\u5173\u7cfb\u5b58\u5728
+relationship_not_possible=\u6ca1\u6709\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b\uff0c\u4e0d\u53ef\u80fd\u5b58\u5728\u5173\u7cfb
+no_program_exists_enrollment=\u9009\u62e9\u7684\u673a\u6784\u6ca1\u6709\u9879\u76ee\uff0c\u4e0d\u80fd\u6ce8\u518c
+no_program_exists_report=\u9009\u62e9\u7684\u673a\u6784\u6ca1\u6709\u9879\u76ee\uff0c\u4e0d\u80fd\u62a5\u544a
 not_yet_enrolled_data_entry=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u4e0d\u80fd\u8f93\u5165\u6570\u636e
-not_yet_enrolled_enrollment=\u4e0d\u5b58\u5728\u6ce8\u518c\u7684
-no_active_enrollment_exists=\u9009\u62e9\u7684\u9879\u76ee\u4e0d\u5b58\u5728\u6d3b\u52a8\u7684\u9879\u76ee
-no_active_enrollments_exist=\u65e0\u6d3b\u52a8\u7684\u6ce8\u518c
-not_yet_enrolled_note=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u7b14\u8bb0\u4e0d\u80fd\u8bb0\u5f55
-not_yet_enrolled_report=\u6ca1\u6709\u6ce8\u518c\uff0c\u4e0d\u80fd\u62a5\u544a
-no_data_report=\u65e0\u62a5\u544a\u8bb0\u5f55
+not_yet_enrolled_enrollment=\u6ca1\u6709\u6ce8\u518c\u5b58\u5728
+no_active_enrollment_exists=\u6240\u9009\u9879\u76ee\u4e0d\u5b58\u5728\u6709\u6548\u7684\u6ce8\u518c
+no_active_enrollments_exist=\u4e0d\u5b58\u5728\u5f00\u653e\u7684\u6ce8\u518c
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
+not_yet_enrolled_note=\u8fd8\u6ca1\u6709\u6ce8\u518c.\u7b14\u8bb0\u8bb0\u5f55\u4e0d\u53ef\u80fd.
+not_yet_enrolled_report=\u8fd8\u6ca1\u6709\u6ce8\u518c. \u4e0d\u80fd\u51fa\u62a5\u544a.
+no_data_report=\u6ca1\u6709\u8bb0\u5f55\u53ef\u4ee5\u62a5\u8868
 no_notes_exist=\u4e0d\u5b58\u5728\u7b14\u8bb0
-event=\u56db\u7ea7
-no_event_is_yet_created=\u65e0\u53ef\u7528\u7684\u4e8b\u4ef6\u53ef\u8f93\u5165\u6570\u636e\uff0c\u8bf7\u5148\u521b\u5efa\u4e00\u4e2a
+event=\u4e8b\u4ef6
+no_event_is_yet_created=\u65e0\u4e8b\u4ef6\u53ef\u7528\u4e0e\u6570\u636e\u5f55\u5165. \u8bf7\u521b\u5efa\u4e00\u4e2a.
 event_creation=\u8bf7\u4ece\u4e0b\u9762\u521b\u5efa\u4e00\u4e2a
-not_selected=\u672a\u9009\u5b9a
+not_selected=\u6ca1\u6709\u9009\u62e9
 create=\u521b\u5efa
-view_all=\u67e5\u770b\u6240\u6709
-list_all_entities=\u5b9e\u4f53\u5217\u8868
-list_all=\u5168\u90e8\u5217\u8868
+view_all=[\u67e5\u770b\u5168\u90e8]
+list_all_entities=\u5217\u8868\u6240\u6709\u5b9e\u4f53
+list_all=\u5217\u8868\u5168\u90e8
 list=\u5217\u8868
 lists=\u6e05\u5355
 invalid=\u65e0\u6548
-selected_tei_is_invalid=\u9009\u62e9\u7684\u5b9e\u4f53\u65e0\u6548
-required=\u6240\u9700
-number_required=\u9700\u8981\u6570\u5b57
-date_required=\u9700\u8981\u65e5\u671f
-number=\u6570\u5b57
-value_must_be_number=\u503c\u5fc5\u987b\u662f\u4e00\u4e2a\u6570\u5b57
-value_must_be_posInt=\u503c\u5fc5\u987b\u662f\u4e00\u4e2a\u6b63\u6574\u6570
-value_must_be_negInt=Value must be a negative integer
-value_must_be_zeroPositiveInt=Value must be zero or a positive integer
-value_must_be_int=\u503c\u5fc5\u987b\u662f\u4e00\u4e2a\u6574\u6570
+selected_tei_is_invalid=\u6240\u9009\u7684\u8ddf\u8e2a\u5b9e\u4f53\u5b9e\u4f8b\u65e0\u6548
+required=\u5fc5\u987b\u7684
+number_required=\u9700\u8981\u6570\u636e
+date_required=\u9700\u8981\u6570\u636e
+number=\u6570\u636e
+value_must_be_number=Value must be a number
+value_must_be_posInt=\u503c\u9700\u4e3a\u6b63\u6574\u6570
+value_must_be_negInt=\u503c\u9700\u4e3a\u8d1f\u6574\u6570
+value_must_be_zeroPositiveInt=\u503c\u9700\u4e3a\u96f6\u6216\u6b63\u6574\u6570
+value_must_be_int=\u503c\u5fc5\u987b\u662f\u6574\u6570
 posInt=\u6b63\u6574\u6570
 negInt=\u8d1f\u6574\u6570
 zeroPositiveInt=\u96f6\u6216\u6b63\u6574\u6570
@@ -66,30 +67,30 @@ search_by_data_element=\u6309\u6570\u636e\u5143\u641c\u7d22
 search_by_attribute=\u6309\u5c5e\u6027\u641c\u7d22
 search_for=\u641c\u7d22
 type_your_search_criteria_here=\u8fd9\u91cc\u8f93\u5165\u4f60\u7684\u641c\u7d22\u6761\u4ef6
-search_input_required=\u8bf7\u5b9a\u4e49\u641c\u7d22\u6761\u4ef6
+search_input_required=\u8bf7\u6307\u5b9a\u641c\u7d22\u6761\u4ef6
 in_progress=\u8fdb\u884c\u4e2d
 registered_entities=\u6ce8\u518c\u7684\u5b9e\u4f53
 empty=\u7a7a
-form_is_empty_fill_at_least_one=\u8868\u5355\u4e3a\u7a7a\uff0c\u8bf7\u81f3\u5c11\u586b\u4e00\u4e2a
+form_is_empty_fill_at_least_one=\u8868\u5355\u662f\u7a7a\u7684\uff0c\u8bf7\u81f3\u5c11\u586b\u5145\u4e00\u4e2a
 no_event_exists=\u6ca1\u6709\u4e8b\u4ef6
 total=\u603b\u5171
 total_number_of_pages=\u9875\u6570
 rows_per_page=\u6bcf\u9875\u884c\u6570
-jump_to_page=\u8df3\u5230\u9875\u9762
+jump_to_page=\u8df3\u5230
 page=\u9875
 first=\u7b2c\u4e00
 previous=\u524d\u4e00
-next=\u4e0b\u4e00\u5e74
+next=\u4e0b\u4e00\u4e2a
 last=\u6700\u540e
-go_to_dashboard=\u8fdb\u5230\u4eea\u8868\u76d8
+go_to_dashboard=\u8fdb\u5165\u4eea\u8868\u76d8
 go=\u8fdb\u5165
-find=\u67e5\u8be2
+find=\u53d1\u73b0
 edit=\u7f16\u8f91
-edit_profile=\u7f16\u8f91\u4e2a\u4eba\u57fa\u672c\u4fe1\u606f
-tracker_associate=\u8ddf\u8e2a\u76f8\u5173
-association=\u7ba1\u7406\u5173\u7cfb
+edit_profile=\u7f16\u8f91\u7b80\u5386
+tracker_associate=\u8ddf\u8e2a\u5668\u76f8\u5173
+association=\u7ba1\u7406\u76f8\u5173
 change_location=\u7ba1\u7406\u4f4d\u7f6e
-details_history=\u8be6\u60c5/\u5386\u53f2
+details_history=\u660e\u7ec6/\u5386\u53f2
 history=\u5386\u53f2
 canceled=\u53d6\u6d88\u7684
 delete=\u5220\u9664
@@ -99,144 +100,145 @@ entity=\u5b9e\u4f53
 clear=\u6e05\u9664
 add=\u6dfb\u52a0
 add_note=\u6dfb\u52a0\u7b14\u8bb0
-search_note=\u641c\u7d22\u7f16\u8f91
+search_note=\u641c\u7d22\u7b14\u8bb0
 your_note_here=\u4f60\u7684\u7b14\u8bb0
 phone_number=\u7535\u8bdd\u53f7\u7801
-your_sms_message_here=\u4f60\u7684\u77ed\u4fe1\u5728\u8fd9\u91cc
+your_sms_message_here=Your SMS message here
 your_email_message_here=Your E-mail message here
 sms_send_status=SMS \u53d1\u9001\u72b6\u6001
 send=\u53d1\u9001
 add_new_event=\u6dfb\u52a0\u65b0\u4e8b\u4ef6
-add_new_event_for_stage=\u6dfb\u52a0\u8be5\u9636\u6bb5\u7684\u65b0\u4e8b\u4ef6
+add_new_event_for_stage=\u6dfb\u52a0\u65b0\u9636\u6bb5\u4e8b\u4ef6
 schedule_new_event=\u8c03\u5ea6\u65b0\u4e8b\u4ef6
-schedule_new_event_for_stage=\u8c03\u5ea6\u8be5\u9636\u6bb5\u7684\u65b0\u4e8b\u4ef6
-refer_new_event_for_stage=\u8f6c\u8bca\u8be5\u9636\u6bb5\u65b0\u4e8b\u4ef6
+schedule_new_event_for_stage=\u8c03\u5ea6\u65b0\u9636\u6bb5\u4e8b\u4ef6\uff1a
+refer_new_event_for_stage=\u8f6c\u79fb\u8be5\u9636\u6bb5\u7684\u65b0\u4e8b\u4ef6
 skip=\u8df3\u8fc7
 unskip=\u8c03\u56de
 complete=\u5b8c\u6210
-incomplete=\u4e0d\u5b8c\u6574
-reopen=\u91cd\u542f
+incomplete=\u672a\u5b8c\u6210
+reopen=\u91cd\u65b0\u6253\u5f00
 validate=\u9a8c\u8bc1
 validation_result=\u9a8c\u8bc1\u7ed3\u679c
 status=\u72b6\u6001
 event_completed=\u4e8b\u4ef6\u5b8c\u6210?
-details=\u70b9\u51fb\u67e5\u770b\u660e\u7ec6
+details=\u70b9\u51fb\u67e5\u770b\u8be6\u60c5
 _details=\u8be6\u60c5
-created_by=\u767b\u8bb0\u81ea
+created_by=\u767b\u8bb0\u4eba
 date=\u65e5\u671f
 _date=\u65e5\u671f
 event_name=\u4e8b\u4ef6\u540d\u79f0
 new_event=\u65b0\u4e8b\u4ef6
-create_new_event=\u53c2\u52a0\u65b0\u4e8b\u4ef6
-create_new_event_repeatable=\u4ece\u53ef\u91cd\u590d\u7684\u9636\u6bb5\u521b\u5efa\u65b0\u4e8b\u4ef6
-toggle_table_view_on=\u663e\u793a\u53ef\u80fd\u7684\u4e8b\u4ef6\u4e3a\u8868\u683c
-toggle_table_view_off=\u663e\u793a\u6bcf\u4e2a\u4e8b\u4ef6\u7684\u8f93\u5165\u8868\u5355
+create_new_event=\u521b\u5efa\u65b0\u4e8b\u4ef6
+create_new_event_repeatable=\u4ece\u53ef\u91cd\u590d\u7684\u9636\u6bb5\u521b\u5efa\u4e8b\u4ef6
+toggle_table_view_on=\u5c3d\u53ef\u80fd\u663e\u793a\u4e8b\u4ef6\u4e3a\u8868\u683c
+toggle_table_view_off=\u663e\u793a \u6bcf\u4e2a\u4e8b\u4ef6\u7684\u6570\u636e\u8f93\u5165\u8868\u5355
 event_recorded_on=\u4e8b\u4ef6\u8bb0\u5f55\u4e8e
-at=\u5728
-show_more=\u66f4\u591a\u70b9\u51fb
+at=\u4e8e
+show_more=\u70b9\u51fb\u66f4\u591a
 close_search=\u5173\u95ed\u641c\u7d22
 search_attributes=\u641c\u7d22\u5c5e\u6027
-available_search_attributes=\u53ef\u7528\u7684\u641c\u7d22\u5c5e\u6027
+available_search_attributes=\u53ef\u7528\u641c\u7d22\u5c5e\u6027
 selected_search_attributes=\u9009\u62e9\u7684\u641c\u7d22\u5c5e\u6027
 selected_program=\u9009\u62e9\u7684\u9879\u76ee
 other_programs=\u5176\u5b83\u9879\u76ee
-search_for_dashboard=\u641c\u7d22\u4eea\u8868\u76d8
-dashboard=\u72b6\u6001\u9762\u677f
-home=\u4e3b\u9875
+search_for_dashboard=\u641c\u7d22\u4eea\u8868\u76d8\u6761\u76ee
+dashboard=\u4eea\u8868\u76d8
+home=\u9996\u9875
 back=\u540e\u9000
 enrollment=\u6ce8\u518c
-enrolling_orgunit=\u6ce8\u518c\u7684\u673a\u6784
+enrolling_orgunit=\u6ce8\u518c\u673a\u6784
 delete_enrollment=\u5220\u9664\u6ce8\u518c
 cancel_enrollment=\u53d6\u6d88\u6ce8\u518c
 complete_enrollment=\u5b8c\u6210\u6ce8\u518c
-reopen_enrollment=\u91cd\u5f00\u6ce8\u518c
-activate_enrollment=\u6fc0\u6d3b\u6ce8\u518c
+reopen_enrollment=\u91cd\u65b0\u6ce8\u518c
+activate_enrollment=\u5f00\u653e\u6ce8\u518c
 deactivate_enrollment=\u5173\u95ed\u6ce8\u518c
-enrollment_date=\u6ce8\u518c\u65e5\u671f
-incident_date=\u4e8b\u6545\u65e5\u671f
+enrollment_date=\u767b\u8bb0\u65e5\u671f
+incident_date=\u4e8b\u4ef6\u65e5\u671f
 notes=\u7b14\u8bb0
 relationship=\u5173\u7cfb
-relationshipTo=\u5bf9\u5916\u5173\u7cfb
-relationshipFrom=\u5bf9\u5185\u5173\u7cfb
+relationshipTo=\u5411\u5916\u5173\u7cfb
+relationshipFrom=\u5411\u5185\u5173\u7cfb
 relationships=\u5173\u7cfb
 add_relationship=\u6dfb\u52a0\u5173\u7cfb
-a_is_to_b=A\u4e0eB\u7684\u5173\u7cfb
-b_is_to_a=B\u4e0eA\u7684\u5173\u7cfb
+a_is_to_b=A \u662f  B
+b_is_to_a=B \u662f  A
 select=\u9009\u62e9
-please_add_some_text=\u8bf7\u6dfb\u52a0\u4e00\u4e9b\u6587\u672c
+please_add_some_text=\u8bf7\u6dfb\u52a0\u6587\u672c
 please_select_source=\u8bf7\u9009\u62e9\u6e90
-register_new=\u6ce8\u518c\u65b0\u7684
-search_from_existing=\u641c\u7d22\u5b58\u5728\u7684
-dataentry=\u6570\u636e\u8f93\u5165\u65f6\u7ebf
-dataentryTabular=\u8868\u683c\u5316\u6570\u636e\u8f93\u5165
+register_new=\u65b0\u767b\u8bb0
+search_from_existing=\u641c\u7d22\u73b0\u6210\u7684
+dataentry=\u65f6\u9650\u6570\u636e\u5f55\u5165
+dataentryTabular=\u8868\u683c\u5f0f\u6570\u636e\u5f55\u5165
 indicators=\u6307\u6807
-empty_inidcator_list=\u4e0d\u5b58\u5728\u6307\u6807
-no_indicators_exist=\u4e0d\u5b58\u5728\u6307\u6807
+empty_inidcator_list=\u65e0\u6307\u6807\u5b58\u5728
+no_indicators_exist=\u65e0\u6307\u6807\u5b58\u5728
 feedback=\u53cd\u9988
 no_feedback_exist=\u6ca1\u6709\u53cd\u9988
 custom_form=\u5b9a\u5236\u8868\u5355
 default_form=\u7f3a\u7701\u8868\u5355
 menu=\u83dc\u5355
-tracker_reports=\u8ddf\u8e2a\u968f\u8bbf\u62a5\u544a
-reports=\u62a5\u8868\u7ba1\u7406
-registration_and_data_entry=\u6ce8\u518c\u548c\u6570\u636e\u8f93\u5165
+tracker_reports=\u8ddf\u8e2a\u62a5\u8868
+reports=\u62a5\u8868
+registration_and_data_entry=\u767b\u8bb0\u5e76\u5f55\u5165
 program_summary_report=\u9879\u76ee\u6458\u8981\u62a5\u8868
 program_summary=\u9879\u76ee\u6458\u8981
-program_summary_description=\u4e3a\u7279\u5b9a\u7ed3\u6784\u65f6\u95f4\u6bb5\u9879\u76ee\u521b\u5efa\u6458\u8981\u4fe1\u606f\uff0c\u62a5\u8868\u5448\u73b0\u8ddf\u8e2a\u7684\u5b9e\u4f53\u6e05\u5355\u548c\u6309\u4ed6\u4eec\u5404\u4e2a\u9636\u6bb5\u7ec4\u7ec7\u7684\u76f8\u5173\u8bb0\u5f55
+program_summary_description=\u751f\u6210\u4e00\u4e2a\u7279\u5b9a\u7684 \u9879\u76ee, \u673a\u6784\u548c\u65f6\u95f4\u6bb5\u7684\u6458\u8981\u62a5\u8868.\u62a5\u8868\u5448\u73b0\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b\u7684\u5217\u8868\u548c\u6309\u9879\u76ee\u9636\u6bb5\u7ec4\u7ec7\u7684\u76f8\u5173\u8bb0\u5f55.
 program_statistics_report=\u9879\u76ee\u7edf\u8ba1\u62a5\u8868
 program_statistics=\u9879\u76ee\u7edf\u8ba1
 program_statistics_description=\u751f\u6210\u7279\u5b9a\u9879\u76ee\u7684\u7edf\u8ba1\u62a5\u8868\uff0c\u8be5\u62a5\u8868\u63d0\u4f9b\u6bd4\u5982\u7279\u5b9a\u673a\u6784\u7ed9\u5b9a\u671f\u95f4\u7684\u6d41\u5931\u6216\u5b8c\u6210\u7387\u6982\u51b5.
-upcoming_events=\u5c06\u6765\u7684\u4e8b\u4ef6
+upcoming_events=\u5373\u5c06\u6765\u4e34\u7684\u4e8b\u4ef6
 upcoming_events_description=\u751f\u6210\u683c\u5f0f\u5316\u62a5\u8868\u663e\u793a\u5bf9\u4e8e\u9009\u62e9\u7684\u9879\u76ee\u548c\u65f6\u95f4\u7684\u8ddf\u8e2a\u5b9e\u4f53\u5b9e\u4f8b\u548c\u4ed6\u4eec\u5373\u5c06\u6765\u4e34\u7684\u4e8b\u4ef6.\u5141\u8bb8\u641c\u7d22, \u6392\u5e8f\u548c \u663e\u793a/\u9690\u85cf\u64cd\u4f5c .
-overdue_events=\u8fc7\u671f\u4e8b\u4ef6
+overdue_events=\u5230\u671f\u4e8b\u4ef6
 overdue_events_description=\u751f\u6210\u9009\u62e9\u7684\u9879\u76ee\u4e8b\u4ef6\u5217\u8868\uff0c\u8be5\u62a5\u8868\u663e\u793a\u8ddf\u8e2a\u7684\u5b9e\u4f53\u7684\u5b9e\u4f8b\u5217\u8868\u548c\u4ed6\u4eec\u7684\u6ca1\u6709\u53ca\u65f6\u7ba1\u7406\u7684\u4e8b\u4ef6  .\u8fc7\u6ee4\u548c\u641c\u7d22\u4e5f\u53ef\u4ee5.
 enrollment_stats=\u6ce8\u518c\u7edf\u8ba1
 event_stats=\u4e8b\u4ef6\u7edf\u8ba1
-upcoming_event=\u5c06\u6765\u7684\u4e8b\u4ef6
+upcoming_event=\u5230\u6765\u7684\u4e8b\u4ef6
 legend=\u56fe\u4f8b
-event_color_legend=\u989c\u8272\u7684\u542b\u4e49\uff1f
+event_color_legend=\u989c\u8272\u4ee3\u8868\u7684\u610f\u4e49?
 report=\u62a5\u8868
 _report=\u62a5\u8868
 visit_schedule=\u968f\u8bbf\u8c03\u5ea6
-mark_for_followup=\u6807\u8bb0\u4e3a\u540e\u7eed
-unmark_for_followup=\u4ece\u540e\u7eed\u4e2d\u79fb\u9664
-only_marked_for_followup=\u4ec5\u6807\u8bb0\u4e3a\u540e\u7eed\u7684
-registered_data=\u6ce8\u518c\u7684\u6570\u636e
-no_value=\u6ca1\u6709\u503c
-no_data_found=\u6ca1\u6709\u6570\u636e\u88ab\u627e\u5230
+mark_for_followup=\u540e\u7eed\u6807\u8bb0
+unmark_for_followup=\u4ece\u540e\u7eed\u5220\u9664
+only_marked_for_followup=\u4ec5\u4ec5\u6807\u8bb0\u540e\u7eed
+registered_data=\u767b\u8bb0\u6570\u636e
+no_value=\u65e0\u503c
+no_data_found=\u6ca1\u6709\u53d1\u73b0\u6570\u636e
 no_data=\u65e0\u6570\u636e
-data_exists=\u6570\u636e\u5df2\u7ecf\u5b58\u5728
-data_registerd=\u65e0\u6ce8\u518c\u6570\u636e
-no_visit_made=\u8fd8\u6ca1\u6709\u968f\u8bbf
-visit_not_made=\u8fd8\u6ca1\u6709\u968f\u8bbf
+mo_matching_data=\u6ca1\u6709\u7b26\u5408\u60a8\u641c\u7d22\u6761\u4ef6\u7684\u6570\u636e
+data_exists=\u6570\u636e\u5b58\u5728
+data_registerd=\u65e0\u767b\u8bb0\u6570\u636e
+no_visit_made=\u6ca1\u6709\u968f\u8bbf
+visit_not_made=\u968f\u8bbf\u6ca1\u6709\u8fdb\u884c
 _visit=\u968f\u8bbf
 visit=\u968f\u8bbf
 visits=\u968f\u8bbf
 current_selections=\u5f53\u524d\u9009\u62e9
-activePrograms=\u6d3b\u52a8\u7684\u9879\u76ee
-set_as_current=\u7f6e\u4e3a\u5f53\u524d
-org_unit=\u7ec4\u7ec7\u673a\u6784
-org_unit_scope=\u673a\u6784\u8303\u56f4
-SELECTED=\u5df2\u9009\u62e9
-CHILDREN=\u76f4\u63a5\u4e0b\u5c5e
+activePrograms=\u6d3b\u52a8\u9879\u76ee
+set_as_current=\u8bbe\u4e3a\u5f53\u524d
+org_unit=\u673a\u6784
+org_unit_scope=\u4f7f\u7528\u7684\u673a\u6784\u8303\u56f4
+SELECTED=\u9009\u62e9\u7684
+CHILDREN=\u76f4\u63a5\u4e0b\u5c5e\u673a\u6784
 DESCENDANTS=\u6240\u6709\u4e0b\u5c5e
-ACCESSIBLE=\u6240\u6709\u53ef\u8bbf\u95ee
+ACCESSIBLE=\u6240\u6709\u53ef\u8bbf\u95ee\u7684
 data_element=\u6570\u636e\u5143
 value=\u503c
-provided_elsewhere=\u5176\u5b83\u5730\u65b9\u63d0\u4f9b
-expand=\u5c55\u5f00
+provided_elsewhere=\u5176\u5b83\u5730\u65b9\u63d0\u4f9b\u7684
+expand=\u6253\u5f00
 collapse=\u6298\u53e0
 show_hide_columns=\u663e\u793a/\u9690\u85cf\u5217
 select_columns_to_show=\u9009\u62e9\u663e\u793a\u7684\u5217
-show_hide_widgets=\u9009\u62e9\u663e\u793a\u7684\u5c0f\u7ec4\u4ef6
-select_widgets_to_show=\u9009\u62e9\u663e\u793a\u7684\u5c0f\u7ec4\u4ef6
+show_hide_widgets=\u663e\u793a/\u9690\u85cf \u7ec4\u4ef6
+select_widgets_to_show=\u9009\u62e9\u663e\u793a\u7684\u53ef\u89c6\u5316\u7ec4\u4ef6
 audit_history=\u5ba1\u8ba1\u5386\u53f2
-hide_widget=\u9690\u85cf\u5c0f\u7ec4\u4ef6
-show_widget=\u663e\u793a\u5c0f\u7ec4\u4ef6
-hide_column=\u9690\u85cf\u5217
-show_column=\u663e\u793a\u5217
+hide_widget=\u9690\u85cf \u7ec4\u4ef6
+show_widget=\u663e\u793a\u7ec4\u4ef6
+hide_column=\u9690\u85cf \u5217
+show_column=\u663e\u793a \u5217
 close=\u5173\u95ed
-generate=\u751f\u6210
+generate=Generate
 print=\u6253\u5370
 excel_export=Excel \u5bfc\u51fa
 download=\u4e0b\u8f7d\u4e3a
@@ -244,70 +246,70 @@ export=\u5bfc\u51fa
 csv=CSV
 json=JSON
 xml=XML
-list_programs=\u9879\u76ee\u5217\u8868
+list_programs=\u9879\u76ee\u6e05\u5355
 program_stage=\u9879\u76ee\u9636\u6bb5
 due_date=\u5230\u671f\u65e5\u671f
-event_date=\u4e8b\u6545\u65e5\u671f
-report_date=\u62a5\u8868\u65e5\u671f
-enable_rescheduling=\u6253\u5f00\u8c03\u5ea6
-disable_rescheduling=\u5173\u95ed\u518d\u8c03\u5ea6
-show_hide_scheduling=\u663e\u793a\u9690\u85cf\u8c03\u5ea6\u8868\u5355
+event_date=\u4e8b\u4ef6\u65e5\u671f
+report_date=\u62a5\u544a\u65e5\u671f
+enable_rescheduling=\u6253\u5f00\u91cd\u65b0\u8c03\u5ea6
+disable_rescheduling=\u5173\u95ed\u91cd\u65b0\u8c03\u5ea6
+show_hide_scheduling=\u663e\u793a/\u9690\u85cf\u8c03\u5ea6\u8868\u5355
 show_hide_notes=\u663e\u793a/\u9690\u85cf\u7b14\u8bb0\u8868\u5355
-show_hide_messaging=\u663e\u793a/\u9690\u85cf\u6d88\u606f\u8868\u5355
+show_hide_messaging=\u663e\u793a/\u9690\u85cf \u6d88\u606f \u8868\u5355
 messaging=\u6d88\u606f
 scheduling=\u8c03\u5ea6
-reschedule_duedate=\u91cd\u65b0\u5b89\u6392\u5230\u671f\u65e5\u671f
-reschedule=\u91cd\u65b0\u8c03\u5ea6
-rescheduling=\u91cd\u65b0\u8c03\u5ea6
-scheduling_messaging=\u8c03\u5ea6\u548c\u6d88\u606f\u4e2d
-not_yet_enrolled_scheduling=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u8c03\u5ea6\u4e0d\u53ef\u80fd\u6267\u884c
-schedule_details=\u5355\u72ec\u8be6\u60c5
-no_event_to_schedule=\u6ca1\u6709\u4e8b\u4ef6\u53ef\u4ee5\u8c03\u5ea6
+reschedule_duedate=\u91cd\u65b0\u5b89\u6392\u5230\u671f\u65e5
+reschedule=\u91cd\u65b0\u5b89\u6392
+rescheduling=\u91cd\u65b0\u5b89\u6392
+scheduling_messaging=\u8c03\u5ea6\u5e76\u53d1\u9001\u6d88\u606f
+not_yet_enrolled_scheduling=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u4e0d\u80fd\u8c03\u5ea6
+schedule_details=\u8c03\u5ea6\u7ec6\u8282
+no_event_to_schedule=\u6ca1\u6709\u8981\u8c03\u5ea6\u7684\u4e8b\u4ef6
 enroll=\u6ce8\u518c
 new_enrollment=\u65b0\u6ce8\u518c
 start_date=\u5f00\u59cb\u65e5\u671f
 end_date=\u7ed3\u675f\u65e5\u671f
 from=\u4ece
-to=\u81f3
-exact_date=\u7cbe\u786e\u65e5\u671f
-exact_value=\u7cbe\u786e\u503c
+to=\u5230
+exact_date=\u5177\u4f53\u65e5\u671f
+exact_value=\u51c6\u786e\u503c
 EQ=\u7b49\u4e8e
 GT=\u5927\u4e8e
-GE=\u5927\u4e8e\u6216\u7b49\u4e8e
-LT=\u5c0f\u4e8e
-LE=\u5c0f\u4e8e\u6216\u7b49\u4e8e
-NE=\u4e0d\u7b49\u4e8e
-IS=\u662f
-RANGE=\u8303\u56f4
-like=\u5982
-not_like=\u4e0d\u50cf
+GE=Greater than or equal to
+LT=Less than
+LE=Less than or equal
+NE=Not equal
+IS=Is
+RANGE=Range
+like=Like
+not_like=Not like
 boolean=Boolean
-yes=\u662f
-no=\u5426
+yes=Yes
+no=No
 records=\u8bb0\u5f55
 record=\u8bb0\u5f55
 _record=\u8bb0\u5f55
 _records=\u8bb0\u5f55
 found=\u53d1\u73b0
-move_to_selected=\u79fb\u5230\u9009\u62e9\u7684
+move_to_selected=\u79fb\u52a8\u5230\u9009\u62e9\u7684
 move_all_to_selected=\u79fb\u52a8\u6240\u6709\u5230\u9009\u62e9\u7684
 current=\u5f53\u524d
 new=\u65b0\u5efa
-add_new=\u65b0\u589e
-registration=\u6ce8\u518c
-registration_date=\u6ce8\u518c\u65e5\u671f
-register=\u6ce8\u518c
-_register=\u6ce8\u518c
-enrollment_error=\u6ce8\u518c\u53d1\u751f\u9519\u8bef
-registration_error=\u767b\u8bb0\u53d1\u751f\u9519\u8bef
+add_new=\u65b0\u52a0
+registration=\u767b\u8bb0
+registration_date=\u767b\u8bb0\u65e5\u671f
+register=\u767b\u8bb0
+_register=\u767b\u8bb0
+enrollment_error=\u6ce8\u518c\u9519\u8bef
+registration_error=\u767b\u8bb0\u9519\u8bef
 update_error=\u66f4\u65b0\u9519\u8bef
-register_error=\u767b\u8bb0\u53d1\u751f\u9519\u8bef
+register_error=\u767b\u8bb0\u9519\u8bef
 event_creation_error=\u4e8b\u4ef6\u521b\u5efa\u9519\u8bef
 relationship_error=\u6307\u5b9a\u5173\u7cfb\u65f6\u53d1\u751f\u9519\u8bef
-tracker_associate_error=Error in tracker associate assignment
+tracker_associate_error=\u8ddf\u8e2a\u5668\u5173\u8054\u5206\u914d\u4e2d\u7684\u9519\u8bef
 searching_error=\u641c\u7d22\u9519\u8bef
 form_invalid=Form is invalid. Please check for required fields.
-no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
+no_entity_for_tracker_associate_attribute=\u6240\u9009\u5c5e\u6027\u7684\u8ddf\u8e2a\u5b9e\u4f53\u65e0\u6548
 errors=\u9519\u8bef
 error=\u9519\u8bef
 warning=\u8b66\u544a
@@ -317,7 +319,7 @@ access_denied=\u8bbf\u95ee\u88ab\u62d2\u7edd
 registration_complete=\u767b\u8bb0\u5b8c\u6210
 auto_generate_failed=\u81ea\u4ece\u81ea\u52a8\u751f\u6210\u5c5e\u6027\u5931\u8d25\u540e\u4e0d\u80fd\u767b\u8bb0
 validation_error=\u6709\u6548\u6027\u9a8c\u8bc1\u9519\u8bef
-event_orgunit_name=\u7ec4\u7ec7\u673a\u6784
+event_orgunit_name=\u673a\u6784
 category=\u5206\u7c7b
 entity_type=\u5b9e\u4f53\u7c7b\u578b
 save=\u4fdd\u5b58
@@ -327,7 +329,7 @@ save_and_continue=\u4fdd\u5b58\u5e76\u7ee7\u7eed
 save_relationship=\u4fdd\u5b58\u5173\u7cfb
 delete_relationship=\u5220\u9664\u5173\u7cfb
 can_not_delete_relationship=\u4e0d\u80fd\u5220\u9664\u5173\u7cfb\uff0c\u56e0\u4e3a\u7f3a\u5c11\u5199\u6743\u9650
-go_back=\u8fd4\u56de
+go_back=\u540e\u9000
 cancel=\u53d6\u6d88
 are_you_sure_to_delete_relationship=\u4f60\u8981\u5220\u9664\u8be5\u5173\u7cfb?
 are_you_sure_to_delete_enrollment=\u4f60\u8981\u5220\u9664\u9009\u62e9\u7684\u6ce8\u518c? \u8be5\u64cd\u4f5c\u8981\u5220\u9664\u76f8\u5173\u7684\u6240\u6709\u4e8b\u4ef6.
@@ -349,29 +351,30 @@ will_delete_all_data_associated=\u5c06\u5220\u9664\u6240\u6709\u76f8\u5173\u7684
 more=\u66f4\u591a
 under_construction=\u6784\u5efa\u4e2d
 advanced_search=\u9ad8\u7ea7\u641c\u7d22
-profile=\u7b80\u5386
-applications=Apps
-more_applications=\u66f4\u591a apps
+profile=\u57fa\u672c\u4fe1\u606f
+applications=\u5e94\u7528
+more_applications=\u66f4\u591a\u5e94\u7528
+manage=\u7ba1\u7406
 settings=\u8bbe\u7f6e
 account=\u8d26\u53f7
 help=\u5e2e\u52a9
-log_out=\u767b\u51fa
-about_dhis2=\u5173\u4e8e\u7efc\u5408\u536b\u751f\u4fe1\u606f\u7ba1\u7406\u5e73\u53f0
+log_out=\u9000\u51fa
+about_dhis2=\u5173\u4e8eDHIS2
 missing_translation_file=\u7f3a\u5c11\u7ffb\u8bd1\u6587\u4ef6
 missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
 loading_tree=\u8f7d\u5165 \u673a\u6784 \u6811
-loading_metadata=\u6b63\u5728\u8f7d\u5165\u5143\u6570\u636e
+loading_metadata=Loading meta-data
 loading_components=Loading components
-latitude=\u7eac\u5ea6
+latitude=\u7ef4\u5ea6
 longitude=\u7ecf\u5ea6
 lat_lng=[\u7eac\u5ea6 \u7ecf\u5ea6]
 get=\u83b7\u53d6
-get_from_map=\u4ece\u5730\u56fe\u4e0a\u83b7\u53d6
-capture=\u91c7\u96c6
+get_from_map=\u4ece\u5730\u56fe\u83b7\u53d6
+capture=\u6355\u83b7
 nothing_captured=\u6ca1\u6709\u91c7\u96c6\u4efb\u4f55\u4e1c\u897f
-point_and_click_for_coordinate=\u5730\u56fe\u4e0a\u70b9\u51fb\u5b9a\u4f4d
+point_and_click_for_coordinate=\u5730\u56fe\u4e0a\u70b9\u53f3\u952e\u9009\u62e9\u4f4d\u7f6e
 value_must_be_between=\u503c\u9700\u5728
-locate_organisation_unit_by_name=\u6309\u540d\u79f0\u67e5\u627e\u673a\u6784
+locate_organisation_unit_by_name=\u6309\u540d\u79f0\u5b9a\u4f4d \u673a\u6784
 dashboard_layout_saved=\u4eea\u8868\u76d8\u5e03\u5c40\u5df2\u7ecf\u4fdd\u5b58
 dashboard_layout_saved_as_default=\u4eea\u8868\u76d8\u5e03\u5c40\u5df2\u7ecf\u4fdd\u5b58\u4e3a\u7f3a\u7701
 dashboard_layout_not_saved=\u4eea\u8868\u76d8\u5e03\u5c40\u6ca1\u6709\u4fdd\u5b58
@@ -380,10 +383,10 @@ dashboard_layout_not_fetched=Failed to fetch the dashboard layout
 failed_to_fetch_enrollment=\u4ece\u670d\u52a1\u5668\u83b7\u53d6\u6ce8\u518c\u6570\u636e\u5931\u8d25
 failed_to_save_enrollment=\u5411\u670d\u52a1\u5668\u4fdd\u5b58\u6ce8\u518c\u6570\u636e\u5931\u8d25
 failed_to_update_enrollment=\u66f4\u65b0 \u670d\u52a1\u5668\u6ce8\u518c \u4fe1\u606f\u5931\u8d25
-ou_search_scope=\u673a\u6784\u8303\u56f4
+ou_search_scope=\u4f7f\u7528\u7684\u673a\u6784\u8303\u56f4
 zoom_in=\u653e\u5927
 zoom_out=\u7f29\u5c0f
-center_map=\u5c45\u4e2d
+center_map=\u5c45\u4e2d\u5730\u56fe
 set_coordinate=\u8bbe\u7f6e\u5750\u6807
 coordinate=\u5750\u6807
 show_active_only=\u4ec5\u4ec5\u663e\u793a\u6d3b\u52a8\u7684
@@ -395,19 +398,19 @@ filter_events=\u8fc7\u6ee4\u4e8b\u4ef6
 list_events=\u5217\u793a\u6240\u6709\u4e8b\u4ef6
 prev_period=\u524d\u671f
 nxt_period=\u4e0b\u671f
-period=\u5468\u671f
-jan=01
-feb=02
-mar=03
-apr=04
-may=05
-jun=06
-jul=07
-aug=08
-sep=09
-oct=10
-nov=11
-dec=12
+period=\u671f\u95f4
+jan=1\u6708
+feb=2\u6708
+mar=3\u6708
+apr=4\u6708
+may=5\u6708
+jun=6\u6708
+jul=7\u6708
+aug=8\u6708
+sep=9\u6708
+oct=10\u6708
+nov=11\u6708
+dec=12\u6708
 week=\u5468
 save_layout_as_default=\u4fdd\u5b58\u4eea\u8868\u76d8\u5e03\u5c40\u4e3a\u7f3a\u7701\u5e03\u5c40
 reset_layout=\u91cd\u7f6e\u4eea\u8868\u76d8\u5e03\u5c40
@@ -417,8 +420,8 @@ equals_to=\u7b49\u4e8e
 less_than=\u5c0f\u4e8e
 greater_than=\u5927\u4e8e
 inactive=\u95f2\u7f6e
-activate=\u6d3b\u8dc3
-deactivate=\u505c\u7528
+activate=\u6fc0\u6d3b
+deactivate=\u53bb\u6d3b
 tei_inactive_only_read=\u4e0d\u6d3b\u8dc3.\u4ec5\u4ec5\u5141\u8bb8\u8bfb
 hide_menu=\u9690\u85cf\u83dc\u5355
 extend_menu=\u6269\u5c55\u83dc\u5355
@@ -430,14 +433,14 @@ value_not_unique=\u503c\u4e0d\u552f\u4e00
 custom_form_has_invalid_attribute=\u5b9a\u5236\u8868\u5355\u5305\u62ec\u65e0\u6548\u7684\u5c5e\u6027
 custom_form_has_invalid_dataelement=\u5b9a\u5236\u8868\u5355\u5177\u6709\u65e0\u6548\u6570\u636e\u5143
 events_today_persons=Only those with an event today
-section_has_no_dataelements=\u5206\u6bb5\u6ca1\u6709\u6570\u636e\u5143
-section=\u5206\u6bb5
+section_has_no_dataelements=\u5206\u533a\u6ca1\u6709\u6570\u636e\u5143
+section=\u5206\u533a
 display_mode=\u663e\u793a\u6a21\u5f0f
 tracker_capture_display_mode=\u8ddf\u8e2a\u5668\u91c7\u96c6\u663e\u793a\u6a21\u5f0f
 events_today_all=\u4eca\u5929\u6240\u6709\u4e8b\u4ef6
 events_today_completeoractive=\u5b8c\u6210\u6216\u6fc0\u6d3b
-events_today_skipped=\u8df3\u8fc7\u7684
-events_today_scheduled=\u5df2\u5b89\u6392
+events_today_skipped=\u8df3\u8fc7
+events_today_scheduled=\u5df2\u7ecf\u8c03\u5ea6
 multiple_records_warning=\u53d1\u73b0\u591a\u4e2a\u8bb0\u5f55.\u8bf7\u6307\u5b9a\u66f4\u591a\u6761\u4ef6.
 result=\u7ed3\u679c
 no_record_found=\u6ca1\u6709\u53d1\u73b0\u8bb0\u5f55
@@ -453,9 +456,9 @@ scheduled_date=\u8c03\u5ea6\u65e5\u671f
 show_new_event_menu=\u663e\u793a\u65b0\u4e8b\u4ef6\u83dc\u5355
 no_stages_available=\u6240\u6709\u671f\u671b\u7684\u4e8b\u4ef6\u5df2\u7ecf\u5b58\u5728\uff0c\u4e0d\u80fd\u521b\u5efa\u66f4\u591a\u4e8b\u4ef6.
 make_referral=\u751f\u6210\u8f6c\u8bca/\u8fc1\u79fb
-referral=\u8f6c\u8bca
-show_previous=\u663e\u793a\u524d\u4e00\u4e2a
-show_next=\u663e\u793a\u4e0b\u4e00\u4e2a
+referral=\u6d41\u8f6c
+show_previous=\u663e\u793a\u524d\u4e00
+show_next=\u663e\u793a\u4e0b\u4e00
 schedule_new=\u65b0\u8c03\u5ea6
 save_note=\u4fdd\u5b58\u7b14\u8bb0
 add_justification=\u6dfb\u52a0 \u7406\u7531
@@ -474,23 +477,23 @@ programstage_multiple_events_disabled=\u8be5\u9879\u76ee\u9636\u6bb5\u4e0d\u5141
 event_cant_be_created=\u4e0d\u80fd\u521b\u5efa\u65b0\u4e8b\u4ef6
 created=\u5df2\u521b\u5efa
 auditType=\u5ba1\u8ba1\u7c7b\u578b
-modifiedBy=\u4fee\u6539
+modifiedBy=\u4fee\u6539\u81ea
 audit_history_unavailable=\u5ba1\u8ba1\u5386\u53f2\u4e0d\u53ef\u7528
 delete_error_audit=\u4e8b\u4ef6\u4e0d\u80fd\u5220\u9664\uff0c\u56e0\u4e3a\u6d89\u53ca\u5ba1\u8ba1\u5386\u53f2\u4fe1\u606f
 are_you_sure_to_remove=\u4f60\u786e\u4fe1\u79fb\u9664?
-completed_label=\u5df2\u5b8c\u6210
+completed_label=\u5b8c\u6210
 stage_completed=\u5b8c\u6210\u7684\u4e8b\u4ef6
 stage_completed_label=\u5168\u90e8\u5b8c\u6210\u7684
 executed=\u6253\u5f00\u8fdb\u884c\u6570\u636e\u8f93\u5165
-executed_label=Open
+executed_label=\u5f00\u653e
 stage_executed=\u4e8b\u4ef6\u5df2\u7ecf\u6253\u5f00
 stage_executed_label=\u6253\u5f00\u53d1\u73b0\u7684
-ontime=\u5df2\u5b89\u6392
-ontime_label=\u5df2\u5b89\u6392
+ontime=\u5df2\u7ecf\u8c03\u5ea6
+ontime_label=\u5df2\u7ecf\u8c03\u5ea6
 stage_ontime=\u4e8b\u4ef6\u5df2\u7ecf\u8c03\u5ea6
 stage_ontime_label=\u53d1\u73b0\u8c03\u5ea6
-overdue=\u8fc7\u671f
-overdue_label=\u8fc7\u671f
+overdue=\u903e\u671f
+overdue_label=\u903e\u671f
 stage_overdue=\u4e8b\u4ef6\u8fc7\u671f
 stage_overdue_label=\u53d1\u73b0\u8fc7\u671f
 skipped=\u8df3\u8fc7\u7684\u4e8b\u4ef6
@@ -525,8 +528,8 @@ openstreetmap=OpenStreetMap
 googlemap=\u8c37\u6b4c\u5730\u56fe
 missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
 missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
-sms=\u77ed\u4fe1\u7ba1\u7406
-email=\u7535\u5b50\u90ae\u4ef6
+sms=SMS
+email=E-mail
 email_address=E-mail \u5730\u5740
 wrong_email=\u8bf7\u6307\u5b9a\u4e00\u4e2a\u6709\u6548\u7684e-mail\u5730\u5740
 email_subject=\u4e3b\u9898
@@ -550,7 +553,7 @@ orgunit_closed= \u673a\u6784\u5df2\u7ecf\u5173\u95ed\uff0c\u4e0d\u80fd\u8fdb\u88
 dob=\u751f\u65e5
 years=\u5e74
 months=\u6708
-days=\u5929
+days=\u5929\u6570
 age_fields_info=\u5e74\u9f84\u5b57\u6bb5\u4fe1\u606f
 reponse_from_server=\u6765\u81ea\u670d\u52a1\u5668\u7684\u54cd\u5e94.
 loading-audit-data=\u8f7d\u5165\u5ba1\u8ba1\u6570\u636e.
@@ -558,7 +561,7 @@ more_options_available=\u66f4\u591a\u9009\u9879\u53ef\u7528\uff0c\u8bd5\u56fe\u6
 move_permanently=\u6c38\u4e45\u6027\u79fb\u52a8
 onetime_referral=\u4e00\u6b21\u6027\u8fc1\u79fb
 are_you_sure_you_want_to_move_permanently=\u4f60\u786e\u4fe1\u8981\u6c38\u4e45\u6027\u79fb\u52a8\u75c5\u4eba\uff1f
-ok=OK
+ok=\u597d
 can_not_add_new_enrollment=\u4e0d\u80fd\u6dfb\u52a0\u65b0\u6ce8\u518c\uff0c\u56e0\u4e3a\u8be5\u9879\u76ee\u53ea\u5141\u8bb8\u4e00\u6b21\u6ce8\u518c.
 switch_compare_form=\u5207\u6362\u5230\u6bd4\u8f83\u8868\u5355
 switch_default_form=\u5207\u6362\u5230\u7f3a\u7701\u8868\u5355
@@ -568,13 +571,14 @@ url_error=\u786e\u4fe1URL\u662f\u6709\u6548\u7684.
 time_error=\u9519\u8bef\u7684\u65f6\u95f4\u683c\u5f0f
 no_blank_date=The event needs a date. If you want to schedule the event instead, please delete this event and create a new scheduled event.
 not_authorized_to_uncomplete_event=Not authorized to uncomplete events.
-both_date_and_time=Please ensure that both the date and the time fields are filled in and that they follow the correct format. Otherwise the data will not be saved.
+both_date_and_time=\u8bf7\u786e\u4fdd\u65e5\u671f\u548c\u65f6\u95f4\u5b57\u6bb5\u5747\u5df2\u586b\u5199\u4e14\u683c\u5f0f\u6b63\u786e\u3002\u5426\u5219\u6570\u636e\u5c06\u4e0d\u4f1a\u88ab\u4fdd\u5b58\u3002
 wrong_time_format=Please ensure that the time format (HH:MM) is followed.
 hours_and_minutes=HH:MM
 top_bar_settings=\u9876\u90e8\u5de5\u5177\u6761\u8bbe\u7f6e
 show=\u663e\u793a
 sort_order=\u6392\u5e8f
 activate_top_bar=\u6fc0\u6d3b\u9876\u90e8\u5de5\u5177\u6761
+use_as_top_bar=\u7528\u4f5c\u9876\u90e8\u680f
 remove_widget=\u79fb\u9664\u5411\u5bfc?
 remove_widget_info=\u4f60\u5c06\u79fb\u9664\u5411\u5bfc\uff0c\u8981\u7ee7\u7eed?
 lock_default_layout=\u4e3a\u6240\u6709\u7528\u6237\u9501\u5b9a\u5e03\u5c40
@@ -583,20 +587,20 @@ upload_image=\u4e0a\u4f20
 please_select_an_image=[\u8bf7\u9009\u62e9\u4e00\u5e45\u56fe\u50cf]
 all=\u5168\u90e8
 ALL=\u5168\u90e8
-completed=\u5df2\u5b8c\u6210
-active=\u6d3b\u52a8\u7684
-cancelled=\u53d6\u6d88
-enrollment_status=\u6ce8\u518c\u72b6\u6001
+completed=\u5b8c\u6210
+active=\u6d3b\u8dc3\u7684
+cancelled=\u5df2\u53d6\u6d88
+enrollment_status=\u767b\u8bb0\u72b6\u6001
 go_to_registration=\u8fdb\u5165\u767b\u8bb0
 tracked_entity_instance_search_results_header={trackedEntityTypeName} \u641c\u7d22\u7ed3\u679c
 tracked_entity_instance_search_matches_description=\u5982\u679c\u641c\u7d22\u7684 {trackedEntityTypeName} \u6ca1\u6709\uff0c\u9009\u62e9"\u8fdb\u5165\u767b\u8bb0"
 tracked_entity_instance_unique_found_header={trackedEntityTypeName} \u53d1\u73b0
 tracked_entity_instance_unique_found_description=\u4e00\u4e2a {trackedEntityTypeName} \u88ab\u53d1\u73b0\u5728\u53e6\u5916 {orgUnitLevelName}.
-no_tracked_entity_instance_found_header=\u65e0 {trackedEntityTypeName} \u88ab\u53d1\u73b0.
-no_tracked_entity_instance_found_description=\u65e0 {trackedEntityTypeName} \u88ab\u53d1\u73b0.
+no_tracked_entity_instance_found_header=\u627e\u4e0d\u5230{trackedEntityTypeName}\u3002
+no_tracked_entity_instance_found_description=\u627e\u4e0d\u5230{trackedEntityTypeName}\u3002
 no_tracked_entity_instance_found_go_to_registration_description=\u6ca1\u6709\u627e\u5230  {trackedEntityTypeName} \uff0c\u5982\u679c\u8981\u6ce8\u518c\u65b0\u7684 {trackedEntityTypeName} \uff0c\u70b9\u51fb \u8fdb\u5165\u6ce8\u518c\u6309\u94ae
-tracked_entity_attributes_already_existing_header={trackedEntityAttributeName} already existing
-tracked_entity_attributes_already_existing_description={trackedEntityAttributeName} already exists for another {trackedEntityTypeName}. Do you want to open this {trackedEntityTypeName}?
+tracked_entity_attributes_already_existing_header={trackedEntityAttributeName}\u5df2\u5b58\u5728
+tracked_entity_attributes_already_existing_description={trackedEntityAttributeName}\u5df2\u5b58\u5728\u53e6\u4e00\u4e2a{trackedEntityTypeName}\u3002\u60a8\u8981\u6253\u5f00\u6b64{trackedEntityTypeName}\u5417\uff1f
 possible_duplicates_found=\u53d1\u73b0\u53ef\u80fd\u7684\u91cd\u590d
 view_x_candidates=\u67e5\u770b {count} \u4e2a\u5019\u9009
 view_candidate=\u67e5\u770b \u5019\u9009
@@ -604,28 +608,28 @@ matching_tracked_entity_instance_register_description=\u70b9\u51fb\u6253\u5f00\u
 review_possible_duplicates_before_registration=\u767b\u8bb0\u524d\u590d\u67e5\u53ef\u80fd\u7684\u91cd\u590d\u767b\u8bb0
 review_possible_duplicates_description=\u6253\u5f00\u4e0a\u9762\u4efb\u4f55\u91cd\u590d\u7684\u8bb0\u5f55,\u6216\u8005\u70b9\u51fb\u767b\u8bb0\u4e00\u4e2a\u65b0\u7684{trackedEntityTypeName}
 register_new_tracked_entity_instance=\u767b\u8bb0\u65b0\u7684 {trackedEntityTypeName}
-large_number_of_search_results_warning=\u53d1\u73b0\u5927\u91cf\u7684\u5339\u914d.\u8bf7\u7ec6\u5316\u641c\u7d22\u6761\u4ef6\u6216\u524d\u8fdb\u5230\u767b\u8bb0. Knapper: Back og go to registration.
+large_number_of_search_results_warning=\u53d1\u73b0\u5927\u91cf\u7684\u5339\u914d.\u8bf7\u7ec6\u5316\u641c\u7d22\u6761\u4ef6\u6216\u524d\u8fdb\u5230\u767b\u8bb0\u9875\u9762\u3002
 too_many_search_results=\u592a\u591a\u641c\u7d22\u7ed3\u679c
-open=Open
+open=\u5f00\u653e
 continue=\u7ee7\u7eed
 no_program_write_access=\u53d1\u9001\u4fe1\u606f\u9700\u8981\u9879\u76ee\u5199\u6743\u9650
-show_all=\u663e\u793a\u5168\u90e8
+show_all=\u5168\u90e8\u663e\u793a
 not_allowed=\u4e0d\u5141\u8bb8
 you_do_not_have_the_necessary_authorities_to_delete=\u4f60\u6ca1\u6709\u5220\u9664\u7684\u6743\u9650
 this=\u8be5
 delete_failed=\u5220\u9664\u5931\u8d25
 cannot_delete_this_enrollment_because_it_already_contains_events=Cannot delete this enrollment because it already contains events. Please delete the events before deleting the enrollment
-cannot_delete_this_tei_because_it_already_contains_enrollments=Cannot delete this tracked entity instance because it already contains enrollments. Please delete the enrollments before deleting the tracked entity instance
-no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=No {trackedEntityTypeName} found in the selected program. Showing results from other programs
+cannot_delete_this_tei_because_it_already_contains_enrollments=\u65e0\u6cd5\u5220\u9664\u6b64\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b\uff0c\u56e0\u4e3a\u5b83\u5df2\u5305\u542b\u6ce8\u518c\u3002\u8bf7\u5148\u5220\u9664\u6ce8\u518c\uff0c\u7136\u540e\u518d\u5220\u9664\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b
+no_tracked_entity_instance_found_in_selected_program_showing_results_from_other_programs=\u5728\u6240\u9009\u9879\u76ee\u4e2d\u627e\u4e0d\u5230{trackedEntityTypeName}\u3002\u663e\u793a\u5176\u4ed6\u9879\u76ee\u7684\u7ed3\u679c
 drop_image=\u62d6\u653e\u56fe\u50cf
-you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=You need read access to at least one tracked entity type to be able to search without a program context
+you_need_read_access_to_at_least_one_tracked_entity_type_to_be_able_to_search=\u60a8\u9700\u8981\u5bf9\u81f3\u5c11\u4e00\u79cd\u8ddf\u8e2a\u7684\u5b9e\u4f53\u7c7b\u578b\u5177\u6709\u8bfb\u53d6\u6743\u9650\uff0c\u624d\u80fd\u5728\u6ca1\u6709\u7a0b\u5e8f\u4e0a\u4e0b\u6587\u7684\u60c5\u51b5\u4e0b\u8fdb\u884c\u641c\u7d22
 missing_read_access_for_tracked_entity_type=\u8ddf\u8e2a\u7684\u5b9e\u4f53\u7c7b\u578b\u7f3a\u5c11\u8bfb\u6743\u9650
 stage_write_required=\u9700\u8981\u9879\u76ee\u9636\u6bb5\u5199\u6743\u9650
-you_need_write_to_program_stage_to_be_able_to_create_event=You need write access to this program stage to be able to create a new event
+you_need_write_to_program_stage_to_be_able_to_create_event=\u60a8\u9700\u8981\u5bf9\u6b64\u7a0b\u5e8f\u9636\u6bb5\u5177\u6709\u5199\u8bbf\u95ee\u6743\uff0c\u624d\u80fd\u521b\u5efa\u65b0\u4e8b\u4ef6
 no_polygon_captured=\u6ca1\u6709\u91c7\u96c6\u5230\u591a\u8fb9\u5f62
 polygon_captured=\u91c7\u96c6\u7684\u591a\u8fb9\u5f62\u3002
 no_geometry_captured=\u6ca1\u6709\u91c7\u96c6\u5230\u51e0\u4f55\u5f62\u72b6
-geometry=\u51e0\u4f55\u5f62\u72b6
+geometry=\u51e0\u4f55\u56fe\u5f62
 tracked_entity_type=\u8ddf\u8e2a\u5b9e\u4f53\u7c7b\u578b
 type=\u7c7b\u578b
 tracked_entity_type_has_no_attributes=\u8ddf\u8e2a\u5b9e\u4f53\u7c7b\u578b\u6ca1\u6709\u5c5e\u6027
@@ -650,13 +654,13 @@ point_on_map=\u5730\u56fe\u4e0a\u7684\u70b9
 polygon_on_map=\u5730\u56fe\u4e0a\u7684\u591a\u8fb9\u5f62
 cancel_capturing_polygon=\u53d6\u6d88\u591a\u8fb9\u5f62\u91c7\u96c6
 you_are_currently_in_draw_mode_all_unfinished_changes_will_be_lost=\u4f60\u5904\u4e8e\u7ed8\u753b\u6a21\u5f0f\uff0c\u6240\u6709\u6ca1\u6709\u5b8c\u6210\u7684\u4fee\u6539\u5c06\u4e22\u5931
-complete_stage=\u5b8c\u6210\u9636\u6bb5\uff1f
+complete_stage=\u9636\u6bb5\u5b8c\u6210\uff1f
 complete_stage_info=\u4f60\u8981\u8bbe\u7f6e\u9636\u6bb5\u4e3a\u5b8c\u6210\uff1f
-assigned_user=\u5206\u914d\u7684\u7528\u6237
+assigned_user=\u6307\u6d3e\u7684\u7528\u6237
 linked_events=\u94fe\u63a5\u7684\u4e8b\u4ef6
 user_assignment=\u7528\u6237\u6307\u6d3e
 specific_users=\u7279\u5b9a\u7684\u7528\u6237
-none=\u65e0
+none=\u6ca1\u6709
 any=\u4efb\u4f55
 no_requirement=\u4e0d\u9700\u8981
 the_record_has_is_possible_duplicate=\u8bb0\u5f55\u53ef\u80fd\u91cd\u590d
diff --git a/i18n/i18n_app_zh_CN.properties b/i18n/i18n_app_zh_CN.properties
index 4e54f3f63..5fc9e531f 100644
--- a/i18n/i18n_app_zh_CN.properties
+++ b/i18n/i18n_app_zh_CN.properties
@@ -2,12 +2,12 @@ tracker_capture=\u8ddf\u8e2a\u968f\u8bbf
 online_notification=\u4f60\u5df2\u7ecf\u5728\u7ebf
 offline_notification=\u4f60\u5df2\u7ecf\u79bb\u7ebf
 login_failed=\u767b\u5f55\u5931\u8d25,\u68c0\u67e5\u4f60\u7684\u7528\u6237\u540d\u548c\u53e3\u4ee4\u540e\u91cd\u8bd5
-tracked_entity_management=\u8ddf\u8e2a\u968f\u8bbf\u5b9e\u4f53\u7ba1\u7406
+tracked_entity_management=\u8ddf\u8e2a\u5b9e\u4f53\u7ba1\u7406
 registering_unit=\u6ce8\u518c\u673a\u6784
 program=\u9879\u76ee
-tracked_entity=\u8ddf\u8e2a\u7684\u5b9e\u4f53
-tracked_entity_instance=\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5b9e\u4f8b
-tracked_entity_attribute=\u8ddf\u8e2a\u7684\u5b9e\u4f53\u5c5e\u6027
+tracked_entity=\u8ddf\u8e2a\u5b9e\u4f53
+tracked_entity_instance=\u8ddf\u8e2a\u7684\u5b9e\u4f53
+tracked_entity_attribute=\u8ddf\u8e2a\u5b9e\u4f53\u5c5e\u6027
 select_or_search=\u4ece\u5217\u8868\u4e2d\u641c\u7d22\u6216\u9009\u62e9
 please_select=[\u8bf7\u9009\u62e9]
 please_select_a_program=[\u8bf7\u9009\u62e9\u4e00\u4e2a\u9879\u76ee]
@@ -23,6 +23,7 @@ not_yet_enrolled_data_entry=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u4e0d\u80fd\u8f
 not_yet_enrolled_enrollment=\u6ca1\u6709\u6ce8\u518c\u5b58\u5728
 no_active_enrollment_exists=\u9009\u62e9\u7684\u9879\u76ee\u4e0d\u5b58\u5728\u5f00\u653e\u7684\u6ce8\u518c
 no_active_enrollments_exist=\u4e0d\u5b58\u5728\u5f00\u653e\u7684\u6ce8\u518c
+too_many_items_report=Report cannot be shown as the amount of requested data exceeds the capacity supported by this service. Please consider using analytics app or dashboards.
 not_yet_enrolled_note=\u8fd8\u6ca1\u6709\u6ce8\u518c.\u7b14\u8bb0\u8bb0\u5f55\u4e0d\u53ef\u80fd.
 not_yet_enrolled_report=\u8fd8\u6ca1\u6709\u6ce8\u518c. \u4e0d\u80fd\u51fa\u62a5\u544a.
 no_data_report=\u6ca1\u6709\u8bb0\u5f55\u53ef\u4ee5\u62a5\u8868
@@ -30,7 +31,7 @@ no_notes_exist=\u4e0d\u5b58\u5728\u7b14\u8bb0
 event=\u4e8b\u4ef6
 no_event_is_yet_created=\u65e0\u4e8b\u4ef6\u53ef\u7528\u4e0e\u6570\u636e\u5f55\u5165. \u8bf7\u521b\u5efa\u4e00\u4e2a.
 event_creation=\u8bf7\u4ece\u4e0b\u9762\u521b\u5efa\u4e00\u4e2a
-not_selected=\u6ca1\u6709\u9009\u62e9
+not_selected=\u672a\u9009\u5b9a
 create=\u521b\u5efa
 view_all=[\u67e5\u770b\u5168\u90e8]
 list_all_entities=\u5217\u8868\u6240\u6709\u5b9e\u4f53
@@ -39,15 +40,15 @@ list=\u5217\u8868
 lists=\u5217\u8868
 invalid=\u65e0\u6548
 selected_tei_is_invalid=Selected tracked entity instance is invalid
-required=\u9700\u8981\u7684
+required=\u6240\u9700
 number_required=\u9700\u8981\u6570\u636e
 date_required=\u9700\u8981\u6570\u636e
-number=\u6570\u636e
-value_must_be_number=Value must be a number
+number=\u6570\u5b57
+value_must_be_number=\u503c\u5fc5\u987b\u662f\u4e00\u4e2a\u6570\u5b57
 value_must_be_posInt=Value must be a positive integer
 value_must_be_negInt=Value must be a negative integer
 value_must_be_zeroPositiveInt=Value must be zero or a positive integer
-value_must_be_int=Value must be an integer
+value_must_be_int=\u503c\u5fc5\u987b\u662f\u4e00\u4e2a\u6574\u6570
 posInt=\u6b63\u6574\u6570
 negInt=\u8d1f\u6574\u6570
 zeroPositiveInt=\u96f6\u6216\u6b63\u6574\u6570
@@ -79,13 +80,13 @@ jump_to_page=\u8df3\u5230
 page=\u9875
 first=\u7b2c\u4e00
 previous=\u524d\u4e00
-next=\u4e0b\u4e00\u4e2a
+next=\u4e0b\u4e00
 last=\u6700\u540e
 go_to_dashboard=\u8fdb\u5165\u4eea\u8868\u76d8
 go=\u8fdb\u5165
 find=\u53d1\u73b0
-edit=\u7f16\u8f91<br>
-edit_profile=\u7f16\u8f91\u57fa\u672c\u4fe1\u606f
+edit=\u7f16\u8f91
+edit_profile=\u7f16\u8f91\u7b80\u5386
 tracker_associate=\u8ddf\u8e2a\u5668\u76f8\u5173
 association=\u7ba1\u7406\u76f8\u5173
 change_location=\u7ba1\u7406\u4f4d\u7f6e
@@ -141,8 +142,8 @@ selected_search_attributes=\u9009\u62e9\u7684\u641c\u7d22\u5c5e\u6027
 selected_program=\u9009\u62e9\u7684\u9879\u76ee
 other_programs=\u5176\u5b83\u9879\u76ee
 search_for_dashboard=\u641c\u7d22\u4eea\u8868\u76d8\u6761\u76ee
-dashboard=\u4eea\u8868\u76d8
-home=\u9996\u9875
+dashboard=\u72b6\u6001\u9762\u677f
+home=Home
 back=\u540e\u9000
 enrollment=\u6ce8\u518c
 enrolling_orgunit=\u6ce8\u518c\u673a\u6784
@@ -152,16 +153,16 @@ complete_enrollment=\u5b8c\u6210\u6ce8\u518c
 reopen_enrollment=\u91cd\u65b0\u6ce8\u518c
 activate_enrollment=\u5f00\u653e\u6ce8\u518c
 deactivate_enrollment=\u5173\u95ed\u6ce8\u518c
-enrollment_date=\u6ce8\u518c\u65e5\u671f
-incident_date=\u4e8b\u6545\u65e5\u671f
+enrollment_date=\u767b\u8bb0\u65e5\u671f
+incident_date=\u4e8b\u4ef6\u65e5\u671f
 notes=\u7b14\u8bb0
 relationship=\u5173\u7cfb
 relationshipTo=\u5411\u5916\u5173\u7cfb
 relationshipFrom=\u5411\u5185\u5173\u7cfb
 relationships=\u5173\u7cfb
 add_relationship=\u6dfb\u52a0\u5173\u7cfb
-a_is_to_b=A \u662f  B
-b_is_to_a=B \u662f  A
+a_is_to_b=A\u4e0eB\u7684\u5173\u7cfb
+b_is_to_a=B\u4e0eA\u7684\u5173\u7cfb
 select=\u9009\u62e9
 please_add_some_text=\u8bf7\u6dfb\u52a0\u6587\u672c
 please_select_source=\u8bf7\u9009\u62e9\u6e90
@@ -202,9 +203,10 @@ mark_for_followup=\u540e\u7eed\u6807\u8bb0
 unmark_for_followup=\u4ece\u540e\u7eed\u5220\u9664
 only_marked_for_followup=\u4ec5\u4ec5\u6807\u8bb0\u540e\u7eed
 registered_data=\u767b\u8bb0\u6570\u636e
-no_value=\u65e0\u503c
-no_data_found=\u6ca1\u6709\u53d1\u73b0\u6570\u636e
+no_value=\u6ca1\u6709\u503c
+no_data_found=\u6ca1\u6709\u6570\u636e\u88ab\u627e\u5230
 no_data=\u65e0\u6570\u636e
+mo_matching_data=No data matching your search criteria
 data_exists=\u6570\u636e\u5b58\u5728
 data_registerd=\u65e0\u767b\u8bb0\u6570\u636e
 no_visit_made=\u6ca1\u6709\u968f\u8bbf
@@ -215,7 +217,7 @@ visits=\u968f\u8bbf
 current_selections=\u5f53\u524d\u9009\u62e9
 activePrograms=\u6d3b\u52a8\u9879\u76ee
 set_as_current=\u8bbe\u4e3a\u5f53\u524d
-org_unit=\u673a\u6784
+org_unit=\u7ec4\u7ec7\u673a\u6784
 org_unit_scope=\u673a\u6784\u8303\u56f4
 SELECTED=\u9009\u62e9\u7684
 CHILDREN=\u76f4\u63a5\u4e0b\u5c5e\u673a\u6784
@@ -246,9 +248,9 @@ json=JSON
 xml=XML
 list_programs=\u9879\u76ee\u6e05\u5355
 program_stage=\u9879\u76ee\u9636\u6bb5
-due_date=\u5230\u671f\u65e5\u671f
+due_date=\u5230\u671f\u65e5
 event_date=\u4e8b\u4ef6\u65e5\u671f
-report_date=\u62a5\u544a\u65e5\u671f
+report_date=\u62a5\u8868\u65e5\u671f
 enable_rescheduling=\u6253\u5f00\u91cd\u65b0\u8c03\u5ea6
 disable_rescheduling=\u5173\u95ed\u91cd\u65b0\u8c03\u5ea6
 show_hide_scheduling=\u663e\u793a/\u9690\u85cf\u8c03\u5ea6\u8868\u5355
@@ -257,7 +259,7 @@ show_hide_messaging=\u663e\u793a/\u9690\u85cf \u6d88\u606f \u8868\u5355
 messaging=\u6d88\u606f
 scheduling=\u8c03\u5ea6
 reschedule_duedate=\u91cd\u65b0\u5b89\u6392\u5230\u671f\u65e5
-reschedule=\u91cd\u65b0\u8c03\u5ea6
+reschedule=\u91cd\u65b0\u5b89\u6392
 rescheduling=\u91cd\u65b0\u5b89\u6392
 scheduling_messaging=\u8c03\u5ea6\u5e76\u53d1\u9001\u6d88\u606f
 not_yet_enrolled_scheduling=\u8fd8\u6ca1\u6709\u6ce8\u518c\uff0c\u4e0d\u80fd\u8c03\u5ea6
@@ -273,8 +275,8 @@ exact_date=\u5177\u4f53\u65e5\u671f
 exact_value=\u51c6\u786e\u503c
 EQ=\u7b49\u4e8e
 GT=\u5927\u4e8e
-GE=Greater than or equal to
-LT=Less than
+GE=\u5927\u4e8e\u6216\u7b49\u4e8e
+LT=\u5c0f\u4e8e
 LE=Less than or equal
 NE=Not equal
 IS=Is
@@ -282,8 +284,8 @@ RANGE=Range
 like=Like
 not_like=Not like
 boolean=Boolean
-yes=Yes
-no=No
+yes=\u662f
+no=\u5426
 records=\u8bb0\u5f55
 record=\u8bb0\u5f55
 _record=\u8bb0\u5f55
@@ -293,9 +295,9 @@ move_to_selected=\u79fb\u52a8\u5230\u9009\u62e9\u7684
 move_all_to_selected=\u79fb\u52a8\u6240\u6709\u5230\u9009\u62e9\u7684
 current=\u5f53\u524d
 new=\u65b0\u5efa
-add_new=\u65b0\u52a0
+add_new=\u65b0\u589e
 registration=\u767b\u8bb0
-registration_date=\u767b\u8bb0\u65e5\u671f
+registration_date=\u6ce8\u518c\u65e5\u671f
 register=\u767b\u8bb0
 _register=\u767b\u8bb0
 enrollment_error=\u6ce8\u518c\u9519\u8bef
@@ -308,7 +310,7 @@ tracker_associate_error=Error in tracker associate assignment
 searching_error=\u641c\u7d22\u9519\u8bef
 form_invalid=Form is invalid. Please check for required fields.
 no_entity_for_tracker_associate_attribute=Selected attribute has invalid tracked entity
-errors=\u9519\u8bef
+errors=\u5931\u8bef
 error=\u9519\u8bef
 warning=\u8b66\u544a
 success=\u6210\u529f
@@ -317,7 +319,7 @@ access_denied=\u8bbf\u95ee\u88ab\u62d2\u7edd
 registration_complete=\u767b\u8bb0\u5b8c\u6210
 auto_generate_failed=\u81ea\u4ece\u81ea\u52a8\u751f\u6210\u5c5e\u6027\u5931\u8d25\u540e\u4e0d\u80fd\u767b\u8bb0
 validation_error=\u6709\u6548\u6027\u9a8c\u8bc1\u9519\u8bef
-event_orgunit_name=\u673a\u6784
+event_orgunit_name=\u7ec4\u7ec7\u673a\u6784
 category=\u5206\u7c7b
 entity_type=\u5b9e\u4f53\u7c7b\u578b
 save=\u4fdd\u5b58
@@ -327,7 +329,7 @@ save_and_continue=\u4fdd\u5b58\u5e76\u7ee7\u7eed
 save_relationship=\u4fdd\u5b58\u5173\u7cfb
 delete_relationship=\u5220\u9664\u5173\u7cfb
 can_not_delete_relationship=\u4e0d\u80fd\u5220\u9664\u5173\u7cfb\uff0c\u56e0\u4e3a\u7f3a\u5c11\u5199\u6743\u9650
-go_back=\u540e\u9000
+go_back=\u56de\u9000
 cancel=\u53d6\u6d88
 are_you_sure_to_delete_relationship=\u4f60\u8981\u5220\u9664\u8be5\u5173\u7cfb?
 are_you_sure_to_delete_enrollment=\u4f60\u8981\u5220\u9664\u9009\u62e9\u7684\u6ce8\u518c? \u8be5\u64cd\u4f5c\u8981\u5220\u9664\u76f8\u5173\u7684\u6240\u6709\u4e8b\u4ef6.
@@ -349,20 +351,21 @@ will_delete_all_data_associated=\u5c06\u5220\u9664\u6240\u6709\u76f8\u5173\u7684
 more=\u66f4\u591a
 under_construction=\u6784\u5efa\u4e2d
 advanced_search=\u9ad8\u7ea7\u641c\u7d22
-profile=\u57fa\u672c\u4fe1\u606f
-applications=\u5e94\u7528
+profile=\u7b80\u5386
+applications=Apps
 more_applications=\u66f4\u591a\u5e94\u7528
+manage=Manage
 settings=\u8bbe\u7f6e
-account=\u8d26\u53f7
+account=\u8d26\u6237
 help=\u5e2e\u52a9
-log_out=\u9000\u51fa
-about_dhis2=\u5173\u4e8e
+log_out=\u767b\u51fa
+about_dhis2=\u5173\u4e8e\u7efc\u5408\u536b\u751f\u4fe1\u606f\u7ba1\u7406\u5e73\u53f0
 missing_translation_file=\u7f3a\u5c11\u7ffb\u8bd1\u6587\u4ef6
 missing_translation_using_default=No translation file is found for the selected locale. Using default translation (English).
 loading_tree=\u8f7d\u5165 \u673a\u6784 \u6811
 loading_metadata=Loading meta-data
 loading_components=Loading components
-latitude=\u7ef4\u5ea6
+latitude=\u7eac\u5ea6
 longitude=\u7ecf\u5ea6
 lat_lng=[\u7eac\u5ea6 \u7ecf\u5ea6]
 get=\u83b7\u53d6
@@ -395,19 +398,19 @@ filter_events=\u8fc7\u6ee4\u4e8b\u4ef6
 list_events=\u5217\u793a\u6240\u6709\u4e8b\u4ef6
 prev_period=\u524d\u671f
 nxt_period=\u4e0b\u671f
-period=\u671f\u95f4
-jan=1\u6708
-feb=2\u6708
-mar=3\u6708
-apr=4\u6708
-may=5\u6708
-jun=6\u6708
-jul=7\u6708
-aug=8\u6708
-sep=9\u6708
-oct=10\u6708
-nov=11\u6708
-dec=12\u6708
+period=\u5468\u671f
+jan=01
+feb=02
+mar=03
+apr=04
+may=05
+jun=06
+jul=07
+aug=08
+sep=09
+oct=10
+nov=11
+dec=12
 week=\u5468
 save_layout_as_default=\u4fdd\u5b58\u4eea\u8868\u76d8\u5e03\u5c40\u4e3a\u7f3a\u7701\u5e03\u5c40
 reset_layout=\u91cd\u7f6e\u4eea\u8868\u76d8\u5e03\u5c40
@@ -418,7 +421,7 @@ less_than=\u5c0f\u4e8e
 greater_than=\u5927\u4e8e
 inactive=\u95f2\u7f6e
 activate=\u6fc0\u6d3b
-deactivate=\u53bb\u6d3b
+deactivate=\u505c\u7528
 tei_inactive_only_read=\u4e0d\u6d3b\u8dc3.\u4ec5\u4ec5\u5141\u8bb8\u8bfb
 hide_menu=\u9690\u85cf\u83dc\u5355
 extend_menu=\u6269\u5c55\u83dc\u5355
@@ -431,12 +434,12 @@ custom_form_has_invalid_attribute=\u5b9a\u5236\u8868\u5355\u5305\u62ec\u65e0\u65
 custom_form_has_invalid_dataelement=\u5b9a\u5236\u8868\u5355\u5177\u6709\u65e0\u6548\u6570\u636e\u5143
 events_today_persons=Only those with an event today
 section_has_no_dataelements=\u5206\u533a\u6ca1\u6709\u6570\u636e\u5143
-section=\u5206\u533a
+section=\u5206\u6bb5
 display_mode=\u663e\u793a\u6a21\u5f0f
 tracker_capture_display_mode=\u8ddf\u8e2a\u5668\u91c7\u96c6\u663e\u793a\u6a21\u5f0f
 events_today_all=\u4eca\u5929\u6240\u6709\u4e8b\u4ef6
 events_today_completeoractive=\u5b8c\u6210\u6216\u6fc0\u6d3b
-events_today_skipped=\u8df3\u8fc7\u7684
+events_today_skipped=\u8df3\u8fc7
 events_today_scheduled=\u5df2\u7ecf\u8c03\u5ea6
 multiple_records_warning=\u53d1\u73b0\u591a\u4e2a\u8bb0\u5f55.\u8bf7\u6307\u5b9a\u66f4\u591a\u6761\u4ef6.
 result=\u7ed3\u679c
@@ -453,7 +456,7 @@ scheduled_date=\u8c03\u5ea6\u65e5\u671f
 show_new_event_menu=\u663e\u793a\u65b0\u4e8b\u4ef6\u83dc\u5355
 no_stages_available=\u6240\u6709\u671f\u671b\u7684\u4e8b\u4ef6\u5df2\u7ecf\u5b58\u5728\uff0c\u4e0d\u80fd\u521b\u5efa\u66f4\u591a\u4e8b\u4ef6.
 make_referral=\u751f\u6210\u8f6c\u8bca/\u8fc1\u79fb
-referral=\u6d41\u8f6c
+referral=\u8f6c\u8bca
 show_previous=\u663e\u793a\u524d\u4e00
 show_next=\u663e\u793a\u4e0b\u4e00
 schedule_new=\u65b0\u8c03\u5ea6
@@ -472,13 +475,13 @@ scheduling_disabled_for_programstage=\u8be5\u9879\u76ee\u9636\u6bb5\u4e0d\u80fd\
 event_already_scheduled=\u4e8b\u4ef6\u5df2\u7ecf\u8c03\u5ea6
 programstage_multiple_events_disabled=\u8be5\u9879\u76ee\u9636\u6bb5\u4e0d\u5141\u8bb8\u591a\u4e2a\u4e8b\u4ef6
 event_cant_be_created=\u4e0d\u80fd\u521b\u5efa\u65b0\u4e8b\u4ef6
-created=\u521b\u5efa
+created=\u5df2\u521b\u5efa
 auditType=\u5ba1\u8ba1\u7c7b\u578b
 modifiedBy=\u4fee\u6539\u81ea
 audit_history_unavailable=\u5ba1\u8ba1\u5386\u53f2\u4e0d\u53ef\u7528
 delete_error_audit=\u4e8b\u4ef6\u4e0d\u80fd\u5220\u9664\uff0c\u56e0\u4e3a\u6d89\u53ca\u5ba1\u8ba1\u5386\u53f2\u4fe1\u606f
 are_you_sure_to_remove=\u4f60\u786e\u4fe1\u79fb\u9664?
-completed_label=\u5df2\u5b8c\u6210
+completed_label=\u5b8c\u6210
 stage_completed=\u5b8c\u6210\u7684\u4e8b\u4ef6
 stage_completed_label=\u5168\u90e8\u5b8c\u6210\u7684
 executed=\u6253\u5f00\u8fdb\u884c\u6570\u636e\u8f93\u5165
@@ -489,8 +492,8 @@ ontime=\u5df2\u7ecf\u8c03\u5ea6
 ontime_label=\u5df2\u7ecf\u8c03\u5ea6
 stage_ontime=\u4e8b\u4ef6\u5df2\u7ecf\u8c03\u5ea6
 stage_ontime_label=\u53d1\u73b0\u8c03\u5ea6
-overdue=\u903e\u671f
-overdue_label=\u903e\u671f
+overdue=\u8fc7\u671f
+overdue_label=\u8fc7\u671f
 stage_overdue=\u4e8b\u4ef6\u8fc7\u671f
 stage_overdue_label=\u53d1\u73b0\u8fc7\u671f
 skipped=\u8df3\u8fc7\u7684\u4e8b\u4ef6
@@ -525,8 +528,8 @@ openstreetmap=OpenStreetMap
 googlemap=\u8c37\u6b4c\u5730\u56fe
 missing_google_map_api_key=Missing Google Maps API key. This can be configured in System Settings (Access settings).
 missing_mapzen_search_api_key=Missing Mapzen search API key. This can be configured in System Settings (Access settings).
-sms=SMS
-email=E-mail
+sms=\u77ed\u4fe1\u7ba1\u7406
+email=\u7535\u5b50\u90ae\u4ef6
 email_address=E-mail \u5730\u5740
 wrong_email=\u8bf7\u6307\u5b9a\u4e00\u4e2a\u6709\u6548\u7684e-mail\u5730\u5740
 email_subject=\u4e3b\u9898
@@ -558,7 +561,7 @@ more_options_available=\u66f4\u591a\u9009\u9879\u53ef\u7528\uff0c\u8bd5\u56fe\u6
 move_permanently=\u6c38\u4e45\u6027\u79fb\u52a8
 onetime_referral=\u4e00\u6b21\u6027\u8fc1\u79fb
 are_you_sure_you_want_to_move_permanently=\u4f60\u786e\u4fe1\u8981\u6c38\u4e45\u6027\u79fb\u52a8\u75c5\u4eba\uff1f
-ok=\u597d
+ok=OK
 can_not_add_new_enrollment=\u4e0d\u80fd\u6dfb\u52a0\u65b0\u6ce8\u518c\uff0c\u56e0\u4e3a\u8be5\u9879\u76ee\u53ea\u5141\u8bb8\u4e00\u6b21\u6ce8\u518c.
 switch_compare_form=\u5207\u6362\u5230\u6bd4\u8f83\u8868\u5355
 switch_default_form=\u5207\u6362\u5230\u7f3a\u7701\u8868\u5355
@@ -575,6 +578,7 @@ top_bar_settings=\u9876\u90e8\u5de5\u5177\u6761\u8bbe\u7f6e
 show=\u663e\u793a
 sort_order=\u6392\u5e8f
 activate_top_bar=\u6fc0\u6d3b\u9876\u90e8\u5de5\u5177\u6761
+use_as_top_bar=Use as top bar
 remove_widget=\u79fb\u9664\u5411\u5bfc?
 remove_widget_info=\u4f60\u5c06\u79fb\u9664\u5411\u5bfc\uff0c\u8981\u7ee7\u7eed?
 lock_default_layout=\u4e3a\u6240\u6709\u7528\u6237\u9501\u5b9a\u5e03\u5c40
@@ -583,10 +587,10 @@ upload_image=\u4e0a\u4f20
 please_select_an_image=[\u8bf7\u9009\u62e9\u4e00\u5e45\u56fe\u50cf]
 all=\u5168\u90e8
 ALL=\u5168\u90e8
-completed=\u5df2\u5b8c\u6210
+completed=\u5b8c\u6210
 active=\u6d3b\u8dc3\u7684
 cancelled=\u5df2\u53d6\u6d88
-enrollment_status=\u6ce8\u518c\u72b6\u6001
+enrollment_status=\u767b\u8bb0\u72b6\u6001
 go_to_registration=\u8fdb\u5165\u767b\u8bb0
 tracked_entity_instance_search_results_header={trackedEntityTypeName} \u641c\u7d22\u7ed3\u679c
 tracked_entity_instance_search_matches_description=\u5982\u679c\u641c\u7d22\u7684 {trackedEntityTypeName} \u6ca1\u6709\uff0c\u9009\u62e9"\u8fdb\u5165\u767b\u8bb0"
@@ -625,7 +629,7 @@ you_need_write_to_program_stage_to_be_able_to_create_event=You need write access
 no_polygon_captured=\u6ca1\u6709\u91c7\u96c6\u5230\u591a\u8fb9\u5f62
 polygon_captured=\u91c7\u96c6\u7684\u591a\u8fb9\u5f62\u3002
 no_geometry_captured=\u6ca1\u6709\u91c7\u96c6\u5230\u51e0\u4f55\u5f62\u72b6
-geometry=\u51e0\u4f55\u56fe\u5f62
+geometry=\u51e0\u4f55\u5f62\u72b6
 tracked_entity_type=\u8ddf\u8e2a\u5b9e\u4f53\u7c7b\u578b
 type=\u7c7b\u578b
 tracked_entity_type_has_no_attributes=\u8ddf\u8e2a\u5b9e\u4f53\u7c7b\u578b\u6ca1\u6709\u5c5e\u6027
@@ -656,7 +660,7 @@ assigned_user=\u6307\u6d3e\u7684\u7528\u6237
 linked_events=\u94fe\u63a5\u7684\u4e8b\u4ef6
 user_assignment=\u7528\u6237\u6307\u6d3e
 specific_users=\u7279\u5b9a\u7684\u7528\u6237
-none=\u6ca1\u6709
+none=\u65e0
 any=\u4efb\u4f55
 no_requirement=\u4e0d\u9700\u8981
 the_record_has_is_possible_duplicate=\u8bb0\u5f55\u53ef\u80fd\u91cd\u590d
diff --git a/package.json b/package.json
index 6b6c9868f..15845eee3 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "tracker-capture-app",
-  "version": "31.0.16",
+  "version": "31.0.17",
   "description": "DHIS2 tracker capture app",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "prebuild": "(rm -r build && mkdir build) || mkdir build",
-    "build": "webpack && cp -r i18n build/i18n && cp -r core build/core && cp -r vendor build/vendor && cp -r views build/views && cp -r styles build/styles && find ./components -iname \"*.html\" -exec rsync -R '{}' ./build/ \\;",
+    "build": "webpack && cp package.json build && cp -r i18n build/i18n && cp -r core build/core && cp -r vendor build/vendor && cp -r views build/views && cp -r styles build/styles && find ./components -iname \"*.html\" -exec rsync -R '{}' ./build/ \\;",
     "start": "webpack-dev-server"
   },
   "repository": {
@@ -24,11 +24,11 @@
   "homepage": "https://github.com/dhis2/tracker-capture-app#readme",
   "dependencies": {
     "angular-vs-repeat": "^2.0.9",
-    "d2-tracker": "35.0.2",
+    "d2-tracker": "35.0.7",
     "file-loader": "^1.1.11",
-    "leaflet": "^1.3.1",
+    "leaflet": "^1.7.1",
     "leaflet-contextmenu": "^1.1.0",
-    "leaflet-control-geocoder": "^1.5.8",
+    "leaflet-control-geocoder": "^2.3.0",
     "leaflet-draw": "^1.0.2"
   },
   "devDependencies": {
diff --git a/scripts/services.js b/scripts/services.js
index f41c40904..7be0a199d 100644
--- a/scripts/services.js
+++ b/scripts/services.js
@@ -498,8 +498,10 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
                 TCStorageService.currentStore.open().done(function(){
                     TCStorageService.currentStore.getAll('programs').done(function(prs){
                         var programs = [];
+                        var teiFromURL = ($location.search()).tei;
                         angular.forEach(prs, function(pr){
-                            if(pr.organisationUnits.hasOwnProperty( ou.id ) && accesses.programsById[pr.id] && accesses.programsById[pr.id].data.read){
+                            if( (loadSelectedProgram && selectedProgram && pr.id == selectedProgram.id && teiFromURL) ||
+                                (pr.organisationUnits.hasOwnProperty( ou.id ) && accesses.programsById[pr.id] && accesses.programsById[pr.id].data.read) ){
                                 if(pr.programTrackedEntityAttributes){
                                     pr.programTrackedEntityAttributes = pr.programTrackedEntityAttributes.filter(function(attr){
                                         return attr.access && attr.access.read;
@@ -609,9 +611,6 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
             tei.attributes = [];
             var formEmpty = true;
             for(var k in attributesById){
-                if(originalTei && formTei[k] !== originalTei[k] && !formTei[k] && !originalTei[k]){
-                    formChanged = true;
-                }
                 if( k in formTei ){
                     var att = attributesById[k];
                     tei.attributes.push({attribute: att.id, value: formTei[k], displayName: att.displayName, valueType: att.valueType});
@@ -622,19 +621,19 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
             formTei.attributes = tei.attributes;
 
             var formChanged = false;
-            for(var k in attributesById){
-                if(originalTei && formTei[k] !== originalTei[k]){
-                    if(!formEmpty){
-                        formChanged = true;
-                        break;
-                    }
-                    if(formEmpty && (formTei[k] || originalTei[k]) ){
-                        formChanged = true;
-                        break;
+            if (originalTei) {
+                for (var k in attributesById) {
+                    if (formTei[k] !== originalTei[k]) {
+                        if (!formEmpty) {
+                            formChanged = true;
+                            break;
+                        }
+                        if (formEmpty && (formTei[k] || originalTei[k])) {
+                            formChanged = true;
+                            break;
+                        }
                     }
                 }
-            }
-            if (originalTei) {
                 angular.forEach(originalTei.attributes, function (att) {
                     if (tei[att.attribute]) {
                         delete tei[att.attribute];
@@ -672,7 +671,7 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
     };
     var errorHeader = $translate.instant("error");
     return {
-        get: function( enrollmentUid,teiUid, programUid){
+        get: function(enrollmentUid, teiUid, programUid){
             var url = DHIS2URL + '/enrollments/' + enrollmentUid;
             return TeiAccessApiService.get(teiUid, programUid, url).then(function(response){
                 return convertFromApiToUser(response.data);
@@ -687,29 +686,9 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
                 return null;
             });
         },
-        getByEntity: function( entity ){
-            var promise = $http.get(  DHIS2URL + '/enrollments.json?ouMode=ACCESSIBLE&trackedEntityInstance=' + entity + '&fields=:all&paging=false').then(function(response){
-                return convertFromApiToUser(response.data);
-            },function(response){
-                var errorBody = $translate.instant('failed_to_fetch_enrollment');
-                NotificationService.showNotifcationDialog(errorHeader, errorBody, response);
-                return null;
-            });
-            return promise;
-        },
-        getByEntityAndProgram: function( entity, program ){
-            var url = DHIS2URL + '/enrollments.json?ouMode=ACCESSIBLE&trackedEntityInstance=' + entity + '&program=' + program + '&fields=:all&paging=false';
-            var promise = TeiAccessApiService.get(entity,program,url).then(function(response){
-                return convertFromApiToUser(response.data);
-            }, function(response){
-                var errorBody = $translate.instant('failed_to_fetch_enrollment');
-                NotificationService.showNotifcationDialog(errorHeader, errorBody, response);
-                return null;
-            });
-            return promise;
-        },
-        getByStartAndEndDate: function( program, orgUnit, ouMode, startDate, endDate ){
-            var promise = $http.get(  DHIS2URL + '/enrollments.json?ouMode=ACCESSIBLE&program=' + program + '&orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&startDate=' + startDate + '&endDate=' + endDate + '&fields=:all&paging=false').then(function(response){
+        getByStartAndEndDate: function( program, orgUnit, ouMode, startDate, endDate, pageSize ){
+            var paging = pageSize ? '&pageSize=' + pageSize : '&paging=false'
+            var promise = $http.get(  DHIS2URL + '/enrollments.json?program=' + program + '&ou=' + orgUnit + '&ouMode='+ ouMode + '&programStartDate=' + startDate + '&programEndDate=' + endDate + '&fields=:all' + paging).then(function(response){
                 return convertFromApiToUser(response.data);
             }, function(response){
                 var errorBody = $translate.instant('failed_to_fetch_enrollment');
@@ -978,7 +957,7 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
         return tei;
     }
     return {
-        getWithProgramData: function(entityUid,programUid, optionSets, attributesById, useCached){
+        getWithProgramData: function(entityUid, programUid, optionSets, attributesById, useCached){
             if(useCached && cachedTeiWithProgramData && cachedTeiWithProgramData.entityUid === entityUid && cachedTeiWithProgramData.programUid === programUid){
                 var def = $q.defer();
                 def.resolve(cachedTeiWithProgramData.data);
@@ -1013,6 +992,9 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
                 return def.promise;
             });
         },
+        flushCachedTei: function() {
+            cachedTeiWithProgramData = {};
+        },
         get: function(entityUid, optionSets, attributesById){
             var promise = $http.get( DHIS2URL + '/trackedEntityInstances/' +  entityUid + '.json').then(function(response){
                 var tei = response.data;
@@ -1043,6 +1025,12 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
             });
             return promise;
         },
+        saveRelationship: function(relationship) {
+            var promise = $http.post( DHIS2URL + '/relationships', relationship).then(function(response){
+                return response.data;
+            });
+            return promise;
+        },
         getPotentialDuplicates: function(uidList) {
             var uidUrl = "";
             if(uidList.length > 0)
@@ -1286,8 +1274,9 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
 
                     angular.forEach(program.programTrackedEntityAttributes, function(pAttribute){
                         var att = attributes[pAttribute.trackedEntityAttribute.id];
-                        att.programTrackedEntityAttribute = pAttribute;
+                        
                         if (att) {
+                            att.programTrackedEntityAttribute = pAttribute;
                             att.mandatory = pAttribute.mandatory;
                             att.displayInListNoProgram = pAttribute.displayInList;
                             
@@ -1457,7 +1446,7 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
     return {
 
         getEventsByStatus: function(entity, orgUnit, program, programStatus){
-            var promise = TeiAccessApiService.get(entity,program, DHIS2URL + '/events.json?ouMode=ACCESSIBLE&' + 'trackedEntityInstance=' + entity + '&orgUnit=' + orgUnit + '&program=' + program + '&programStatus=' + programStatus  + skipPaging).then(function(response){
+            var promise = TeiAccessApiService.get(entity, program, DHIS2URL + '/events.json?ouMode=ACCESSIBLE&' + 'trackedEntityInstance=' + entity + '&orgUnit=' + orgUnit + '&program=' + program + '&programStatus=' + programStatus  + skipPaging).then(function(response){
                 return response.data.events;
             }, function (response) {
 
@@ -1499,13 +1488,14 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
             });
             return promise;
         },
-        getByOrgUnitAndProgram: function(orgUnit, ouMode, program, startDate, endDate){
+        getByOrgUnitAndProgram: function(orgUnit, ouMode, program, startDate, endDate, pageSize){
             var url;
+            var paging = pageSize ? '&pageSize=' + pageSize : skipPaging;
             if(startDate && endDate){
-                url = DHIS2URL + '/events.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + '&startDate=' + startDate + '&endDate=' + endDate + skipPaging;
+                url = DHIS2URL + '/events.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + '&startDate=' + startDate + '&endDate=' + endDate + paging;
             }
             else{
-                url = DHIS2URL + '/events.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + skipPaging;
+                url = DHIS2URL + '/events.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + paging;
             }
             var promise = $http.get( url ).then(function(response){
                 return response.data.events;
@@ -1636,7 +1626,7 @@ var trackerCaptureServices = angular.module('trackerCaptureServices', ['ngResour
                 var pg = pager ? pager.page : 1;
                 pgSize = pgSize > 1 ? pgSize  : 1;
                 pg = pg > 1 ? pg : 1;
-                url = url + '&pageSize=' + pgSize + '&page=' + pg + '&totalPages=true';
+                url = url + '&pageSize=' + pgSize + '&page=' + pg;
             }
 
             var promise = $http.get( url ).then(function(response){
@@ -2426,7 +2416,7 @@ i
                     return 'alert-warning'; //'stage-executed';
                 }
                 else{
-                    if(moment(eventDate, calendarSetting.momentFormat).isAfter(dhis2Event.dueDate)){
+                    if(moment(eventDate, calendarSetting.momentFormat).isAfter(moment(dhis2Event.dueDate, calendarSetting.momentFormat))){
                         return 'alert-danger';//'stage-overdue';
                     }
                     return 'alert-success';//'stage-on-time';
@@ -3323,7 +3313,7 @@ i
         }
     }
 })
-.service('AccessUtils', function($q, TCStorageService){
+.service('AccessUtils', function($http, $q, TCStorageService){
 
     this.anyWritable = function(accessKeyValuePair){
         if(accessKeyValuePair){
@@ -3358,6 +3348,12 @@ i
         });
         return writable;
     }
+
+    this.withinUserHierarchy = function(ou) {
+        return $http.get(DHIS2URL + '/organisationUnits?withinUserHierarchy=true&fields=id&filter=id:eq:' + ou).then(function(response) {
+            return response.data.organisationUnits.length !== 0;
+        });
+    }
 })
 .service('TCOrgUnitService', function($q, $rootScope, TCStorageService, OrgUnitFactory){
     this.get = function(uid) {
diff --git a/views/tei-list-performant.html b/views/tei-list-performant.html
index e5b8bb4ef..9f1fadc25 100644
--- a/views/tei-list-performant.html
+++ b/views/tei-list-performant.html
@@ -42,7 +42,7 @@
                         </span>
                     </td>
                     <td ng-if="allowFlagDuplicates">
-                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
+                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
                         <span ng-if="onGetDuplicateInternal(tei)"><div class="alert alert-warning alert-compact">{{'possible_duplicate' | translate}}</div>
                             <a ng-click="onUnMarkDuplicateInternal(tei)">{{'unflag' | translate}}</a>
                         </span>
@@ -67,7 +67,7 @@
                         </span>
                     </td>
                     <td ng-if="allowFlagDuplicates">
-                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
+                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
                         <span ng-if="onGetDuplicateInternal(tei)"><div class="alert alert-warning alert-compact">{{'possible_duplicate' | translate}}</div>
                             <a ng-click="onUnMarkDuplicateInternal(tei)">{{'unflag' | translate}}</a>
                         </span>
diff --git a/views/tei-list.html b/views/tei-list.html
index ef861bf4c..264938bc2 100644
--- a/views/tei-list.html
+++ b/views/tei-list.html
@@ -42,7 +42,7 @@
                         </span>
                     </td>
                     <td ng-if="allowFlagDuplicates">
-                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
+                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
                         <span ng-if="onGetDuplicateInternal(tei)"><div class="alert alert-warning alert-compact">{{'possible_duplicate' | translate}}</div>
                             <a ng-click="onUnMarkDuplicateInternal(tei)">{{'unflag' | translate}}</a>
                         </span>
@@ -67,7 +67,7 @@
                         </span>
                     </td>
                     <td ng-if="allowFlagDuplicates">
-                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
+                        <a ng-if="!onGetDuplicateInternal(tei)" title="{{'the_record_has_is_possible_duplicate' | translate}}" ng-click="onMarkDuplicateInternal(tei)">{{'flag_possible_duplicate' | translate}}</a>
                         <span ng-if="onGetDuplicateInternal(tei)"><div class="alert alert-warning alert-compact">{{'possible_duplicate' | translate}}</div>
                             <a ng-click="onUnMarkDuplicateInternal(tei)">{{'unflag' | translate}}</a>
                         </span>
diff --git a/yarn.lock b/yarn.lock
index 10185b010..1bf1cdfae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,40 +2,43 @@
 # yarn lockfile v1
 
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-accepts@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 acorn@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
 acorn@~2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.6.4.tgz#eb1f45b4a43fa31d03701a5ec46f3b52673e90ee"
+  integrity sha1-6x9FtKQ/ox0DcBpexG87Umc+kO4=
 
 ajv-keywords@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671"
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    fast-deep-equal "^1.0.0"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -44,106 +47,137 @@ align-text@^0.1.1, align-text@^0.1.3:
 alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
 alter@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd"
+  integrity sha1-x1iICGF1cgNKrmJICvJrHU0cs80=
   dependencies:
     stable "~0.1.3"
 
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 angular-vs-repeat@^2.0.9:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/angular-vs-repeat/-/angular-vs-repeat-2.0.9.tgz#fc2713f14223c8dccf37e7b900b2dadb932c2b0b"
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/angular-vs-repeat/-/angular-vs-repeat-2.0.14.tgz#c9e655bd2e40c31313c842039ff8c5ee10f8ed82"
+  integrity sha512-MYB0xjiLz0gVQQJM7m6mod1sj+mJTfhkD0uceEskrOr3ss92fiGO7dDAjQYOxQ2G/bIWNajS/Ug6jtZUQewv2A==
+  dependencies:
+    natives "^1.1.6"
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-wrap@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
+  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+array-each@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-slice@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-uniq@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
     object-assign "^4.1.1"
     util "0.10.3"
@@ -151,666 +185,753 @@ assert@^1.1.1:
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async-each@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
 
 async@^1.3.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^6.3.1:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.4.tgz#1386eb6708ccff36aefff70adc694ecfd60af1b0"
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
   dependencies:
-    browserslist "~1.4.0"
-    caniuse-db "^1.0.30000597"
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^5.2.6"
+    postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-babel-code-frame@^6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.20.0.tgz#b968f839090f9a8bc6d41938fb96cb84f7387b26"
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
-    chalk "^1.1.0"
+    chalk "^1.1.3"
     esutils "^2.0.2"
-    js-tokens "^2.0.0"
-
-babel-core@^6.18.0, babel-core@^6.8.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.20.0.tgz#ab0d7176d9dea434e66badadaf92237865eab1ec"
-  dependencies:
-    babel-code-frame "^6.20.0"
-    babel-generator "^6.20.0"
-    babel-helpers "^6.16.0"
-    babel-messages "^6.8.0"
-    babel-register "^6.18.0"
-    babel-runtime "^6.20.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.20.0"
-    babel-types "^6.20.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
+    js-tokens "^3.0.2"
+
+babel-core@^6.26.0, babel-core@^6.8.0:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
     slash "^1.0.0"
-    source-map "^0.5.0"
+    source-map "^0.5.7"
 
-babel-generator@^6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.20.0.tgz#fee63614e0449390103b3097f3f6a118016c6766"
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
-    babel-messages "^6.8.0"
-    babel-runtime "^6.20.0"
-    babel-types "^6.20.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-
-babel-helper-bindify-decorators@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.18.0.tgz#fc00c573676a6e702fffa00019580892ec8780a5"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.18.0.tgz#8ae814989f7a53682152e3401a04fabd0bb333a6"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
-babel-helper-call-delegate@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.18.0.tgz#05b14aafa430884b034097ef29e9f067ea4133bd"
-  dependencies:
-    babel-helper-hoist-variables "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-define-map@^6.18.0, babel-helper-define-map@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.18.0.tgz#8d6c85dc7fbb4c19be3de40474d18e97c3676ec2"
-  dependencies:
-    babel-helper-function-name "^6.18.0"
-    babel-runtime "^6.9.0"
-    babel-types "^6.18.0"
-    lodash "^4.2.0"
-
-babel-helper-explode-assignable-expression@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.18.0.tgz#14b8e8c2d03ad735d4b20f1840b24cd1f65239fe"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-explode-class@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.18.0.tgz#c44f76f4fa23b9c5d607cbac5d4115e7a76f62cb"
-  dependencies:
-    babel-helper-bindify-decorators "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-function-name@^6.18.0, babel-helper-function-name@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.18.0.tgz#68ec71aeba1f3e28b2a6f0730190b754a9bf30e6"
-  dependencies:
-    babel-helper-get-function-arity "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-get-function-arity@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz#a5b19695fd3f9cdfc328398b47dafcd7094f9f24"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
-babel-helper-hoist-variables@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.18.0.tgz#a835b5ab8b46d6de9babefae4d98ea41e866b82a"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
-babel-helper-optimise-call-expression@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.18.0.tgz#9261d0299ee1a4f08a6dd28b7b7c777348fd8f0f"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
-babel-helper-regex@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.18.0.tgz#ae0ebfd77de86cb2f1af258e2cc20b5fe893ecc6"
-  dependencies:
-    babel-runtime "^6.9.0"
-    babel-types "^6.18.0"
-    lodash "^4.2.0"
-
-babel-helper-remap-async-to-generator@^6.16.0, babel-helper-remap-async-to-generator@^6.16.2:
-  version "6.20.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.20.3.tgz#9dd3b396f13e35ef63e538098500adc24c63c4e7"
-  dependencies:
-    babel-helper-function-name "^6.18.0"
-    babel-runtime "^6.20.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.20.0"
-    babel-types "^6.20.0"
-
-babel-helper-replace-supers@^6.18.0, babel-helper-replace-supers@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.18.0.tgz#28ec69877be4144dbd64f4cc3a337e89f29a924e"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.18.0"
-    babel-messages "^6.8.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helpers@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.16.0.tgz#1095ec10d99279460553e67eb3eee9973d3867e3"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-template "^6.16.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-bindify-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  integrity sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-explode-class@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  integrity sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=
+  dependencies:
+    babel-helper-bindify-decorators "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
 
 babel-loader@^6.2.4:
-  version "6.2.9"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.9.tgz#2bce6a1c29b47afa90b937ba1fb1f87084d61c61"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+  integrity sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=
   dependencies:
     find-cache-dir "^0.1.1"
-    loader-utils "^0.2.11"
+    loader-utils "^0.2.16"
     mkdirp "^0.5.1"
     object-assign "^4.0.1"
 
-babel-messages@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.8.0.tgz#bf504736ca967e6d65ef0adb5a2a5f947c8e0eb9"
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-check-es2015-constants@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz#dbf024c32ed37bfda8dee1e76da02386a8d26fe7"
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
   dependencies:
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
 
 babel-plugin-syntax-async-generators@^6.5.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+  integrity sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=
 
 babel-plugin-syntax-class-constructor-call@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
+  integrity sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=
 
 babel-plugin-syntax-class-properties@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+  integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
 
 babel-plugin-syntax-decorators@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+  integrity sha1-MSVjtNvePMgGzuPkFszurd0RrAs=
 
 babel-plugin-syntax-do-expressions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz#5747756139aa26d390d09410b03744ba07e4796d"
+  integrity sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=
 
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
 
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
 
 babel-plugin-syntax-export-extensions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
+  integrity sha1-cKFITw+QiaToStRLrDU8lbmxJyE=
 
 babel-plugin-syntax-function-bind@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz#48c495f177bdf31a981e732f55adc0bdd2601f46"
+  integrity sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=
 
 babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
-babel-plugin-syntax-trailing-function-commas@^6.3.13:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.20.0.tgz#442835e19179f45b87e92d477d70b9f1f18b5c4f"
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
 
-babel-plugin-transform-async-generator-functions@^6.17.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.17.0.tgz#d0b5a2b2f0940f2b245fa20a00519ed7bc6cae54"
+babel-plugin-transform-async-generator-functions@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  integrity sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=
   dependencies:
-    babel-helper-remap-async-to-generator "^6.16.2"
+    babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-generators "^6.5.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-async-to-generator@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.16.0.tgz#19ec36cb1486b59f9f468adfa42ce13908ca2999"
+babel-plugin-transform-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
   dependencies:
-    babel-helper-remap-async-to-generator "^6.16.0"
+    babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-class-constructor-call@^6.3.13:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.18.0.tgz#80855e38a1ab47b8c6c647f8ea1bcd2c00ca3aae"
+babel-plugin-transform-class-constructor-call@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz#80dc285505ac067dcb8d6c65e2f6f11ab7765ef9"
+  integrity sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=
   dependencies:
     babel-plugin-syntax-class-constructor-call "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-class-properties@^6.18.0:
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.19.0.tgz#1274b349abaadc835164e2004f4a2444a2788d5f"
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=
   dependencies:
-    babel-helper-function-name "^6.18.0"
+    babel-helper-function-name "^6.24.1"
     babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.9.1"
-    babel-template "^6.15.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-decorators@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.13.0.tgz#82d65c1470ae83e2d13eebecb0a1c2476d62da9d"
+babel-plugin-transform-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  integrity sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=
   dependencies:
-    babel-helper-define-map "^6.8.0"
-    babel-helper-explode-class "^6.8.0"
+    babel-helper-explode-class "^6.24.1"
     babel-plugin-syntax-decorators "^6.13.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-    babel-types "^6.13.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-plugin-transform-do-expressions@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.8.0.tgz#fda692af339835cc255bb7544efb8f7c1306c273"
+babel-plugin-transform-do-expressions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz#28ccaf92812d949c2cd1281f690c8fdc468ae9bb"
+  integrity sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=
   dependencies:
     babel-plugin-syntax-do-expressions "^6.8.0"
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-arrow-functions@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz#5b63afc3181bdc9a8c4d481b5a4f3f7d7fef3d9d"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz#ed95d629c4b5a71ae29682b998f70d9833eb366d"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.18.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.20.0.tgz#5d8f3e83b1a1ae1064e64a9e5bb83108d8e73be3"
-  dependencies:
-    babel-runtime "^6.20.0"
-    babel-template "^6.15.0"
-    babel-traverse "^6.20.0"
-    babel-types "^6.20.0"
-    lodash "^4.2.0"
-
-babel-plugin-transform-es2015-classes@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz#ffe7a17321bf83e494dcda0ae3fc72df48ffd1d9"
-  dependencies:
-    babel-helper-define-map "^6.18.0"
-    babel-helper-function-name "^6.18.0"
-    babel-helper-optimise-call-expression "^6.18.0"
-    babel-helper-replace-supers "^6.18.0"
-    babel-messages "^6.8.0"
-    babel-runtime "^6.9.0"
-    babel-template "^6.14.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-plugin-transform-es2015-computed-properties@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz#f51010fd61b3bd7b6b60a5fdfd307bb7a5279870"
-  dependencies:
-    babel-helper-define-map "^6.8.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-
-babel-plugin-transform-es2015-destructuring@^6.18.0:
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.19.0.tgz#ff1d911c4b3f4cab621bd66702a869acd1900533"
-  dependencies:
-    babel-runtime "^6.9.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.8.0.tgz#fd8f7f7171fc108cc1c70c3164b9f15a81c25f7d"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.8.0"
-
-babel-plugin-transform-es2015-for-of@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz#4c517504db64bf8cfc119a6b8f177211f2028a70"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-function-name@^6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz#8c135b17dbd064e5bba56ec511baaee2fca82719"
-  dependencies:
-    babel-helper-function-name "^6.8.0"
-    babel-runtime "^6.9.0"
-    babel-types "^6.9.0"
-
-babel-plugin-transform-es2015-literals@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz#50aa2e5c7958fc2ab25d74ec117e0cc98f046468"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.18.0.tgz#49a054cbb762bdf9ae2d8a807076cfade6141e40"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.18.0.tgz#c15ae5bb11b32a0abdcc98a5837baa4ee8d67bcc"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.16.0"
-    babel-types "^6.18.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.18.0:
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.19.0.tgz#50438136eba74527efa00a5b0fefaf1dc4071da6"
-  dependencies:
-    babel-helper-hoist-variables "^6.18.0"
-    babel-runtime "^6.11.6"
-    babel-template "^6.14.0"
-
-babel-plugin-transform-es2015-modules-umd@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.18.0.tgz#23351770ece5c1f8e83ed67cb1d7992884491e50"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-
-babel-plugin-transform-es2015-object-super@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz#1b858740a5a4400887c23dcff6f4d56eea4a24c5"
-  dependencies:
-    babel-helper-replace-supers "^6.8.0"
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-parameters@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.18.0.tgz#9b2cfe238c549f1635ba27fc1daa858be70608b1"
-  dependencies:
-    babel-helper-call-delegate "^6.18.0"
-    babel-helper-get-function-arity "^6.18.0"
-    babel-runtime "^6.9.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz#e2ede3b7df47bf980151926534d1dd0cbea58f43"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
-babel-plugin-transform-es2015-spread@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz#0217f737e3b821fa5a669f187c6ed59205f05e9c"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz#e73d300a440a35d5c64f5c2a344dc236e3df47be"
-  dependencies:
-    babel-helper-regex "^6.8.0"
-    babel-runtime "^6.0.0"
-    babel-types "^6.8.0"
-
-babel-plugin-transform-es2015-template-literals@^6.6.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz#86eb876d0a2c635da4ec048b4f7de9dfc897e66b"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz#0b14c48629c90ff47a0650077f6aa699bee35798"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.3.13:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz#6298ceabaad88d50a3f4f392d8de997260f6ef2c"
-  dependencies:
-    babel-helper-regex "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.8.0.tgz#db25742e9339eade676ca9acec46f955599a68a4"
+babel-plugin-transform-exponentiation-operator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
   dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.8.0"
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-export-extensions@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.8.0.tgz#fa80ff655b636549431bfd38f6b817bd82e47f5b"
+babel-plugin-transform-export-extensions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
+  integrity sha1-U3OLR+deghhYnuqUbLvTkQm75lM=
   dependencies:
     babel-plugin-syntax-export-extensions "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-function-bind@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.8.0.tgz#e7f334ce69f50d28fe850a822eaaab9fa4f4d821"
+babel-plugin-transform-function-bind@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz#c6fb8e96ac296a310b8cf8ea401462407ddf6a97"
+  integrity sha1-xvuOlqwpajELjPjqQBRiQH3fapc=
   dependencies:
     babel-plugin-syntax-function-bind "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@^6.16.0:
-  version "6.20.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.20.2.tgz#e816c55bba77b14c16365d87e2ae48c8fd18fc2e"
+babel-plugin-transform-object-rest-spread@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.20.0"
+    babel-runtime "^6.26.0"
 
-babel-plugin-transform-regenerator@^6.16.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.20.0.tgz#a546cd2aa1c9889929d5c427a31303847847ab75"
+babel-plugin-transform-regenerator@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
   dependencies:
-    regenerator-transform "0.9.8"
+    regenerator-transform "^0.10.0"
 
-babel-plugin-transform-strict-mode@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.18.0.tgz#df7cf2991fe046f44163dcd110d5ca43bc652b9d"
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
   dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
 
 babel-preset-es2015@^6.6.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.18.0.tgz#b8c70df84ec948c43dcf2bf770e988eb7da88312"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.3.13"
-    babel-plugin-transform-es2015-arrow-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoping "^6.18.0"
-    babel-plugin-transform-es2015-classes "^6.18.0"
-    babel-plugin-transform-es2015-computed-properties "^6.3.13"
-    babel-plugin-transform-es2015-destructuring "^6.18.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.6.0"
-    babel-plugin-transform-es2015-for-of "^6.18.0"
-    babel-plugin-transform-es2015-function-name "^6.9.0"
-    babel-plugin-transform-es2015-literals "^6.3.13"
-    babel-plugin-transform-es2015-modules-amd "^6.18.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.18.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.18.0"
-    babel-plugin-transform-es2015-modules-umd "^6.18.0"
-    babel-plugin-transform-es2015-object-super "^6.3.13"
-    babel-plugin-transform-es2015-parameters "^6.18.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.18.0"
-    babel-plugin-transform-es2015-spread "^6.3.13"
-    babel-plugin-transform-es2015-sticky-regex "^6.3.13"
-    babel-plugin-transform-es2015-template-literals "^6.6.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.18.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.3.13"
-    babel-plugin-transform-regenerator "^6.16.0"
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+  integrity sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.24.1"
+    babel-plugin-transform-es2015-classes "^6.24.1"
+    babel-plugin-transform-es2015-computed-properties "^6.24.1"
+    babel-plugin-transform-es2015-destructuring "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
+    babel-plugin-transform-es2015-for-of "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.24.1"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-umd "^6.24.1"
+    babel-plugin-transform-es2015-object-super "^6.24.1"
+    babel-plugin-transform-es2015-parameters "^6.24.1"
+    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
+    babel-plugin-transform-regenerator "^6.24.1"
 
 babel-preset-stage-0@^6.5.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-0/-/babel-preset-stage-0-6.16.0.tgz#f5a263c420532fd57491f1a7315b3036e428f823"
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz#5642d15042f91384d7e5af8bc88b1db95b039e6a"
+  integrity sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=
   dependencies:
-    babel-plugin-transform-do-expressions "^6.3.13"
-    babel-plugin-transform-function-bind "^6.3.13"
-    babel-preset-stage-1 "^6.16.0"
+    babel-plugin-transform-do-expressions "^6.22.0"
+    babel-plugin-transform-function-bind "^6.22.0"
+    babel-preset-stage-1 "^6.24.1"
 
-babel-preset-stage-1@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.16.0.tgz#9d31fbbdae7b17c549fd3ac93e3cf6902695e479"
+babel-preset-stage-1@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
+  integrity sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=
   dependencies:
-    babel-plugin-transform-class-constructor-call "^6.3.13"
-    babel-plugin-transform-export-extensions "^6.3.13"
-    babel-preset-stage-2 "^6.16.0"
+    babel-plugin-transform-class-constructor-call "^6.24.1"
+    babel-plugin-transform-export-extensions "^6.22.0"
+    babel-preset-stage-2 "^6.24.1"
 
-babel-preset-stage-2@^6.16.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.18.0.tgz#9eb7bf9a8e91c68260d5ba7500493caaada4b5b5"
+babel-preset-stage-2@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  integrity sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
-    babel-plugin-transform-class-properties "^6.18.0"
-    babel-plugin-transform-decorators "^6.13.0"
-    babel-preset-stage-3 "^6.17.0"
-
-babel-preset-stage-3@^6.17.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.17.0.tgz#b6638e46db6e91e3f889013d8ce143917c685e39"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.3.13"
-    babel-plugin-transform-async-generator-functions "^6.17.0"
-    babel-plugin-transform-async-to-generator "^6.16.0"
-    babel-plugin-transform-exponentiation-operator "^6.3.13"
-    babel-plugin-transform-object-rest-spread "^6.16.0"
-
-babel-register@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.18.0.tgz#892e2e03865078dd90ad2c715111ec4449b32a68"
-  dependencies:
-    babel-core "^6.18.0"
-    babel-runtime "^6.11.6"
-    core-js "^2.4.0"
+    babel-plugin-transform-class-properties "^6.24.1"
+    babel-plugin-transform-decorators "^6.24.1"
+    babel-preset-stage-3 "^6.24.1"
+
+babel-preset-stage-3@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  integrity sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.24.1"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
+    babel-plugin-transform-object-rest-spread "^6.22.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
     home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
+    lodash "^4.17.4"
     mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
+    source-map-support "^0.4.15"
 
-babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.20.0.tgz#87300bdcf4cd770f09bf0048c64204e17806d16f"
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.16.0, babel-template@^6.8.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.16.0.tgz#e149dd1a9f03a35f817ddbc4d0481988e7ebc8ca"
-  dependencies:
-    babel-runtime "^6.9.0"
-    babel-traverse "^6.16.0"
-    babel-types "^6.16.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.20.0.tgz#5378d1a743e3d856e6a52289994100bbdfd9872a"
-  dependencies:
-    babel-code-frame "^6.20.0"
-    babel-messages "^6.8.0"
-    babel-runtime "^6.20.0"
-    babel-types "^6.20.0"
-    babylon "^6.11.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-types@^6.13.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.20.0, babel-types@^6.8.0, babel-types@^6.9.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.20.0.tgz#3869ecb98459533b37df809886b3f7f3b08d2baa"
-  dependencies:
-    babel-runtime "^6.20.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
     esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
 
-babylon@^6.11.0:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815"
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -820,33 +941,68 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-batch@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
 
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-bluebird@^3.4.6:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+bluebird@^3.4.7:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
 
-boolbase@~1.0.0:
+boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -854,6 +1010,7 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -862,6 +1019,7 @@ braces@^1.8.2:
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -877,48 +1035,53 @@ braces@^2.3.1:
 browserify-aes@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c"
+  integrity sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=
   dependencies:
     inherits "^2.0.1"
 
 browserify-zlib@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  integrity sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=
   dependencies:
     pako "~0.2.0"
 
-browserslist@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.4.0.tgz#9cfdcf5384d9158f5b70da2aa00b30e8ff019049"
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
   dependencies:
-    caniuse-db "^1.0.30000539"
-
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
 
 buffer@^4.9.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-bytes@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -933,39 +1096,43 @@ cache-base@^1.0.1:
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
   dependencies:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000597:
-  version "1.0.30000597"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588"
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30001265"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001265.tgz#bba7c428ca3bfc147483b488c7a5d418800e375c"
+  integrity sha512-SPKtg7mRIGYgGXj7FG+Bovjz/BzKucgMjI8fjI4XGCfglcns0QVo2hrfzwAgdvkDtiXNcLeJ8klUGeP4jvv6CQ==
 
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -973,9 +1140,19 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chokidar@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -988,92 +1165,126 @@ chokidar@^1.0.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-
 clap@^1.0.9:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.2.tgz#316545bf22229225a2cecaa6824cd2f56a9709ed"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
   dependencies:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@3.4.x:
-  version "3.4.22"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892"
+clean-css@4.2.x:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
   dependencies:
-    commander "2.8.x"
-    source-map "0.4.x"
+    source-map "~0.6.0"
 
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+clone-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
+
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
+
+clone-stats@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
 clone@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
 
-clone@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-
-clone@^1.0.2:
+clone@^1.0.0, clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+clone@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+cloneable-readable@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
+  dependencies:
+    inherits "^2.0.1"
+    process-nextick-args "^2.0.0"
+    readable-stream "^2.3.5"
 
 coa@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
   dependencies:
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.8.2.tgz#be868184d7c8631766d54e7078e2672d7c7e3339"
+color-convert@^1.3.0, color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    color-name "^1.1.1"
+    color-name "1.1.3"
 
-color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
   dependencies:
     color-name "^1.0.0"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -1082,6 +1293,7 @@ color@^0.11.0:
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
   dependencies:
     color "^0.11.0"
     css-color-names "0.0.4"
@@ -1090,111 +1302,128 @@ colormin@^1.0.5:
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
+commander@2.17.x:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@2.9.x:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compressible@~2.0.8:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.9.tgz#6daab4e2b599c2770dd9e21e7a891b1c5a755425"
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
-    mime-db ">= 1.24.0 < 2"
+    mime-db ">= 1.43.0 < 2"
 
 compression@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
-  dependencies:
-    accepts "~1.3.3"
-    bytes "2.3.0"
-    compressible "~2.0.8"
-    debug "~2.2.0"
-    on-headers "~1.0.1"
-    vary "~1.1.0"
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-with-sourcemaps@*, concat-with-sourcemaps@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
+concat-with-sourcemaps@^1.0.0, concat-with-sourcemaps@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
-    source-map "^0.5.1"
+    source-map "^0.6.1"
 
 connect-history-api-fallback@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.1.tgz#87476c6a67c8daa87e32e87616df883ba7fb071b"
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
 
-content-type@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
+convert-source-map@^1.5.1:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+  dependencies:
+    safe-buffer "~5.1.1"
 
 convert-source-map@~1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
+  integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 crypto-browserify@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"
+  integrity sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=
   dependencies:
     browserify-aes "0.4.0"
     pbkdf2-compat "2.0.1"
@@ -1204,10 +1433,12 @@ crypto-browserify@3.3.0:
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
 css-loader@^0.23.1:
   version "0.23.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.23.1.tgz#9fa23f2b5c0965235910ad5ecef3b8a36390fe50"
+  integrity sha1-n6I/K1wJZSNZEK1ezvO4o2OQ/lA=
   dependencies:
     css-selector-tokenizer "^0.5.1"
     cssnano ">=2.6.1 <4"
@@ -1221,41 +1452,52 @@ css-loader@^0.23.1:
     postcss-modules-values "^1.1.0"
     source-list-map "^0.1.4"
 
-css-select@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+css-select@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
   dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
+    boolbase "^1.0.0"
+    css-what "^5.0.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
+    nth-check "^2.0.0"
 
 css-selector-tokenizer@^0.5.1:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz#139bafd34a35fd0c1428487049e0699e6f6a2c21"
+  integrity sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
 
-css-selector-tokenizer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
+css-selector-tokenizer@^0.7.0:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
+  integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==
   dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
+    cssesc "^3.0.0"
+    fastparse "^1.1.2"
 
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+css-what@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
+  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 "cssnano@>=2.6.1 <4":
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.9.1.tgz#41422bb5390d85a94ad4db03cc1a188bf68744fe"
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
   dependencies:
     autoprefixer "^6.3.1"
     decamelize "^1.1.2"
@@ -1290,97 +1532,78 @@ cssesc@^0.1.0:
     postcss-value-parser "^3.2.3"
     postcss-zindex "^2.0.1"
 
-csso@~2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.2.1.tgz#51fbb5347e50e81e6ed51668a48490ae6fe2afe2"
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
-
-d2-tracker@35.0.2:
-  version "35.0.2"
-  resolved "https://registry.yarnpkg.com/d2-tracker/-/d2-tracker-35.0.2.tgz#af1819ad923a9a6abb15c47e015c3ed06dc19859"
-  integrity sha512-jniFXB8ieqCbOZv24TfMOJWHQCd5u5eEUYhhb7+JRW9Juuidb0VBSHdkisrFPUPaHpszbbYrEpHyWTcjUGgnOg==
+d2-tracker@35.0.7:
+  version "35.0.7"
+  resolved "https://registry.yarnpkg.com/d2-tracker/-/d2-tracker-35.0.7.tgz#2d0a3e6a183ddee09b8a310a1a662ee036efec48"
+  integrity sha512-D64EN5hL0kkk1R8AdS+V5iKo5qYzQ0VY1jTYJJejN18OFMFY9kyuG22sp9A6+RjKxGnD2e53D691Q/lj3ot99g==
   dependencies:
     angular-vs-repeat "^2.0.9"
     gulp "^3.9.1"
     gulp-angular-templatecache "^2.0.0"
     leaflet-draw "^1.0.2"
 
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-dateformat@^1.0.11:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.3.0"
-
-debug@^2.1.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
+dateformat@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
+  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
 
-debug@^2.2.0, debug@^2.3.3:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 decamelize@^1.0.0, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 defaults@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -1388,190 +1611,195 @@ define-property@^2.0.2:
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-depd@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
+  integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=
 
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detect-file@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  dependencies:
-    fs-exists-sync "^0.1.0"
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+dom-converter@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
   dependencies:
-    utila "~0.3"
+    utila "~0.4"
 
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+dom-serializer@^1.0.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+  integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
   dependencies:
-    domelementtype "1"
+    domelementtype "^2.2.0"
 
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+domutils@^2.5.2, domutils@^2.6.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
 
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
   dependencies:
     readable-stream "~1.1.9"
 
 duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.2.7:
+  version "1.3.866"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz#d446338f5ad6948b27a50739760e7b0b5cc5032f"
+  integrity sha512-iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA==
 
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8=
   dependencies:
     once "~1.3.0"
 
 enhanced-resolve@~0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
+  integrity sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.2.0"
     tapable "^0.1.8"
 
-entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 errno@^0.1.3:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  dependencies:
-    is-arrayish "^0.2.1"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-event-stream@*, event-stream@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.2.tgz#3cc310feb1f28d2f62b2a085d736a9ef566378b8"
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
-eventsource@~0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+eventsource@^1.0.7:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
+  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
   dependencies:
-    original ">=0.0.5"
+    original "^1.0.0"
 
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1584,72 +1812,84 @@ expand-brackets@^2.1.4:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.1, expand-tilde@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
   dependencies:
-    os-homedir "^1.0.1"
+    homedir-polyfill "^1.0.1"
 
 express@^4.13.3:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.14.0.tgz#c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
-    accepts "~1.3.3"
+    accepts "~1.3.7"
     array-flatten "1.1.1"
-    content-disposition "0.5.1"
-    content-type "~1.0.2"
-    cookie "0.3.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
-    debug "~2.2.0"
-    depd "~1.1.0"
-    encodeurl "~1.0.1"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    etag "~1.7.0"
-    finalhandler "0.5.0"
-    fresh "0.3.0"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
-    parseurl "~1.3.1"
+    parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~1.1.2"
-    qs "6.2.0"
-    range-parser "~1.2.0"
-    send "0.14.1"
-    serve-static "~1.11.1"
-    type-is "~1.6.13"
-    utils-merge "1.0.0"
-    vary "~1.1.0"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
 extend@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -1661,50 +1901,59 @@ extglob@^2.0.4:
     to-regex "^3.0.1"
 
 fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
-    chalk "^1.1.1"
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  dependencies:
-    websocket-driver ">=0.5.1"
+fastparse@^1.1.1, fastparse@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
-faye-websocket@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.0.tgz#d9ccf0e789e7db725d74bc4877d23aa42972ac50"
+faye-websocket@^0.11.3:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
 file-loader@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
+  integrity sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -1715,25 +1964,30 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7"
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
-    debug "~2.2.0"
+    debug "2.6.9"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    statuses "~1.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
 find-cache-dir@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  integrity sha1-yN765XyKUqinhPnjHFfHQumToLk=
   dependencies:
     commondir "^1.0.1"
     mkdirp "^0.5.1"
@@ -1742,130 +1996,122 @@ find-cache-dir@^0.1.1:
 find-index@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+  integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-findup-sync@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
 
 fined@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
-  dependencies:
-    expand-tilde "^1.2.1"
-    lodash.assignwith "^4.0.7"
-    lodash.isempty "^4.2.1"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.pick "^4.2.1"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
+  dependencies:
+    expand-tilde "^2.0.2"
+    is-plain-object "^2.0.3"
+    object.defaults "^1.1.0"
+    object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
 first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
 
-flagged-respawn@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+flagged-respawn@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
 flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
+
+follow-redirects@^1.0.0:
+  version "1.14.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+  integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
-forwarded@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
-
-from@~0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc"
+    for-in "^1.0.1"
 
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
-    minipass "^2.2.1"
+    map-cache "^0.2.2"
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 fsevents@^1.0.0:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
+    bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
-
-function-bind@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gaze@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
+  integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=
   dependencies:
     globule "~0.1.0"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -1873,12 +2119,14 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-stream@^3.1.5:
   version "3.1.18"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
+  integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=
   dependencies:
     glob "^4.3.1"
     glob2base "^0.0.12"
@@ -1890,140 +2138,148 @@ glob-stream@^3.1.5:
 glob-watcher@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
+  integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=
   dependencies:
     gaze "^0.5.1"
 
 glob2base@^0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=
   dependencies:
     find-index "^0.1.1"
 
 glob@^4.3.1:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+  integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
     minimatch "^2.0.1"
     once "^1.3.0"
 
-glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@~3.1.21:
   version "3.1.21"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
+  integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
     minimatch "~0.2.11"
 
-global-modules@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
-    global-prefix "^0.1.4"
-    is-windows "^0.2.0"
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
 
-global-prefix@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
   dependencies:
-    homedir-polyfill "^1.0.0"
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
     ini "^1.3.4"
-    is-windows "^0.2.0"
-    which "^1.2.12"
+    is-windows "^1.0.1"
+    which "^1.2.14"
 
-globals@^9.0.0:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
+  integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=
   dependencies:
     glob "~3.1.21"
     lodash "~1.0.1"
     minimatch "~0.2.11"
 
 glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
 
 graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef"
+  integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==
   dependencies:
-    natives "^1.1.0"
+    natives "^1.1.3"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 graceful-fs@~1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
 
 gulp-angular-templatecache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-angular-templatecache/-/gulp-angular-templatecache-2.0.0.tgz#29b4071ee5574481c069a162bce8967534f17155"
-  dependencies:
-    event-stream "3.3.2"
-    gulp-concat "2.6.0"
-    gulp-footer "1.0.5"
-    gulp-header "1.8.2"
-    gulp-util "3.0.7"
-    jsesc "2.2.0"
-
-gulp-concat@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.0.tgz#585cfb115411f348773131140566b6a81c69cb91"
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/gulp-angular-templatecache/-/gulp-angular-templatecache-2.2.7.tgz#d71ed65b5280e8623a313d23c4d3f138d62eaba9"
+  integrity sha512-Tc+amGWfc2W8BxfCSikhQHWlaZdJppPyhSFFafwln2ExNOFuHCNdwT7HCf54cpHcXdzzFuC7c/rI/075CejmaQ==
+  dependencies:
+    gulp-concat "2.6.1"
+    gulp-footer "2.0.2"
+    gulp-header "2.0.7"
+    jsesc "2.5.1"
+    lodash.template "^4.4.0"
+    map-stream "0.0.7"
+    stream-combiner "0.2.2"
+    through2 "^2.0.3"
+
+gulp-concat@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
+  integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
   dependencies:
     concat-with-sourcemaps "^1.0.0"
-    gulp-util "^3.0.1"
-    through2 "^0.6.3"
+    through2 "^2.0.0"
+    vinyl "^2.0.0"
 
-gulp-footer@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/gulp-footer/-/gulp-footer-1.0.5.tgz#e84ca777e266be7bbc2d45d2df0e7eba8dfa3e54"
+gulp-footer@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/gulp-footer/-/gulp-footer-2.0.2.tgz#2cf58e1cc046b8a3a479f1a41bcd1b7baae076cd"
+  integrity sha512-HsG5VOgKHFRqZXnHGI6oGhPDg70p9pobM+dYOnjBZVLMQUHzLG6bfaPNRJ7XG707E+vWO3TfN0CND9UrYhk94g==
   dependencies:
-    event-stream "*"
-    gulp-util "*"
-    lodash.assign "*"
+    lodash._reescape "^3.0.0"
+    lodash._reevaluate "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.template "^3.6.2"
+    map-stream "0.0.7"
 
-gulp-header@1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.2.tgz#3ab222f53719d2d03d81d9134252fe7d52425aa4"
+gulp-header@2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-2.0.7.tgz#07505740eb432e8d2bb2af68744858dabaaf491b"
+  integrity sha512-qppGkYGQZnt/mRJiiR5wYZIUwNUn47Xpg4+6tHYDVeAW5IDLbHBQwbw7axfMLWGE+gKQpB+yXLeslHMw1/Haog==
   dependencies:
-    concat-with-sourcemaps "*"
-    gulp-util "*"
-    object-assign "*"
+    concat-with-sourcemaps "^1.1.0"
+    lodash.template "^4.4.0"
+    map-stream "0.0.7"
     through2 "^2.0.0"
 
-gulp-util@*, gulp-util@3.0.7, gulp-util@^3.0.0, gulp-util@^3.0.1:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.7.tgz#78925c4b8f8b49005ac01a011c557e6218941cbb"
+gulp-util@^3.0.0:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
     beeper "^1.0.0"
     chalk "^1.0.0"
-    dateformat "^1.0.11"
+    dateformat "^2.0.0"
     fancy-log "^1.1.0"
     gulplog "^1.0.0"
     has-gulplog "^0.1.0"
@@ -2041,6 +2297,7 @@ gulp-util@*, gulp-util@3.0.7, gulp-util@^3.0.0, gulp-util@^3.0.1:
 gulp@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
+  integrity sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=
   dependencies:
     archy "^1.0.0"
     chalk "^1.0.0"
@@ -2059,32 +2316,38 @@ gulp@^3.9.1:
 gulplog@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
   dependencies:
     glogg "^1.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
   dependencies:
     sparkles "^1.0.0"
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -2093,6 +2356,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -2101,89 +2365,124 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
-    function-bind "^1.0.2"
+    function-bind "^1.1.1"
 
-he@1.1.x:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7"
+he@1.2.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-homedir-polyfill@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5"
-
 html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-html-minifier@^3.1.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.2.3.tgz#d2ff536e24d95726c332493d8f77d84dbed85372"
+html-minifier@^3.2.3:
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
   dependencies:
     camel-case "3.0.x"
-    clean-css "3.4.x"
-    commander "2.9.x"
-    he "1.1.x"
-    ncname "1.0.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
+    he "1.2.x"
     param-case "2.1.x"
     relateurl "0.2.x"
-    uglify-js "2.7.x"
+    uglify-js "3.4.x"
 
 html-webpack-plugin@^2.24.1:
-  version "2.24.1"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.24.1.tgz#7f45fc678f66eac2d433f22336b4399da023b57e"
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
+  integrity sha1-f5xCG36pHsRg9WUn1430hO51N9U=
   dependencies:
-    bluebird "^3.4.6"
-    html-minifier "^3.1.0"
+    bluebird "^3.4.7"
+    html-minifier "^3.2.3"
     loader-utils "^0.2.16"
-    lodash "^4.16.4"
+    lodash "^4.17.3"
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
   dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
 
-http-errors@~1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
+    depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.0.2"
-    statuses ">= 1.3.1 < 2"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
 http-proxy-middleware@~0.17.1:
-  version "0.17.3"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
+  integrity sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^3.1.0"
@@ -2191,53 +2490,50 @@ http-proxy-middleware@~0.17.1:
     micromatch "^2.3.11"
 
 http-proxy@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
 https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+  integrity sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=
 
-iconv-lite@^0.4.4:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-icss-replace-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
 ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  dependencies:
-    minimatch "^3.0.4"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -2245,99 +2541,114 @@ inflight@^1.0.4:
 inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 interpret@^0.6.4:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
+  integrity sha1-/s16GOfOXKar+5U+H4YhOknxYls=
 
 interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-invariant@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-ipaddr.js@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.1.1.tgz#c791d95f52b29c1247d5df80ada39b8a73647230"
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute@^0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
-    is-relative "^0.2.1"
-    is-windows "^0.2.0"
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+is-core-module@^2.2.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
-    builtin-modules "^1.0.0"
+    has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -2346,6 +2657,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -2354,260 +2666,284 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
-is-relative@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
-    is-unc-path "^0.1.1"
+    is-unc-path "^1.0.0"
 
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
   dependencies:
     html-comment-regex "^1.1.0"
 
-is-unc-path@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
-    unc-path-regex "^0.1.0"
+    unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-windows@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
-
-is-windows@^1.0.2:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isexe@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
-js-tokens@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@~3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-jsesc@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.2.0.tgz#c35a8613a3806c8ec3bafc0b0e196f020f7aab01"
+jsesc@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+json3@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.0:
+json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
 leaflet-contextmenu@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/leaflet-contextmenu/-/leaflet-contextmenu-1.1.1.tgz#a99809b52f8bb7d4f5a5c69446aa1751657a6b46"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/leaflet-contextmenu/-/leaflet-contextmenu-1.4.0.tgz#e2bda481af1026080eabaa32997e531fd44f605c"
+  integrity sha1-4r2kga8QJggOq6oymX5TH9RPYFw=
 
-leaflet-control-geocoder@^1.5.8:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/leaflet-control-geocoder/-/leaflet-control-geocoder-1.5.8.tgz#c52dfbb9be5f6388d683346acb49bf017fd5b6a8"
+leaflet-control-geocoder@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/leaflet-control-geocoder/-/leaflet-control-geocoder-2.3.0.tgz#4212d6d67f73eeda3b900773cd2f229b2fe66aa8"
+  integrity sha512-Zi5cebDsfAq6B0ZilDGn/W5oNM8pQu6cltEHBxfR56XnN3f/Lmez1+qrdyRY6oTlP740caBHHCmd35Z/eif7/w==
+  optionalDependencies:
+    open-location-code "^1.0.0"
 
 leaflet-draw@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-1.0.2.tgz#212d1d958a53b849bec19a2135d39c13ed012559"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-1.0.4.tgz#45be92f378ed253e7202fdeda1fcc71885198d46"
+  integrity sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ==
 
-leaflet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
+leaflet@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
+  integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
 
 liftoff@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
+  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
   dependencies:
     extend "^3.0.0"
-    findup-sync "^0.4.2"
+    findup-sync "^2.0.0"
     fined "^1.0.1"
-    flagged-respawn "^0.3.2"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.mapvalues "^4.4.0"
+    flagged-respawn "^1.0.0"
+    is-plain-object "^2.0.4"
+    object.map "^1.0.0"
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-loader-utils@^0.2.11:
+loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.6, loader-utils@~0.2.2:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^0.2.16, loader-utils@^0.2.6, loader-utils@^0.2.7, loader-utils@~0.2.2:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -2615,28 +2951,33 @@ loader-utils@^0.2.16, loader-utils@^0.2.6, loader-utils@^0.2.7, loader-utils@~0.
     object-assign "^4.0.1"
 
 loader-utils@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
   dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
 
 lodash._createcompounder@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz#5dd2cb55372d6e70e0e2392fb2304d6631091075"
+  integrity sha1-XdLLVTctbnDg4jkvsjBNZjEJEHU=
   dependencies:
     lodash.deburr "^3.0.0"
     lodash.words "^3.0.0"
@@ -2644,100 +2985,87 @@ lodash._createcompounder@^3.0.0:
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-
-lodash.assign@*:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.assignwith@^4.0.7:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
+  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
 
 lodash.camelcase@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz#932c8b87f8a4377897c67197533282f97aeac298"
+  integrity sha1-kyyLh/ikN3iXxnGXUzKC+Xrqwpg=
   dependencies:
     lodash._createcompounder "^3.0.0"
 
 lodash.deburr@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.deburr/-/lodash.deburr-3.2.0.tgz#6da8f54334a366a7cf4c4c76ef8d80aa1b365ed5"
+  integrity sha1-baj1QzSjZqfPTEx2742Aqhs2XtU=
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
   dependencies:
     lodash._root "^3.0.0"
 
-lodash.indexof@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/lodash.indexof/-/lodash.indexof-4.0.5.tgz#53714adc2cddd6ed87638f893aa9b6c24e31ef3c"
-
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.isempty@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-
-lodash.isplainobject@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.mapvalues@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
 
-lodash.template@^3.0.0:
+lodash.template@^3.0.0, lodash.template@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -2749,95 +3077,121 @@ lodash.template@^3.0.0:
     lodash.restparam "^3.0.0"
     lodash.templatesettings "^3.0.0"
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash.words@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.words/-/lodash.words-3.2.0.tgz#4e2a8649bc08745b17c695b1a3ce8fee596623b3"
+  integrity sha1-TiqGSbwIdFsXxpWxo86P7llmI7M=
   dependencies:
     lodash._root "^3.0.0"
 
-lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
+lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
+  integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=
 
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
 loose-envify@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.0.tgz#6b26248c42f6d4fa4b0d8542f78edfcde35642a8"
-  dependencies:
-    js-tokens "^2.0.0"
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
+    js-tokens "^3.0.0 || ^4.0.0"
 
 lower-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
 
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+make-iterator@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
+  dependencies:
+    kind-of "^6.0.2"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+map-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
+  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 math-expression-evaluator@^1.2.14:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.14.tgz#39511771ed9602405fba9affff17eb4d2a3843ab"
-  dependencies:
-    lodash.indexof "^4.0.5"
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.3.8.tgz#320da3b2bc1512f4f50fc3020b2b1cd5c8e9d577"
+  integrity sha512-9FbRY3i6U+CbHgrdNbAUaisjWTozkm1ZfupYQJiZ87NtYHk2Zh9DvxMgp/fifxVhqTLpd5fCCLossUbpZxGeKw==
 
 math-random@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 memory-fs@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
+  integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA=
 
 memory-fs@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
+  integrity sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -2845,36 +3199,25 @@ memory-fs@~0.3.0:
 memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -2890,9 +3233,10 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.10:
+micromatch@^3.0.4, micromatch@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -2908,110 +3252,101 @@ micromatch@^3.1.10:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-"mime-db@>= 1.24.0 < 2", mime-db@~1.25.0:
-  version "1.25.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.25.0.tgz#c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392"
+mime-db@1.50.0, "mime-db@>= 1.43.0 < 2":
+  version "1.50.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+  integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
 
-mime-types@~2.1.11, mime-types@~2.1.13:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.13.tgz#e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88"
+mime-types@~2.1.17, mime-types@~2.1.24:
+  version "2.1.33"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
+  integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==
   dependencies:
-    mime-db "~1.25.0"
-
-mime@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+    mime-db "1.50.0"
 
-mime@^1.5.0:
+mime@1.6.0, mime@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 minimatch@^2.0.1:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@~0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minipass@^2.2.1, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  dependencies:
-    minipass "^2.2.1"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+    minimist "^1.2.5"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.1.1:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
   dependencies:
     duplexer2 "0.0.2"
 
 nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3025,31 +3360,20 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natives@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
-
-ncname@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
-  dependencies:
-    xml-char-classes "^1.0.0"
-
-needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
+natives@^1.1.3, natives@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
+  integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==
 
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 ng-annotate-loader@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ng-annotate-loader/-/ng-annotate-loader-0.2.0.tgz#d462dc063dd69d2cdd71aa04a46c6ed0a006e523"
+  integrity sha1-1GLcBj3WnSzdcaoEpGxu0KAG5SM=
   dependencies:
     loader-utils "^0.2.6"
     ng-annotate "1.2.1"
@@ -3059,6 +3383,7 @@ ng-annotate-loader@^0.2.0:
 ng-annotate@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ng-annotate/-/ng-annotate-1.2.1.tgz#eb8bc1a6731c70d08af6b02c3eaf1a6e3fb9e6bb"
+  integrity sha1-64vBpnMccNCK9rAsPq8abj+55rs=
   dependencies:
     acorn "~2.6.4"
     alter "~0.2.0"
@@ -3074,14 +3399,16 @@ ng-annotate@1.2.1:
     tryor "~0.1.2"
 
 no-case@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.0.tgz#ca2825ccb76b18e6f79d573dcfbf1eace33dd164"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
   dependencies:
     lower-case "^1.1.1"
 
 node-libs-browser@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.7.0.tgz#3e272c0819e308935e26674408d7af0e1491b83b"
+  integrity sha1-PicsCBnjCJNeJmdECNevDhSRuDs=
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.1.4"
@@ -3107,105 +3434,54 @@ node-libs-browser@^0.7.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.0.0, normalize-path@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@^1.4.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.8.0.tgz#a9550b079aa3523c85d78df24eef1959fce359ab"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-
-npm-packlist@^1.1.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+nth-check@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
   dependencies:
-    boolbase "~1.0.0"
+    boolbase "^1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-object-assign@*:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -3214,51 +3490,83 @@ object-copy@^0.1.0:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
+object.defaults@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
+  dependencies:
+    array-each "^1.0.1"
+    array-slice "^1.0.0"
+    for-own "^1.0.0"
+    isobject "^3.0.0"
+
+object.map@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
+  dependencies:
+    for-own "^1.0.0"
+    make-iterator "^1.0.0"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.3.0:
+object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 once@~1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=
   dependencies:
     wrappy "1"
 
+open-location-code@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/open-location-code/-/open-location-code-1.0.3.tgz#5ea1a34ee5221c6cafa04392e1bd906fd7488f7e"
+  integrity sha1-XqGjTuUiHGyvoEOS4b2Qb9dIj34=
+
 open@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
+  integrity sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=
 
 optimist@~0.6.0, optimist@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -3266,6 +3574,7 @@ optimist@~0.6.0, optimist@~0.6.1:
 orchestrator@^0.3.0:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
+  integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=
   dependencies:
     end-of-stream "~0.1.5"
     sequencify "~0.0.7"
@@ -3274,180 +3583,183 @@ orchestrator@^0.3.0:
 ordered-ast-traverse@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz#6843a170bc0eee8b520cc8ddc1ddd3aa30fa057c"
+  integrity sha1-aEOhcLwO7otSDMjdwd3TqjD6BXw=
   dependencies:
     ordered-esprima-props "~1.1.0"
 
 ordered-esprima-props@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz#a9827086df5f010aa60e9bd02b6e0335cea2ffcb"
+  integrity sha1-qYJwht9fAQqmDpvQK24DNc6i/8s=
 
 ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
+  integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=
 
-original@>=0.0.5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
-    url-parse "1.0.x"
+    url-parse "^1.4.3"
 
 os-browserify@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+  integrity sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
+os-tmpdir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 param-case@2.1.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.0.tgz#2619f90fd6c829ed0b958f1c84ed03a745a6d70a"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
   dependencies:
     no-case "^2.2.0"
 
 parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
   dependencies:
-    is-absolute "^0.2.3"
+    is-absolute "^1.0.0"
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
     is-extglob "^1.0.0"
     is-glob "^2.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
+parse-node-version@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parseurl@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
-path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+path-parse@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
 
 path-root@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  dependencies:
-    through "~2.3"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 pbkdf2-compat@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-tuDI+plJTZTgURV1gCpZpcFC8og=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
   dependencies:
     find-up "^1.0.0"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-calc@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
   dependencies:
     postcss "^5.0.2"
     postcss-message-helpers "^2.0.0"
     reduce-css-calc "^1.2.6"
 
 postcss-colormin@^2.1.8:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.1.tgz#dc5421b6ae6f779ef6bfd47352b94abe59d0316b"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
   dependencies:
     colormin "^1.0.5"
     postcss "^5.0.13"
     postcss-value-parser "^3.2.3"
 
 postcss-convert-values@^2.3.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.5.0.tgz#570aceb04b3061fb25f6f46bd0329e7ab6263c0b"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
   dependencies:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
@@ -3455,69 +3767,82 @@ postcss-convert-values@^2.3.4:
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-duplicates@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.2.tgz#02be520e91571ffb10738766a981d5770989bb32"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
   dependencies:
     postcss "^5.0.4"
 
 postcss-discard-empty@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-overridden@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
   dependencies:
     postcss "^5.0.16"
 
 postcss-discard-unused@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
   dependencies:
     postcss "^5.0.14"
     uniqs "^2.0.0"
 
 postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
+  integrity sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==
   dependencies:
     postcss "^5.0.4"
-    uniqid "^4.0.0"
 
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.10"
     postcss-value-parser "^3.1.1"
 
 postcss-merge-longhand@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.1.tgz#ff59b5dec6d586ce2cea183138f55c5876fa9cdc"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
   dependencies:
     postcss "^5.0.4"
 
 postcss-merge-rules@^2.0.3:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.0.11.tgz#c5d7c8de5056a7377aea0dff2fd83f92cafb9b8a"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
   dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
     postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
     vendors "^1.0.0"
 
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
 
 postcss-minify-font-values@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
   dependencies:
     object-assign "^4.0.1"
     postcss "^5.0.4"
@@ -3526,13 +3851,15 @@ postcss-minify-font-values@^1.0.2:
 postcss-minify-gradients@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
   dependencies:
     postcss "^5.0.12"
     postcss-value-parser "^3.3.0"
 
 postcss-minify-params@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.0.5.tgz#82d602643b8616a61fb3634d7ede0289836d67f9"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.2"
@@ -3540,8 +3867,9 @@ postcss-minify-params@^1.0.4:
     uniqs "^2.0.0"
 
 postcss-minify-selectors@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.0.7.tgz#bfb9248fe14db33770f036572de6b4897c48d81c"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
   dependencies:
     alphanum-sort "^1.0.2"
     has "^1.0.1"
@@ -3549,41 +3877,47 @@ postcss-minify-selectors@^2.0.4:
     postcss-selector-parser "^2.0.0"
 
 postcss-modules-extract-imports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
+  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
   dependencies:
-    postcss "^5.0.4"
+    postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
 postcss-modules-scope@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
 postcss-modules-values@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
   dependencies:
-    icss-replace-symbols "^1.0.2"
-    postcss "^5.0.14"
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
 
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
   dependencies:
     postcss "^5.0.5"
 
 postcss-normalize-url@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.7.tgz#6bd90d0a4bc5a1df22c26ea65c53257dc3829f4e"
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
   dependencies:
     is-absolute-url "^2.0.0"
     normalize-url "^1.4.0"
@@ -3591,44 +3925,50 @@ postcss-normalize-url@^3.0.7:
     postcss-value-parser "^3.2.3"
 
 postcss-ordered-values@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.2.tgz#be8b511741fab2dac8e614a2302e9d10267b0771"
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.1"
 
 postcss-reduce-idents@^2.2.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.3.1.tgz#024e8e219f52773313408573db9645ba62d2d2fe"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.2"
 
 postcss-reduce-initial@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.0.tgz#8f739b938289ef2e48936d7101783e4741ca9bbb"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
   dependencies:
     postcss "^5.0.4"
 
 postcss-reduce-transforms@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
-postcss-selector-parser@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.2.tgz#3d70f5adda130da51c7c0c2fc023f56b1374fe08"
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
 postcss-svgo@^2.1.1:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.5.tgz#46fc0363f01bab6a36a9abb01c229fcc45363094"
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
   dependencies:
     is-svg "^2.0.0"
     postcss "^5.0.14"
@@ -3638,97 +3978,125 @@ postcss-svgo@^2.1.1:
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss-zindex@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.6:
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.6.tgz#a252cd67cd52585035f17e9ad12b35137a7bdd9e"
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
     source-map "^0.5.6"
-    supports-color "^3.1.2"
+    supports-color "^3.2.3"
+
+postcss@^6.0.1:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
 
 prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 pretty-error@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.0.2.tgz#a7db19cbb529ca9f0af3d3a2f77d5caf8e5dec23"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
+  integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
   dependencies:
-    renderkid "~2.0.0"
-    utila "~0.4"
+    lodash "^4.17.20"
+    renderkid "^2.0.4"
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-private@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+private@^0.1.6, private@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-proxy-addr@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.2.tgz#b4cc5f22610d9535824c123aef9d3cf73c40ba37"
+proxy-addr@~2.0.5:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
-    forwarded "~0.1.0"
-    ipaddr.js "1.1.1"
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@^1.1.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 query-string@^4.1.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822"
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
@@ -3736,63 +4104,56 @@ query-string@^4.1.0:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@0.0.x:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
     math-random "^1.0.1"
 
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
+range-parser@^1.0.3, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
   dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
+"readable-stream@>=1.0.33-1 <1.1.0-0":
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -3802,21 +4163,10 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.1.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -3826,6 +4176,7 @@ readable-stream@~1.1.9:
 readdirp@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
     micromatch "^3.1.10"
@@ -3834,41 +4185,40 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
   dependencies:
     balanced-match "^0.4.2"
     math-expression-evaluator "^1.2.14"
     reduce-function-call "^1.0.1"
 
 reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.3.tgz#60350f7fb252c0a67eb10fd4694d16909971300f"
+  integrity sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==
   dependencies:
-    balanced-match "^0.4.2"
+    balanced-match "^1.0.0"
 
 regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-transform@0.9.8:
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
   dependencies:
     babel-runtime "^6.18.0"
     babel-types "^6.19.0"
@@ -3877,27 +4227,22 @@ regenerator-transform@0.9.8:
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -3906,190 +4251,197 @@ regexpu-core@^2.0.0:
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
 relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
-renderkid@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.0.tgz#1859753e7a5adbf35443aba0d4e4579e78abee85"
+renderkid@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
+  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
   dependencies:
-    css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
-    strip-ansi "^3.0.0"
-    utila "~0.3"
+    css-select "^4.1.3"
+    dom-converter "^0.2.0"
+    htmlparser2 "^6.1.0"
+    lodash "^4.17.21"
+    strip-ansi "^3.0.1"
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 replace-ext@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
+
+replace-ext@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
-requires-port@1.0.x, requires-port@1.x.x:
+requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resolve-dir@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
   dependencies:
-    expand-tilde "^1.2.2"
-    global-modules "^0.2.3"
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.1.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
-    path-parse "^1.0.5"
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
 
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.6.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  dependencies:
-    glob "^7.1.3"
-
 ripemd160@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce"
+  integrity sha1-K/GYveFnys+lHAqSjoS2i74XH84=
 
-safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sax@^1.2.4:
+sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
-sax@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-"semver@2 || 3 || 4 || 5":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 semver@^4.1.0:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
-semver@^5.3.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-
-send@0.14.1:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.14.1.tgz#a954984325392f51532a7760760e459598c89f7a"
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
-    debug "~2.2.0"
-    depd "~1.1.0"
+    debug "2.6.9"
+    depd "~1.1.2"
     destroy "~1.0.4"
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    etag "~1.7.0"
-    fresh "0.3.0"
-    http-errors "~1.5.0"
-    mime "1.3.4"
-    ms "0.7.1"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
     on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
 
 sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
+  integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=
 
 serve-index@^1.7.2:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
-    accepts "~1.3.3"
-    batch "0.5.3"
-    debug "~2.2.0"
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
     escape-html "~1.0.3"
-    http-errors "~1.5.0"
-    mime-types "~2.1.11"
-    parseurl "~1.3.1"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
 
-serve-static@~1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.1.tgz#d6cce7693505f733c759de57befc1af76c0f0805"
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    parseurl "~1.3.1"
-    send "0.14.1"
-
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -4099,38 +4451,47 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
 sha.js@2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
+  integrity sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=
 
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 simple-fmt@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
+  integrity sha1-GRv1ZqWeZTBILLJatTtKjchcOms=
 
 simple-is@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0"
+  integrity sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -4139,12 +4500,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -4156,123 +4519,117 @@ snapdragon@^0.8.1:
     use "^3.1.0"
 
 sockjs-client@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0"
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
+  integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
   dependencies:
-    debug "^2.2.0"
-    eventsource "~0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.1"
+    debug "^3.2.6"
+    eventsource "^1.0.7"
+    faye-websocket "^0.11.3"
+    inherits "^2.0.4"
+    json3 "^3.3.3"
+    url-parse "^1.5.3"
 
 sockjs@^0.3.15:
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
+  version "0.3.21"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
+  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
   dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^2.0.2"
+    faye-websocket "^0.11.3"
+    uuid "^3.4.0"
+    websocket-driver "^0.7.4"
 
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.4:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.7.tgz#d4b5ce2a46535c72c7e8527c71a77d250618172e"
-
-source-list-map@~0.1.7:
+source-list-map@^0.1.4, source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.2:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.6.tgz#32552aa64b458392a85eab3b0b5ee61527167aeb"
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"
 
 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-
-source-map@0.4.x, source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.6, source-map@~0.5.1:
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+    amdefine ">=0.0.4"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+sparkles@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 stable@~0.1.3, stable@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.5.tgz#08232f60c732e9890784b5bed0734f8b32a887b9"
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -4280,20 +4637,25 @@ stream-browserify@^2.0.1:
 stream-cache@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/stream-cache/-/stream-cache-0.0.2.tgz#1ac5ad6832428ca55667dbdee395dad4e6db118f"
+  integrity sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=
 
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+stream-combiner@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
   dependencies:
     duplexer "~0.1.1"
+    through "~2.3.4"
 
 stream-consume@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
+  integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==
 
 stream-http@^2.3.1:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -4304,105 +4666,80 @@ stream-http@^2.3.1:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
+  integrity sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=
 
 stringset@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5"
+  integrity sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-bom@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
+  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
   dependencies:
     first-chunk-stream "^1.0.0"
     is-utf8 "^0.2.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
 style-loader@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
+  integrity sha1-dFMzhM9pjHEEx5URULSXF63C87s=
   dependencies:
-    loader-utils "^0.2.7"
+    loader-utils "^1.0.2"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^3.1.0:
+supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^3.1.1, supports-color@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
-    has-flag "^1.0.0"
+    has-flag "^3.0.0"
 
 svgo@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034"
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
-    csso "~2.2.1"
-    js-yaml "~3.6.1"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
     mkdirp "~0.5.1"
     sax "~1.2.1"
     whet.extend "~0.9.9"
@@ -4410,74 +4747,74 @@ svgo@^0.7.0:
 tapable@^0.1.8, tapable@~0.1.8:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
+  integrity sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=
 
-tar@^4:
-  version "4.4.9"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.9.tgz#058fbb152f6fc45733e84585a40c39e59302e1b3"
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.5"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-through2@^0.6.1, through2@^0.6.3:
+through2@^0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+through2@^2.0.0, through2@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@2, through@~2.3, through@~2.3.1:
+through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tildify@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 time-stamp@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.2.0.tgz#917e0a66905688790ec7bbbde04046259af83f57"
+  integrity sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA==
 
 timers-browserify@^2.0.2:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -4485,38 +4822,58 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toposort@^1.0.0:
+toidentifier@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 tryor@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
+  integrity sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
-type-is@~1.6.13:
-  version "1.6.14"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2"
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.13"
+    mime-types "~2.1.24"
+
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
 
-uglify-js@2.7.x, uglify-js@~2.7.3:
+uglify-js@~2.7.3:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
+  integrity sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=
   dependencies:
     async "~0.2.6"
     source-map "~0.5.1"
@@ -4526,45 +4883,47 @@ uglify-js@2.7.x, uglify-js@~2.7.3:
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
-unc-path-regex@^0.1.0:
+unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqid@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.0.tgz#33d9679f65022f48988a03fd24e7dcaf8f109eca"
-  dependencies:
-    macaddress "^0.2.8"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
+  integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=
 
-unpipe@~1.0.0:
+unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -4572,28 +4931,32 @@ unset-value@^1.0.0:
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@1.0.x:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
-  dependencies:
-    querystringify "0.0.x"
-    requires-port "1.0.x"
-
-url-parse@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
+url-parse@^1.4.3, url-parse@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
-    querystringify "0.0.x"
-    requires-port "1.0.x"
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -4601,67 +4964,68 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
 
-utils-merge@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 v8flags@^2.0.2:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.11.tgz#bca8f30f0d6d60612cc2c00641e6962d42ae6881"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
+  integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=
   dependencies:
     user-home "^1.1.1"
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-vary@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140"
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
 vinyl-fs@^0.3.0:
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
+  integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=
   dependencies:
     defaults "^1.0.0"
     glob-stream "^3.1.5"
@@ -4675,6 +5039,7 @@ vinyl-fs@^0.3.0:
 vinyl@^0.4.0:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
@@ -4682,20 +5047,35 @@ vinyl@^0.4.0:
 vinyl@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
+vinyl@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
+  dependencies:
+    clone "^2.1.1"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 watchpack@^0.2.1:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-0.2.9.tgz#62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"
+  integrity sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=
   dependencies:
     async "^0.9.0"
     chokidar "^1.0.0"
@@ -4704,6 +5084,7 @@ watchpack@^0.2.1:
 webpack-core@~0.6.9:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
@@ -4711,6 +5092,7 @@ webpack-core@~0.6.9:
 webpack-dev-middleware@^1.10.2:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  integrity sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==
   dependencies:
     memory-fs "~0.4.1"
     mime "^1.5.0"
@@ -4721,6 +5103,7 @@ webpack-dev-middleware@^1.10.2:
 webpack-dev-server@^1:
   version "1.16.5"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz#0cbd5f2d2ac8d4e593aacd5c9702e7bbd5e59892"
+  integrity sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=
   dependencies:
     compression "^1.5.2"
     connect-history-api-fallback "^1.3.0"
@@ -4739,6 +5122,7 @@ webpack-dev-server@^1:
 webpack@^1:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.15.0.tgz#4ff31f53db03339e55164a9d468ee0324968fe98"
+  integrity sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=
   dependencies:
     acorn "^3.0.0"
     async "^1.3.0"
@@ -4756,63 +5140,61 @@ webpack@^1:
     watchpack "^0.2.1"
     webpack-core "~0.6.9"
 
-websocket-driver@>=0.5.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
 
-which@^1.2.12:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
-  dependencies:
-    isexe "^1.1.1"
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+which@^1.2.14:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
-    string-width "^1.0.2 || 2"
+    isexe "^2.0.0"
 
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xml-char-classes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-yallist@^3.0.0, yallist@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"