From dac11a575869914b5372d16faf7e5c77acf52e59 Mon Sep 17 00:00:00 2001
From: omar <omarabosalem66@gmail.com>
Date: Wed, 20 Mar 2024 22:07:07 +0200
Subject: [PATCH] Translated all HTML files within the charges folder under the
 product module. Utilized TranslateService for the translation process.
 Additionally, added the missing translation.

This commit enhances the internationalization of the product module, ensuring a more comprehensive localization for users.
---
 .../products/charges/charges.component.html   | 24 +++---
 .../create-charge.component.html              | 78 +++++++++----------
 .../edit-charge/edit-charge.component.html    | 56 ++++++-------
 .../view-charge/view-charge.component.html    | 38 ++++-----
 .../view-charge/view-charge.component.ts      |  9 ++-
 src/assets/translations/cs-CS.json            |  7 ++
 src/assets/translations/de-DE.json            |  7 ++
 src/assets/translations/en-US.json            |  7 ++
 src/assets/translations/es-MX.json            |  7 ++
 src/assets/translations/fr-FR.json            |  7 ++
 src/assets/translations/it-IT.json            |  7 ++
 src/assets/translations/ko-KO.json            |  7 ++
 src/assets/translations/lt-LT.json            |  7 ++
 src/assets/translations/lv-LV.json            |  7 ++
 src/assets/translations/ne-NE.json            |  7 ++
 src/assets/translations/pt-PT.json            |  7 ++
 src/assets/translations/sw-SW.json            |  7 ++
 17 files changed, 188 insertions(+), 101 deletions(-)

diff --git a/src/app/products/charges/charges.component.html b/src/app/products/charges/charges.component.html
index cf4a20b37..f00e79b62 100644
--- a/src/app/products/charges/charges.component.html
+++ b/src/app/products/charges/charges.component.html
@@ -2,7 +2,7 @@
   <div #buttonCreateCharge class="in-block">
     <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_CHARGE'">
       <fa-icon icon="plus" class="m-r-10"></fa-icon>
-      Create Charge
+      {{"labels.text.Create Charge" | translate}}
     </button>
   </div>
 </div>
@@ -21,32 +21,32 @@
     <table mat-table [dataSource]="dataSource" matSort>
 
       <ng-container matColumnDef="name">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Name" | translate}} </th>
         <td mat-cell *matCellDef="let charge"> {{ charge.name }} </td>
       </ng-container>
 
       <ng-container matColumnDef="chargeAppliesTo">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Applies To </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Applies To" | translate}} </th>
         <td mat-cell *matCellDef="let charge"> {{ charge.chargeAppliesTo.value }} </td>
       </ng-container>
 
       <ng-container matColumnDef="chargeTimeType">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Time </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Time" | translate}} </th>
         <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value }} </td>
       </ng-container>
 
       <ng-container matColumnDef="chargeCalculationType">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Calculation </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Calculation" | translate}} </th>
         <td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value }} </td>
       </ng-container>
 
       <ng-container matColumnDef="amount">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Amount </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Amount" | translate}} </th>
         <td mat-cell *matCellDef="let charge" class="r-amount"> {{ charge.amount | formatNumber }} </td>
       </ng-container>
 
       <ng-container matColumnDef="penalty">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Is Penalty? </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.commons.Is" | translate}} {{"labels.inputs.Penalty" | translate}}? </th>
         <td mat-cell *matCellDef="let charge" class="center">
             <fa-icon *ngIf="charge.penalty" icon="check-circle" size="lg" class="ispenalty" matTooltip="Yes" matTooltipPosition="right"></fa-icon>
             <fa-icon *ngIf="!charge.penalty" icon="times-circle" size="lg" class="nopenalty" matTooltip="No" matTooltipPosition="right"></fa-icon>
@@ -54,7 +54,7 @@
       </ng-container>
 
       <ng-container matColumnDef="active">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> Is Active? </th>
+        <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.commons.Is" | translate}} {{"labels.status.Active" | translate}}? </th>
         <td mat-cell *matCellDef="let charge" class="center">
           <div [className]="charge.active === true ? 'true' : 'false'">
             <fa-icon matTooltip="{{ charge.active === true ? 'Active' : 'Inactive' }}" matTooltipPosition="right" icon="circle" size="lg"></fa-icon>
@@ -74,8 +74,8 @@
 </div>
 
 <ng-template #templateButtonCreateCharge let-popover="popover">
-  <h2>Create Charge</h2>
-  <p class="mw300">This option allows you to create new charges. It supports Loan charges, Savings & deposits charges and Client charges.</p>
+  <h2>{{"labels.text.Create Charge" | translate}}</h2>
+  <p class="mw300">{{"labels.text.Supports Loan charges, Savings & deposits" | translate}}</p>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
     <button mat-raised-button color="primary" (click)="popover.close();previousStep()">Back</button>
@@ -84,7 +84,7 @@
 </ng-template>
 
 <ng-template #templateFilter let-popover="popover">
-  <h4>Search bar to filter charges.</h4>
+  <h4>{{"labels.heading.Search bar to filter charges." | translate}}</h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
     <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateButtonCreateCharge,buttonCreateCharge , 'bottom', true)">Back</button>
@@ -93,7 +93,7 @@
 </ng-template>
 
 <ng-template #templateChargesTable let-popover="popover">
-  <h4 class="mw300">List of charges in the organization. For more details click: <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/72908813/Charges" target="_blank">Charges</a></h4>
+  <h4 class="mw300">{{"labels.heading.List of charges in the organization. For more details click" | translate}}: <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/72908813/Charges" target="_blank">Charges</a></h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">Close</button>
     <button mat-raised-button color="primary" (click)="popover.close();showPopover(templateFilter,filter, 'bottom', true)">Back</button>
diff --git a/src/app/products/charges/create-charge/create-charge.component.html b/src/app/products/charges/create-charge/create-charge.component.html
index b36f0a00e..3bad31816 100644
--- a/src/app/products/charges/create-charge/create-charge.component.html
+++ b/src/app/products/charges/create-charge/create-charge.component.html
@@ -9,7 +9,7 @@
         <div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Charge Applies To</mat-label>
+            <mat-label>{{"labels.inputs.Charge Applies To" | translate}}</mat-label>
             <mat-select required formControlName="chargeAppliesTo">
               <mat-option *ngFor="let chargeAppliesTo of chargesTemplateData.chargeAppliesToOptions"
                 [value]="chargeAppliesTo.id">
@@ -17,7 +17,7 @@
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeAppliesTo.hasError('required')">
-              Charge Applies To is <strong>required</strong>
+              {{"labels.inputs.Charge Applies To" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
@@ -27,39 +27,39 @@
             fxLayout.lt-md="column">
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Charge Name</mat-label>
+              <mat-label>{{"labels.inputs.Charge Name" | translate}}</mat-label>
               <input matInput required formControlName="name">
               <mat-error *ngIf="chargeForm.controls.name.hasError('required')">
-                Charge Name is <strong>required</strong>
+                {{"labels.inputs.Charge Name" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Currency</mat-label>
+              <mat-label>{{"labels.inputs.Currency" | translate}}</mat-label>
               <mat-select required formControlName="currencyCode">
                 <mat-option *ngFor="let currency of chargesTemplateData.currencyOptions" [value]="currency.code">
                   {{ currency.name }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.currencyCode.hasError('required')">
-                Currency is <strong>required</strong>
+                {{"labels.inputs.Currency" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Charge Time Type</mat-label>
+              <mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
               <mat-select required formControlName="chargeTimeType">
                 <mat-option *ngFor="let chargeTimeType of chargeTimeTypeData" [value]="chargeTimeType.id">
                   {{ chargeTimeType.value }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
-                Charge Time Type is <strong>required</strong>
+                {{"labels.inputs.Charge Time Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Charge Calculation Type</mat-label>
+              <mat-label>{{"labels.inputs.Charge Calculation Type" | translate}}</mat-label>
               <mat-select required formControlName="chargeCalculationType">
                 <mat-option *ngFor="let chargeCalculationType of filteredChargeCalculationType()"
                   [value]="chargeCalculationType.id">
@@ -67,12 +67,12 @@
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
-                Charge Calculation Type is <strong>required</strong>
+                {{"labels.inputs.Charge Calculation Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field *ngIf="chargeForm.controls.chargeAppliesTo.value === 1" fxFlex="48%">
-              <mat-label>Charge Payment Mode</mat-label>
+              <mat-label>{{"labels.inputs.Charge Payment Mode" | translate}}</mat-label>
               <mat-select required formControlName="chargePaymentMode">
                 <mat-option *ngFor="let chargePaymentMode of chargesTemplateData.chargePaymetModeOptions"
                   [value]="chargePaymentMode.id">
@@ -80,33 +80,33 @@
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
-                Charge Payment Mode is <strong>required</strong>
+                {{"labels.inputs.Charge Payment Mode" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <div fxFlex="48%" *ngIf="chargeForm.controls.chargeTimeType.value === 9" class="add-fee-frequency-wrapper">
               <mat-checkbox labelPosition="before" formControlName="addFeeFrequency">
-                Add Fee Frequency
+                {{"labels.inputs.Add Fee Frequency" | translate}}
               </mat-checkbox>
             </div>
 
             <mat-form-field
               *ngIf="chargeForm.controls.chargeTimeType.value === 9 && chargeForm.controls.addFeeFrequency.value"
               fxFlex="48%">
-              <mat-label>Frequency Interval</mat-label>
+              <mat-label>{{"labels.inputs.Frequency Interval" | translate}}</mat-label>
               <input matInput required formControlName="feeInterval">
               <mat-error *ngIf="chargeForm.controls.feeInterval.hasError('required')">
-                Frequency Interval is <strong>required</strong>
+                {{"labels.inputs.Frequency Interval" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
               <mat-error *ngIf="chargeForm.controls.feeInterval.hasError('pattern')">
-                Frequency Interval <strong>must be a positive integer</strong>
+                {{"labels.inputs.Frequency Interval" | translate}} <strong>{{"labels.commons.must be a positive integer" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field
               *ngIf="chargeForm.controls.chargeTimeType.value === 9 && chargeForm.controls.addFeeFrequency.value"
               fxFlex="48%">
-              <mat-label>Charge Frequency</mat-label>
+              <mat-label>{{"labels.inputs.Charge Frequency" | translate}}</mat-label>
               <mat-select required formControlName="feeFrequency">
                 <mat-option *ngFor="let feeFrequency of chargesTemplateData.feeFrequencyOptions"
                   [value]="feeFrequency.id">
@@ -114,87 +114,87 @@
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">
-                Charge Frequency is <strong>required</strong>
+                {{"labels.inputs.Charge Frequency" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field (click)="dueDatePicker.open()"
               *ngIf="chargeForm.controls.chargeTimeType.value === 6 || chargeForm.controls.chargeTimeType.value === 7"
               fxFlex="48%">
-              <mat-label>Due Date</mat-label>
+              <mat-label>{{"labels.inputs.Due Date" | translate}}</mat-label>
               <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="dueDatePicker" required
                 formControlName="feeOnMonthDay">
               <mat-datepicker-toggle matSuffix [for]="dueDatePicker"></mat-datepicker-toggle>
               <mat-datepicker #dueDatePicker></mat-datepicker>
               <mat-error *ngIf="chargeForm.controls.feeOnMonthDay.hasError('required')">
-                Due Date is <strong>required</strong>
+                {{"labels.inputs.Due Date" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%"
               *ngIf="chargeForm.controls.chargeTimeType.value === 7 || chargeForm.controls.chargeTimeType.value === 11">
-              <mat-label>Repeat Every ({{ repeatEveryLabel }})</mat-label>
+              <mat-label>{{"labels.inputs.Repeat Every" | translate}} ({{ repeatEveryLabel }})</mat-label>
               <input matInput required formControlName="feeInterval">
               <mat-error *ngIf="chargeForm.controls.feeInterval.hasError('required')">
-                Repeat Every ({{ repeatEveryLabel }}) is <strong>required</strong>
+                {{"labels.inputs.Repeat Every" | translate}} ({{ repeatEveryLabel }}) {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
               <mat-error
                 *ngIf="(chargeForm.controls.feeInterval.hasError('min') || chargeForm.controls.feeInterval.hasError('max')) && !chargeForm.controls.feeInterval.hasError('pattern')">
-                Repeat Every ({{ repeatEveryLabel }}) <strong>must be between 1 and 12</strong>
+                {{"labels.inputs.Repeat Every" | translate}} ({{ repeatEveryLabel }}) <strong>{{"labels.commons.must be between 1 and 12" | translate}}</strong>
               </mat-error>
               <mat-error *ngIf="chargeForm.controls.feeInterval.hasError('pattern')">
-                Repeat Every ({{ repeatEveryLabel }}) <strong>must be a positive integer</strong>
+                {{"labels.inputs.Repeat Every" | translate}} ({{ repeatEveryLabel }}) <strong>{{"labels.commons.must be a positive integer" | translate}}</strong>
               </mat-error>
             </mat-form-field>
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Amount</mat-label>
+              <mat-label>{{"labels.inputs.Amount" | translate}}</mat-label>
               <input matInput required formControlName="amount">
               <mat-error *ngIf="chargeForm.controls.amount.hasError('required')">
-                Amount is <strong>required</strong>
+                {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
               </mat-error>
               <mat-error *ngIf="chargeForm.controls.amount.hasError('pattern') && currencyDecimalPlaces !== undefined">
-                Amount must be <strong>a positive number with {{ currencyDecimalPlaces ? 'up to ' +
-                  currencyDecimalPlaces : 'no' }} decimal places</strong>
+                {{"labels.inputs.Amount" | translate}} {{"labels.commons.must be" | translate}}  <strong>{{"labels.commons.a positive number with" | translate}} {{ currencyDecimalPlaces ? 'up to ' +
+                  currencyDecimalPlaces : 'no' }} {{"labels.inputs.decimal places" | translate}}</strong>
               </mat-error>
               <mat-error *ngIf="chargeForm.controls.amount.hasError('pattern') && currencyDecimalPlaces === undefined">
-                Amount must be <strong>a positive number</strong>
+                {{"labels.inputs.Amount" | translate}} {{"labels.commons.must be" | translate}}  <strong>{{"labels.commons.a positive number" | translate}}</strong>
               </mat-error>
             </mat-form-field>
             <!--
    * minCap and maxCap only allowed for loan ,shares and savings entitites
-   * In Loan case: Only for the "charge calculation type" set as "%amount", "% loan amount+interest", "%interest",and"%disbursement amount". 
+   * In Loan case: Only for the "charge calculation type" set as "%amount", "% loan amount+interest", "%interest",and"%disbursement amount".
    * In saving case: Only for 1. charge time type is "withdrawlfee" or "savings no activity fee" with charge calculation type as "% amount"
    * In shares case: Only for charge time type: SHARE_PURCHASE and SHARE_REDEEM and with charge calculation type as % amount only
   -->
             <mat-form-field fxFlex="48%"
               *ngIf="(chargeForm.controls.chargeAppliesTo.value === 1 && (chargeForm.controls.chargeCalculationType.value === 2 || chargeForm.controls.chargeCalculationType.value === 3 || chargeForm.controls.chargeCalculationType.value === 4 || chargeForm.controls.chargeCalculationType.value==5)) || (chargeForm.controls.chargeAppliesTo.value === 2 && (chargeForm.controls.chargeTimeType.value === 16 || chargeForm.controls.chargeTimeType.value === 5)&&(chargeForm.controls.chargeCalculationType.value === 2)) || (chargeForm.controls.chargeAppliesTo.value === 4 && (chargeForm.controls.chargeTimeType.value==14 || chargeForm.controls.chargeTimeType.value==15) && chargeForm.controls.chargeCalculationType.value === 2)">
-              <mat-label>Minimum Charge Cap</mat-label>
+              <mat-label>{{"labels.inputs.Minimum Charge Cap" | translate}}</mat-label>
               <input matInput formControlName="minCap">
             </mat-form-field>
 
             <mat-form-field fxFlex="48%"
               *ngIf="(chargeForm.controls.chargeAppliesTo.value === 1 && (chargeForm.controls.chargeCalculationType.value === 2 || chargeForm.controls.chargeCalculationType.value === 3 || chargeForm.controls.chargeCalculationType.value === 4 || chargeForm.controls.chargeCalculationType.value==5)) || (chargeForm.controls.chargeAppliesTo.value === 2 && (chargeForm.controls.chargeTimeType.value === 16 || chargeForm.controls.chargeTimeType.value === 5)&&(chargeForm.controls.chargeCalculationType.value === 2)) || (chargeForm.controls.chargeAppliesTo.value === 4 && (chargeForm.controls.chargeTimeType.value==14 || chargeForm.controls.chargeTimeType.value==15) && chargeForm.controls.chargeCalculationType.value === 2)">
-              <mat-label>Maximum Charge Cap</mat-label>
+              <mat-label>{{"labels.inputs.Maximum Charge Cap" | translate}}</mat-label>
               <input matInput formControlName="maxCap">
             </mat-form-field>
 
             <div fxFlex="48%" fxLayout="row" fxLayoutGap="2%" fxLayout.lt-md="column">
               <div fxFlex="50%" class="active-wrapper">
                 <mat-checkbox labelPosition="before" formControlName="active">
-                  Active
+                  {{"labels.status.Active" | translate}}
                 </mat-checkbox>
               </div>
 
               <div fxFlex="50%" class="penalty-wrapper">
                 <mat-checkbox labelPosition="before" formControlName="penalty">
-                  Is Penalty
+                  {{"labels.commons.Is" | translate}} {{"labels.inputs.Penalty" | translate}}
                 </mat-checkbox>
               </div>
             </div>
 
             <mat-form-field *ngIf="chargeForm.controls.chargeAppliesTo.value === 3" fxFlex="48%">
-              <mat-label>Income from Charge </mat-label>
+              <mat-label>{{"labels.inputs.Income from Charge" | translate}} </mat-label>
               <mat-select formControlName="incomeAccountId">
                 <mat-option *ngFor="let incomeOrLiabilityAccount of incomeAndLiabilityAccountData"
                   [value]="incomeOrLiabilityAccount.id">
@@ -204,7 +204,7 @@
             </mat-form-field>
 
             <mat-form-field fxFlex="48%">
-              <mat-label>Tax Group</mat-label>
+              <mat-label>{{"labels.inputs.Tax Group" | translate}}</mat-label>
               <mat-select formControlName="taxGroupId">
                 <mat-option *ngFor="let taxGroup of chargesTemplateData.taxGroupOptions" [value]="taxGroup.id">
                   {{ taxGroup.name }}
@@ -219,13 +219,13 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../']">{{"labels.buttons.Cancel" | translate}}</button>
         <button mat-raised-button color="primary" [disabled]="!chargeForm.valid"
-          *mifosxHasPermission="'CREATE_CHARGE'">Submit</button>
+          *mifosxHasPermission="'CREATE_CHARGE'">{{"labels.buttons.Submit" | translate}}</button>
       </mat-card-actions>
 
     </form>
 
   </mat-card>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/products/charges/edit-charge/edit-charge.component.html b/src/app/products/charges/edit-charge/edit-charge.component.html
index 675731cb5..b7d857d57 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.html
+++ b/src/app/products/charges/edit-charge/edit-charge.component.html
@@ -9,7 +9,7 @@
         <div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Charges applies to</mat-label>
+            <mat-label>{{"labels.inputs.Charge Applies To" | translate}}</mat-label>
             <mat-select required formControlName="chargeAppliesTo">
               <mat-option *ngFor="let chargeAppliesTo of chargeData.chargeAppliesToOptions"
                 [value]="chargeAppliesTo.id">
@@ -23,53 +23,53 @@
         <div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column" style="margin-top:10px;">
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Name</mat-label>
+            <mat-label>{{"labels.inputs.Name" | translate}}</mat-label>
             <input matInput required autofocus formControlName="name">
             <mat-error *ngIf="chargeForm.controls.name.hasError('required')">
-              Name <strong>is required</strong>
+              {{"labels.inputs.Name" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Currency</mat-label>
+            <mat-label>{{"labels.inputs.Currency" | translate}}</mat-label>
             <mat-select required formControlName="currencyCode">
               <mat-option *ngFor="let currency of chargeData.currencyOptions" [value]="currency.code">
                 {{ currency.name }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.currencyCode.hasError('required')">
-              Currency Type is <strong>required</strong>
+              {{"labels.inputs.Currency" | translate}} {{"labels.inputs.Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
 
           </mat-form-field>
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Charge time type</mat-label>
+            <mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
             <mat-select required formControlName="chargeTimeType">
               <mat-option *ngFor="let chargeTime of chargeTimeTypeOptions" [value]="chargeTime.id">
                 {{ chargeTime.value }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
-              Charge Time Type is <strong>required</strong>
+              {{"labels.inputs.Charge Time Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
 
           </mat-form-field>
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Charge calculation</mat-label>
+            <mat-label>{{"labels.inputs.Charge Calculation" | translate}}</mat-label>
             <mat-select required formControlName="chargeCalculationType">
               <mat-option *ngFor="let chargeCalculation of chargeCalculationTypeOptions" [value]="chargeCalculation.id">
                 {{ chargeCalculation.value }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
-              Charge Calculation Type is <strong>required</strong>
+              {{"labels.inputs.Charge Calculation Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
           <mat-form-field fxFlex="48%" *ngIf="chargePaymentMode">
-            <mat-label>Charge Payment By</mat-label>
+            <mat-label>{{"labels.inputs.Charge Payment By" | translate}}</mat-label>
             <mat-select required formControlName="chargePaymentMode">
               <mat-option *ngFor="let chargePaymentMode of chargeData.chargePaymetModeOptions"
                 [value]="chargePaymentMode.id">
@@ -77,15 +77,15 @@
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
-              Charge Payment Mode is <strong>required</strong>
+              {{"labels.inputs.Charge Payment Mode" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Amount</mat-label>
+            <mat-label>{{"labels.inputs.Amount" | translate}}</mat-label>
             <input matInput required autofocus type="text" formControlName="amount">
             <mat-error *ngIf="chargeForm.controls.amount.hasError('required')">
-              Amount <strong>is required</strong>
+              {{"labels.inputs.Amount" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
           <!--
@@ -96,17 +96,17 @@
   -->
           <mat-form-field fxFlex="48%"
             *ngIf="(chargeForm.controls.chargeAppliesTo.value === 1 && (chargeForm.controls.chargeCalculationType.value === 2 || chargeForm.controls.chargeCalculationType.value === 3 || chargeForm.controls.chargeCalculationType.value === 4 || chargeForm.controls.chargeCalculationType.value==5)) || (chargeForm.controls.chargeAppliesTo.value === 2 && (chargeForm.controls.chargeTimeType.value === 16 || chargeForm.controls.chargeTimeType.value === 5)&&(chargeForm.controls.chargeCalculationType.value === 2)) || (chargeForm.controls.chargeAppliesTo.value === 4 && (chargeForm.controls.chargeTimeType.value==14 || chargeForm.controls.chargeTimeType.value==15) && chargeForm.controls.chargeCalculationType.value === 2)">
-            <mat-label>Minimum Charge Cap </mat-label>
+            <mat-label>{{"labels.inputs.Minimum Charge Cap" | translate}}</mat-label>
             <input matInput autofocus formControlName="minCap">
           </mat-form-field>
           <mat-form-field fxFlex="48%"
             *ngIf="(chargeForm.controls.chargeAppliesTo.value === 1 && (chargeForm.controls.chargeCalculationType.value === 2 || chargeForm.controls.chargeCalculationType.value === 3 || chargeForm.controls.chargeCalculationType.value === 4 || chargeForm.controls.chargeCalculationType.value==5)) || (chargeForm.controls.chargeAppliesTo.value === 2 && (chargeForm.controls.chargeTimeType.value === 16 || chargeForm.controls.chargeTimeType.value === 5)&&(chargeForm.controls.chargeCalculationType.value === 2)) || (chargeForm.controls.chargeAppliesTo.value === 4 && (chargeForm.controls.chargeTimeType.value==14 || chargeForm.controls.chargeTimeType.value==15) && chargeForm.controls.chargeCalculationType.value === 2)">
-            <mat-label>Maximum Charge Cap </mat-label>
+            <mat-label>{{"labels.inputs.Maximum Charge Cap" | translate}}</mat-label>
             <input matInput autofocus formControlName="maxCap">
           </mat-form-field>
 
           <mat-form-field fxFlex="48%" *ngIf="showGLAccount">
-            <mat-label>Income from charge</mat-label>
+            <mat-label>{{"labels.inputs.Income from charge" | translate}}</mat-label>
             <mat-select required formControlName="incomeAccountId">
               <mat-option *ngFor="let income of chargeData.incomeOrLiabilityAccountOptions.incomeAccountOptions"
                 [value]="income.id">
@@ -114,12 +114,12 @@
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.incomeAccountId.hasError('required')">
-              Income from charge is <strong>required</strong>
+              {{"labels.inputs.Income from charge" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
           <mat-form-field fxFlex="48%">
-            <mat-label>Tax Group</mat-label>
+            <mat-label>{{"labels.inputs.Tax Group" | translate}}</mat-label>
             <mat-select *ngIf="chargeData.taxGroup" formControlName="taxGroupId">
               <mat-option *ngFor="let taxGroup of chargeData.taxGroupOptions" [value]="taxGroup.id">
                 {{ taxGroup.name }}
@@ -136,27 +136,27 @@
           <div fxFlex="48%" class="password-never-expires-wrapper checkbox" *ngIf="addFeeFrequency">
             <mat-checkbox labelPosition="before" [checked]="addFeeFrequency && showFeeOptions"
               (change)="getFeeFrequency($event.checked)">
-              Add Fee Frequency
+              {{"labels.inputs.Add Fee Frequency" | translate}}
             </mat-checkbox>
           </div>
 
           <mat-form-field fxFlex="48%" *ngIf="addFeeFrequency && showFeeOptions">
-            <mat-label>Frequency Interval</mat-label>
+            <mat-label>{{"labels.inputs.Frequency Interval" | translate}}</mat-label>
             <input matInput required autofocus type="text" formControlName="feeInterval">
             <mat-error *ngIf="chargeForm.controls.feeInterval.hasError('required')">
-              Frequency Interval <strong>is required</strong>
+              {{"labels.inputs.Frequency Interval" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
           <mat-form-field fxFlex="48%" *ngIf="addFeeFrequency && showFeeOptions">
-            <mat-label>Charge Frequency</mat-label>
+            <mat-label>{{"labels.inputs.Charge Frequency" | translate}}</mat-label>
             <mat-select required formControlName="feeFrequency">
               <mat-option *ngFor="let chargeFrequency of chargeData.feeFrequencyOptions" [value]="chargeFrequency.id">
                 {{ chargeFrequency.value }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">
-              Fee Frequency <strong>is required</strong>
+              {{"labels.inputs.Add Fee Frequency" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
             </mat-error>
           </mat-form-field>
 
@@ -165,13 +165,13 @@
         <div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column" style="margin-top:10px;">
           <div fxFlex="48%" class="password-never-expires-wrapper">
             <mat-checkbox labelPosition="before" formControlName="active">
-              Active
+              {{"labels.status.Active" | translate}}
             </mat-checkbox>
           </div>
 
           <div fxFlex="48%" class="send-password-to-email-wrapper" *ngIf="showPenalty">
             <mat-checkbox labelPosition="before" formControlName="penalty">
-              Is Penalty
+              {{"labels.commons.Is" | translate}} {{"labels.inputs.Penalty" | translate}}
             </mat-checkbox>
           </div>
 
@@ -180,13 +180,13 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+        <button type="button" mat-raised-button [routerLink]="['../']">{{"labels.buttons.Cancel" | translate}}</button>
         <button mat-raised-button color="primary" [disabled]="!chargeForm.valid"
-          *mifosxHasPermission="'UPDATE_CHARGE'">Submit</button>
+          *mifosxHasPermission="'UPDATE_CHARGE'">{{"labels.buttons.Submit" | translate}}</button>
       </mat-card-actions>
 
     </form>
 
   </mat-card>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/products/charges/view-charge/view-charge.component.html b/src/app/products/charges/view-charge/view-charge.component.html
index 537e5880f..5566b3bc3 100644
--- a/src/app/products/charges/view-charge/view-charge.component.html
+++ b/src/app/products/charges/view-charge/view-charge.component.html
@@ -1,11 +1,11 @@
 <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
   <button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_CHARGE'">
     <fa-icon icon="edit" class="m-r-10"></fa-icon>
-    Edit
+    {{"labels.heading.Edit" | translate}}
   </button>
   <button mat-raised-button color="warn" (click)="deleteCharge()" *mifosxHasPermission="'DELETE_CHARGE'">
     <fa-icon icon="trash" class="m-r-10"></fa-icon>
-    Delete
+    {{"labels.heading.Delete" | translate}}
   </button>
 </div>
 
@@ -18,7 +18,7 @@
       <div fxLayout="row wrap" class="content">
 
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Name
+          {{"labels.inputs.Charge Name" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -26,7 +26,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Type
+          {{"labels.inputs.Charge Type" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -34,7 +34,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Currency
+          {{"labels.inputs.Currency" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -42,7 +42,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Amount
+          {{"labels.inputs.Amount" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -50,7 +50,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="minCap">
-          Minimum Charge Cap
+          {{"labels.inputs.Minimum Charge Cap" | translate}}
         </div>
 
         <div fxFlex="50%" *ngIf="minCap">
@@ -58,15 +58,15 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="maxCap">
-          Maximum Charge Cap
+          {{"labels.inputs.Maximum Charge Cap" | translate}}
         </div>
 
         <div fxFlex="50%" *ngIf="maxCap">
           {{ chargeData.maxCap }}
         </div>
-        
+
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Time Type
+          {{"labels.inputs.Charge Time Type" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -74,7 +74,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Applies to
+          {{"labels.inputs.Charge Applies To" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -82,7 +82,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Calculation Type
+          {{"labels.inputs.Charge Calculation Type" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -90,7 +90,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Charge Payment Mode
+          {{"labels.inputs.Charge Payment Mode" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -98,7 +98,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
-          Active
+          {{"labels.status.Active" | translate}}
         </div>
 
         <div fxFlex="50%">
@@ -106,7 +106,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeFrequency">
-          Fee Frequency
+          {{"labels.inputs.Add Fee Frequency" | translate}}
         </div>
 
         <div fxFlex="50%"
@@ -115,7 +115,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeInterval">
-          Frequency Interval
+          {{"labels.inputs.Frequency Interval" | translate}}
         </div>
 
         <div fxFlex="50%" *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeInterval">
@@ -123,7 +123,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.incomeOrLiabilityAccount">
-          Income from Charges
+          {{"labels.heading.Income" | translate}} {{"labels.inputs.From" | translate}} {{"labels.heading.Charges" | translate}}
         </div>
 
         <div fxFlex="50%" *ngIf="chargeData.incomeOrLiabilityAccount">
@@ -131,7 +131,7 @@
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.taxGroup">
-          Tax Group
+          {{"labels.inputs.Tax Group" | translate}}
         </div>
 
         <div fxFlex="50%" *ngIf="chargeData.taxGroup">
@@ -147,4 +147,4 @@
 
   </mat-card>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/products/charges/view-charge/view-charge.component.ts b/src/app/products/charges/view-charge/view-charge.component.ts
index 144a5a27c..2148533ed 100644
--- a/src/app/products/charges/view-charge/view-charge.component.ts
+++ b/src/app/products/charges/view-charge/view-charge.component.ts
@@ -1,12 +1,13 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
+import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
 import { ProductsService } from 'app/products/products.service';
 
 /** Custom Components */
+import { TranslateService } from '@ngx-translate/core';
 import { DeleteDialogComponent } from '../../../shared/delete-dialog/delete-dialog.component';
 
 /**
@@ -30,11 +31,13 @@ export class ViewChargeComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    * @param {MatDialog} dialog Dialog reference.
+   * @param {TranslateService} translateService Translate Service.
    */
   constructor(private productsService: ProductsService,
     private route: ActivatedRoute,
     private router: Router,
-    private dialog: MatDialog) {
+    private dialog: MatDialog,
+    private translateService:TranslateService) {
     this.route.data.subscribe((data: { charge: any }) => {
       this.chargeData = data.charge;
       if (this.chargeData.minCap) {
@@ -54,7 +57,7 @@ export class ViewChargeComponent implements OnInit {
    */
   deleteCharge() {
     const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
-      data: { deleteContext: `charge ${this.chargeData.id}` }
+      data: { deleteContext: this.translateService.instant('labels.inputs.Charge') + " " + this.chargeData.id}
     });
     deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
       if (response.delete) {
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index b678e6589..7c780d010 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "větší rovno 0",
       "invalid": "neplatný",
       "is": "je",
+      "Is": "Je",
       "is required": "je požadováno",
       "least one uppercase": "alespoň jedno velké písmeno",
       "lowercase and special character": "malá písmena a speciální znak",
+      "must be": "musí být",
       "must be a positive integer": "musí být kladné celé číslo",
       "must be an integer between -9999 and 9999": "musí být celé číslo mezi -9999 a 9999",
       "must be between 1 and 12": "musí být mezi 1 a 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Částka přijatá/vrácená",
       "Amount to be Reserved": "Částka, která má být rezervována",
       "Annual Fees Transaction Date": "Roční poplatky Datum transakce",
+      "Applies To": "Platí pro",
       "Applicable From Date": "Platné od data",
       "Applicant": "Žadatel",
       "Application Date": "Datum přihlášky",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Pokladník/personál",
       "Category": "Kategorie",
       "Category Name": "Název Kategorie",
+      "Calculation": "Výpočet",
       "Center Name": "Název střediska",
       "Change Repayment Date": "Změnit datum splacení",
       "Changes Affection Date": "Změny Datum náklonnosti",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Částka splatnosti",
       "Maturity Date": "Datum splatnosti",
       "Max Age": "Maximální věk",
+      "Maximum Charge Cap": "Maximální lip nabíjení",
       "Maturity Instructions": "Pokyny pro splatnost",
       "Maximum Deposit Term": "Maximální doba vkladu",
       "Maximum Overdraft Amount Limit": "Maximální výše limitu přečerpání",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Opakuje se (M/d)",
       "Repeats on Day": "Opakuje se v den",
       "Repeats?": "Opakuje se?",
+      "Repeat Every": "Opakujte každý",
       "Repetition Frequency": "Frekvence opakování",
       "Repetition Interval": "Interval opakování",
       "Report Category": "Kategorie přehledu",
@@ -1933,6 +1939,7 @@
       "Theme": "Téma",
       "Theme and Font": "Motiv a písmo",
       "Thursday": "Čtvrtek",
+      "Time": "Čas",
       "To": "Na",
       "To Account": "Na účet",
       "To Account Type": "K typu účtu",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 54fbf59e8..bf1500c59 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "größer gleich 0",
       "invalid": "ungültig",
       "is": "Ist",
+      "Is": "Ist",
       "is required": "ist erforderlich",
       "least one uppercase": "mindestens ein Großbuchstabe",
       "lowercase and special character": "Kleinbuchstaben und Sonderzeichen",
+      "must be": "muss sein",
       "must be a positive integer": "muss eine positive ganze Zahl sein",
       "must be an integer between -9999 and 9999": "muss eine ganze Zahl zwischen -9999 und 9999 sein",
       "must be between 1 and 12": "muss zwischen 1 und 12 liegen",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Erhaltener/zurückgegebener Betrag",
       "Amount to be Reserved": "Zu reservierender Betrag",
       "Annual Fees Transaction Date": "Transaktionsdatum der Jahresgebühren",
+      "Applies To": "Gilt für",
       "Applicable From Date": "Gültig ab Datum",
       "Applicant": "Antragsteller",
       "Application Date": "Bewerbungsdatum",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Kassierer/Mitarbeiter",
       "Category": "Kategorie",
       "Category Name": "Kategoriename",
+      "Calculation": "Berechnung",
       "Center Name": "Name des Zentrums",
       "Change Repayment Date": "Rückzahlungsdatum ändern",
       "Changes Affection Date": "Ändert das Zugehörigkeitsdatum",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Fälligkeitsbetrag",
       "Maturity Date": "Fälligkeitstag",
       "Max Age": "Maximales Alter",
+      "Maximum Charge Cap": "Maximale Ladungskappe",
       "Maturity Instructions": "Reife Anweisungen",
       "Maximum Deposit Term": "Maximale Einzahlungsdauer",
       "Maximum Overdraft Amount Limit": "Maximaler Überziehungsbetrag",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Wiederholungen an (M/T)",
       "Repeats on Day": "Wird am Tag wiederholt",
       "Repeats?": "Wiederholungen?",
+      "Repeat Every": "Wiederhole jeden",
       "Repetition Frequency": "Wiederholungsfrequenz",
       "Repetition Interval": "Wiederholungsintervall",
       "Report Category": "Berichtskategorie",
@@ -1933,6 +1939,7 @@
       "Theme": "Thema",
       "Theme and Font": "Thema und Schriftart",
       "Thursday": "Donnerstag",
+      "Time": "Zeit",
       "To": "Zu",
       "To Account": "Zum Konto",
       "To Account Type": "Zum Kontotyp",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 4b0c09e39..b337d0af2 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -524,9 +524,11 @@
             "greater equal to than 0": "greater equal to than 0",
             "invalid": "invalid",
             "is": "is",
+            "Is": "is",
             "is required": "is required",
             "least one uppercase": "least one uppercase",
             "lowercase and special character": "lowercase and special character",
+            "must be":"must be",
             "must be a positive integer": "must be a positive integer",
             "must be an integer between -9999 and 9999": "must be an integer between -9999 and 9999",
             "must be between 1 and 12": "must be between 1 and 12",
@@ -953,6 +955,7 @@
             "Amount Recieved/Returned": "Amount Received/Returned",
             "Amount to be Reserved": "Amount to be Reserved",
             "Annual Fees Transaction Date": "Annual Fees Transaction Date",
+            "Applies To":"Applies To",
             "Applicable From Date": "Applicable From Date",
             "Applicant": "Applicant",
             "Application Date": "Application Date",
@@ -1021,6 +1024,7 @@
             "Cashier/Staff": "Cashier/Staff",
             "Category": "Category",
             "Category Name": "Category Name",
+            "Calculation":"Calculation",
             "Center Name": "Center Name",
             "Change Repayment Date": "Change Repayment Date",
             "Changes Affection Date": "Changes Affection Date",
@@ -1541,6 +1545,7 @@
             "Maturity Date": "Maturity Date",
             "Maturity Instructions": "Maturity Instructions",
             "Max Age": "Max Age",
+            "Maximum Charge Cap":"Maximum Charge Cap",
             "Maximum Deposit Term": "Maximum Deposit Term",
             "Maximum Overdraft Amount Limit": "Maximum Overdraft Amount Limit",
             "Maximum Tranche count": "Maximum Tranche count",
@@ -1796,6 +1801,7 @@
             "Repeats On (M/d)": "Repeats On (M/d)",
             "Repeats on Day": "Repeats on Day",
             "Repeats?": "Repeats?",
+            "Repeat Every":"Repeat Every",
             "Repetition Frequency": "Repetition Frequency",
             "Repetition Interval": "Repetition Interval",
             "Report Category": "Report Category",
@@ -1932,6 +1938,7 @@
             "Theme": "Theme",
             "Theme and Font": "Theme and Font",
             "Thursday": "Thursday",
+            "Time":"Time",
             "To": "To",
             "To Account": "To Account",
             "To Account Type": "To Account Type",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index bc98b8b0e..c1f57fdc1 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -524,9 +524,11 @@
             "greater equal to than 0": "mayor igual a 0",
             "invalid": "inválido",
             "is": "es",
+            "Is": "Es",
             "is required": "se requiere",
             "least one uppercase": "menos una mayúscula",
             "lowercase and special character": "minúsculas y caracteres especiales",
+            "must be": "debe ser",
             "must be a positive integer": "debe ser un entero positivo",
             "must be an integer between -9999 and 9999": "debe ser un número entero entre -9999 y 9999",
             "must be between 1 and 12": "debe estar entre 1 y 12",
@@ -954,6 +956,7 @@
             "Amount Recieved/Returned": "Cantidad recibida/devuelta",
             "Amount to be Reserved": "Monto a reservar",
             "Annual Fees Transaction Date": "Fecha de transacción de tarifas anuales",
+            "Applies To": "Se aplica a",
             "Applicable From Date": "Aplicable desde la fecha",
             "Applicant": "Solicitante",
             "Application Date": "Fecha de solicitud",
@@ -1022,6 +1025,7 @@
             "Cashier/Staff": "Cajero/Personal",
             "Category": "Categoría",
             "Category Name": "nombre de la categoría",
+            "Calculation": "Cálculo",
             "Center Name": "Nombre del centro",
             "Change Repayment Date": "Cambiar fecha de pago",
             "Changes Affection Date": "Cambia la fecha de cariño",
@@ -1541,6 +1545,7 @@
             "Maturity Amount": "Monto de vencimiento",
             "Maturity Date": "Fecha de vencimiento",
             "Max Age": "Edad máxima",
+            "Maximum Charge Cap": "Tapa de carga máxima",
             "Maturity Instructions": "Instrucciones al Vencimiento",
             "Maximum Deposit Term": "Plazo máximo de depósito",
             "Maximum Overdraft Amount Limit": "Límite máximo del monto de sobregiro",
@@ -1797,6 +1802,7 @@
             "Repeats On (M/d)": "Se repite (M/d)",
             "Repeats on Day": "Se repite el día",
             "Repeats?": "¿Se repite?",
+            "Repeat Every": "Repite cada",
             "Repetition Frequency": "Frecuencia de repetición",
             "Repetition Interval": "Intervalo de repetición",
             "Report Category": "Categoría de reporte",
@@ -1933,6 +1939,7 @@
             "Theme": "Tema",
             "Theme and Font": "Tema y fuente",
             "Thursday": "Jueves",
+            "Time": "Tiempo",
             "To": "A",
             "To Account": "A la cuenta",
             "To Account Type": "Al tipo de cuenta",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index 8456ca67c..bc917e8e6 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "supérieur égal à 0",
       "invalid": "invalide",
       "is": "est",
+      "Is": "Est",
       "is required": "est requis",
       "least one uppercase": "au moins une majuscule",
       "lowercase and special character": "minuscules et caractères spéciaux",
+      "must be": "doit être",
       "must be a positive integer": "doit être un entier positif",
       "must be an integer between -9999 and 9999": "doit être un entier compris entre -9999 et 9999",
       "must be between 1 and 12": "doit être compris entre 1 et 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Montant reçu/retourné",
       "Amount to be Reserved": "Montant à réserver",
       "Annual Fees Transaction Date": "Date de transaction des frais annuels",
+      "Applies To": "S'applique à",
       "Applicable From Date": "Applicable à partir de la date",
       "Applicant": "Demandeur",
       "Application Date": "Date de demande",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Caissier/Personnel",
       "Category": "Catégorie",
       "Category Name": "Nom de catégorie",
+      "Calculation": "Calcul",
       "Center Name": "Nom du centre",
       "Change Repayment Date": "Modifier la date de remboursement",
       "Changes Affection Date": "Modifications Date d'Affectation",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Montant à l'échéance",
       "Maturity Date": "Date d'échéance",
       "Max Age": "Âge maximum",
+      "Maximum Charge Cap": "Cap de charge maximum",
       "Maturity Instructions": "Instructions de maturité",
       "Maximum Deposit Term": "Durée de dépôt maximale",
       "Maximum Overdraft Amount Limit": "Limite maximale du montant du découvert",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Répétition activée (M/d)",
       "Repeats on Day": "Se répète le jour",
       "Repeats?": "Des répétitions ?",
+      "Repeat Every": "Répéter chaque",
       "Repetition Frequency": "Fréquence de répétition",
       "Repetition Interval": "Intervalle de répétition",
       "Report Category": "Catégorie de rapport",
@@ -1933,6 +1939,7 @@
       "Theme": "Thème",
       "Theme and Font": "Thème et police",
       "Thursday": "Jeudi",
+      "Time": "Temps",
       "To": "À",
       "To Account": "Estimer",
       "To Account Type": "Vers le type de compte",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 43e4cc7b3..e6aa67708 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "maggiore uguale a 0",
       "invalid": "non valido",
       "is": "È",
+      "Is": "È",
       "is required": "è obbligatorio",
       "least one uppercase": "almeno una maiuscola",
       "lowercase and special character": "caratteri minuscoli e speciali",
+      "must be": "deve essere",
       "must be a positive integer": "deve essere un numero intero positivo",
       "must be an integer between -9999 and 9999": "deve essere un numero intero compreso tra -9999 e 9999",
       "must be between 1 and 12": "deve essere compreso tra 1 e 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Importo ricevuto/restituito",
       "Amount to be Reserved": "Importo da riservare",
       "Annual Fees Transaction Date": "Data della transazione relativa alle tariffe annuali",
+      "Applies To": "Si applica a",
       "Applicable From Date": "Applicabile dalla data",
       "Applicant": "Richiedente",
       "Application Date": "Data di domanda",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Cassiere/Personale",
       "Category": "Categoria",
       "Category Name": "Nome della categoria",
+      "Calculation": "Calcolo",
       "Center Name": "Nome del centro",
       "Change Repayment Date": "Modifica data di rimborso",
       "Changes Affection Date": "Modifica la data di affetto",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Importo di scadenza",
       "Maturity Date": "Data di scadenza",
       "Max Age": "Età massima",
+      "Maximum Charge Cap": "Tappo di carica massimo",
       "Maturity Instructions": "Istruzioni di maturità",
       "Maximum Deposit Term": "Durata massima del deposito",
       "Maximum Overdraft Amount Limit": "Limite massimo dell'importo dello scoperto",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Ripetizioni attivate (M/g)",
       "Repeats on Day": "Si ripete il giorno",
       "Repeats?": "Si ripete?",
+      "Repeat Every": "Ripeti ogni",
       "Repetition Frequency": "Frequenza di ripetizione",
       "Repetition Interval": "Intervallo di ripetizione",
       "Report Category": "Categoria del rapporto",
@@ -1933,6 +1939,7 @@
       "Theme": "Tema",
       "Theme and Font": "Tema e carattere",
       "Thursday": "Giovedì",
+      "Time": "Tempo",
       "To": "A",
       "To Account": "Per conto",
       "To Account Type": "Al tipo di conto",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index a3ee25779..490a03f05 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "0보다 큼",
       "invalid": "유효하지 않은",
       "is": "~이다",
+      "Is": "~이다",
       "is required": "필수",
       "least one uppercase": "하나 이상의 대문자",
       "lowercase and special character": "소문자 및 특수 문자",
+      "must be": "해야합니다",
       "must be a positive integer": "양의 정수여야 합니다.",
       "must be an integer between -9999 and 9999": "-9999에서 9999 사이의 정수여야 합니다.",
       "must be between 1 and 12": "1에서 12 사이여야 합니다.",
@@ -955,6 +957,7 @@
       "Amount Recieved/Returned": "수령/반품 금액",
       "Amount to be Reserved": "예약 금액",
       "Annual Fees Transaction Date": "연회비 거래일",
+      "Applies To": "적용됩니다",
       "Applicable From Date": "적용일자부터",
       "Applicant": "응모자",
       "Application Date": "신청 날짜",
@@ -1023,6 +1026,7 @@
       "Cashier/Staff": "계산원/직원",
       "Category": "범주",
       "Category Name": "카테고리 이름",
+      "Calculation": "계산",
       "Center Name": "센터명",
       "Change Repayment Date": "상환일 변경",
       "Changes Affection Date": "애정 날짜 변경",
@@ -1542,6 +1546,7 @@
       "Maturity Amount": "만기금액",
       "Maturity Date": "만기일",
       "Max Age": "최대 연령",
+      "Maximum Charge Cap": "최대 충전 캡",
       "Maturity Instructions": "성숙 지침",
       "Maximum Deposit Term": "최대 예금 기간",
       "Maximum Overdraft Amount Limit": "최대 초과인출 금액 한도",
@@ -1798,6 +1803,7 @@
       "Repeats On (M/d)": "반복 시간(월/일)",
       "Repeats on Day": "요일에 반복",
       "Repeats?": "반복?",
+      "Repeat Every": "모든 것을 반복하십시오",
       "Repetition Frequency": "반복 빈도",
       "Repetition Interval": "반복 간격",
       "Report Category": "신고 카테고리",
@@ -1934,6 +1940,7 @@
       "Theme": "주제",
       "Theme and Font": "테마 및 글꼴",
       "Thursday": "목요일",
+      "Time": "시간",
       "To": "에게",
       "To Account": "계정에",
       "To Account Type": "계정 유형: 까지",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index 97e07dc2b..e2d5fb906 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "didesnis lygus 0",
       "invalid": "negaliojančiais",
       "is": "yra",
+      "Is": "Yra",
       "is required": "yra būtinas",
       "least one uppercase": "bent viena didžioji raidė",
       "lowercase and special character": "mažosios raidės ir specialusis simbolis",
+      "must be": "privalo būti",
       "must be a positive integer": "turi būti teigiamas sveikasis skaičius",
       "must be an integer between -9999 and 9999": "turi būti sveikas skaičius nuo -9999 iki 9999",
       "must be between 1 and 12": "turi būti nuo 1 iki 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Gauta/grąžinta suma",
       "Amount to be Reserved": "Rezervuojama suma",
       "Annual Fees Transaction Date": "Metinių mokesčių operacijos data",
+      "Applies To": "Taikoma",
       "Applicable From Date": "Taikoma nuo datos",
       "Applicant": "Pareiškėjas",
       "Application Date": "Prašymo data",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Kasininkė/darbuotojai",
       "Category": "Kategorija",
       "Category Name": "Kategorijos pavadinimas",
+      "Calculation": "Skaičiavimas",
       "Center Name": "Centro pavadinimas",
       "Change Repayment Date": "Keisti grąžinimo datą",
       "Changes Affection Date": "Keičia prisirišimo datą",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Termino suma",
       "Maturity Date": "Galiojimo data",
       "Max Age": "Maksimalus amžius",
+      "Maximum Charge Cap": "Maksimalus mokesčio dangtelis",
       "Maturity Instructions": "Brandos instrukcijos",
       "Maximum Deposit Term": "Maksimalus indėlio terminas",
       "Maximum Overdraft Amount Limit": "Maksimalus overdrafto sumos limitas",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Kartojasi (M/d)",
       "Repeats on Day": "Kartojasi dieną",
       "Repeats?": "Kartojasi?",
+      "Repeat Every": "Pakartokite kiekvieną",
       "Repetition Frequency": "Pasikartojimo dažnis",
       "Repetition Interval": "Pasikartojimo intervalas",
       "Report Category": "Ataskaitos kategorija",
@@ -1933,6 +1939,7 @@
       "Theme": "tema",
       "Theme and Font": "Tema ir šriftas",
       "Thursday": "ketvirtadienis",
+      "Time": "Laikas",
       "To": "Į",
       "To Account": "Į sąskaitą",
       "To Account Type": "Į sąskaitos tipą",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index e2561fca0..2e90c2dc4 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "lielāks, vienāds ar 0",
       "invalid": "nederīgs",
       "is": "ir",
+      "Is": "Ir",
       "is required": "ir nepieciešams",
       "least one uppercase": "vismaz viens lielais burts",
       "lowercase and special character": "mazie burti un īpašais rakstzīmes",
+      "must be": "jābūt",
       "must be a positive integer": "jābūt pozitīvam veselam skaitlim",
       "must be an integer between -9999 and 9999": "jābūt veselam skaitlim no -9999 līdz 9999",
       "must be between 1 and 12": "jābūt no 1 līdz 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Saņemtā/atgrieztā summa",
       "Amount to be Reserved": "Rezervējamā summa",
       "Annual Fees Transaction Date": "Gada maksas darījuma datums",
+      "Applies To": "Attiecas uz",
       "Applicable From Date": "Piemērojams no datuma",
       "Applicant": "Pieteikuma iesniedzējs",
       "Application Date": "Pieteikuma datums",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Kasieris/personāls",
       "Category": "Kategorija",
       "Category Name": "Kategorijas nosaukums",
+      "Calculation": "Aprēķins",
       "Center Name": "Centra nosaukums",
       "Change Repayment Date": "Mainīt atmaksas datumu",
       "Changes Affection Date": "Maina pieķeršanās datumu",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Termiņa summa",
       "Maturity Date": "Derīguma termiņš",
       "Max Age": "Maksimālais vecums",
+      "Maximum Charge Cap": "Maksimālais lādiņa vāciņš",
       "Maturity Instructions": "Brieduma instrukcijas",
       "Maximum Deposit Term": "Maksimālais depozīta termiņš",
       "Maximum Overdraft Amount Limit": "Maksimālais overdrafta summas limits",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Atkārtojas ieslēgts (M/d)",
       "Repeats on Day": "Atkārtojas dienā",
       "Repeats?": "Atkārtojas?",
+      "Repeat Every": "Atkārtojiet katru",
       "Repetition Frequency": "Atkārtošanās biežums",
       "Repetition Interval": "Atkārtojumu intervāls",
       "Report Category": "Pārskata kategorija",
@@ -1933,6 +1939,7 @@
       "Theme": "Tēma",
       "Theme and Font": "Motīvs un fonts",
       "Thursday": "ceturtdiena",
+      "Time": "Laiks",
       "To": "Uz",
       "To Account": "Uz kontu",
       "To Account Type": "Uz konta veidu",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 8e07b8667..d304dbe6b 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "० भन्दा ठूलो बराबर",
       "invalid": "अवैध",
       "is": "छ",
+      "Is": "छ",
       "is required": "आवश्यक",
       "least one uppercase": "कम्तिमा एउटा अपरकेस",
       "lowercase and special character": "सानो अक्षर र विशेष वर्ण",
+      "must be": "हुनै पर्छ",
       "must be a positive integer": "सकारात्मक पूर्णांक हुनुपर्छ",
       "must be an integer between -9999 and 9999": "-9999 र 9999 बीचको पूर्णांक हुनुपर्छ",
       "must be between 1 and 12": "१ र १२ को बीचमा हुनुपर्छ",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "प्राप्त रकम / फिर्ता",
       "Amount to be Reserved": "आरक्षित गर्नुपर्ने रकम",
       "Annual Fees Transaction Date": "वार्षिक शुल्क लेनदेन मिति",
+      "Applies To": "लागु हुनु",
       "Applicable From Date": "मिति देखि लागू",
       "Applicant": "आवेदक",
       "Application Date": "आवेदन मिति",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "क्यासियर / कर्मचारी",
       "Category": "श्रेणी",
       "Category Name": "श्रेणी नाम",
+      "Calculation": "हिसाब",
       "Center Name": "केन्द्रको नाम",
       "Change Repayment Date": "पुन: भुक्तानी मिति परिवर्तन गर्नुहोस्",
       "Changes Affection Date": "स्नेह मिति परिवर्तन गर्दछ",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "परिपक्वता रकम",
       "Maturity Date": "परिपक्वता मिति",
       "Max Age": "अधिकतम उमेर",
+      "Maximum Charge Cap": "अधिकतम चार्ज टोपी",
       "Maturity Instructions": "परिपक्वता निर्देशनहरू",
       "Maximum Deposit Term": "अधिकतम जम्मा अवधि",
       "Maximum Overdraft Amount Limit": "अधिकतम ओभरड्राफ्ट रकम सीमा",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "दोहोरिने मा (M/d)",
       "Repeats on Day": "दिनमा दोहोरिन्छ",
       "Repeats?": "दोहोर्याउँछ?",
+      "Repeat Every": "सबै दोहोर्याउनु",
       "Repetition Frequency": "पुनरावृत्ति आवृत्ति",
       "Repetition Interval": "दोहोरिने अन्तराल",
       "Report Category": "रिपोर्ट कोटि",
@@ -1933,6 +1939,7 @@
       "Theme": "विषयवस्तु",
       "Theme and Font": "विषयवस्तु र फन्ट",
       "Thursday": "बिहीबार",
+      "Time": "समय",
       "To": "को",
       "To Account": "खातामा",
       "To Account Type": "खाता प्रकारमा",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index f7136851c..9e108ea85 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "maior igual a 0",
       "invalid": "inválido",
       "is": "é",
+      "Is": "É",
       "is required": "é necessário",
       "least one uppercase": "pelo menos uma maiúscula",
       "lowercase and special character": "letras minúsculas e caracteres especiais",
+      "must be": "devemos ser",
       "must be a positive integer": "deve ser um número inteiro positivo",
       "must be an integer between -9999 and 9999": "deve ser um número inteiro entre -9999 e 9999",
       "must be between 1 and 12": "deve estar entre 1 e 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Valor recebido/devolvido",
       "Amount to be Reserved": "Valor a ser reservado",
       "Annual Fees Transaction Date": "Data de transação de taxas anuais",
+      "Applies To": "Aplica-se a",
       "Applicable From Date": "Aplicável a partir da data",
       "Applicant": "Candidato",
       "Application Date": "Data de aplicação",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Caixa/Equipe",
       "Category": "Categoria",
       "Category Name": "Nome da Categoria",
+      "Calculation": "Cálculo",
       "Center Name": "Nome do centro",
       "Change Repayment Date": "Alterar data de reembolso",
       "Changes Affection Date": "Altera a data do afeto",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Valor de vencimento",
       "Maturity Date": "Data de Vencimento",
       "Max Age": "Idade máxima",
+      "Maximum Charge Cap": "Captura máxima de carga",
       "Maturity Instructions": "Instruções de vencimento",
       "Maximum Deposit Term": "Prazo máximo de depósito",
       "Maximum Overdraft Amount Limit": "Limite máximo do valor do cheque especial",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Repetições ativadas (M/d)",
       "Repeats on Day": "Repete no dia",
       "Repeats?": "Repete?",
+      "Repeat Every": "Repita todos",
       "Repetition Frequency": "Frequência de repetição",
       "Repetition Interval": "Intervalo de repetição",
       "Report Category": "Categoria do relatório",
@@ -1933,6 +1939,7 @@
       "Theme": "Tema",
       "Theme and Font": "Tema e fonte",
       "Thursday": "Quinta-feira",
+      "Time": "Tempo",
       "To": "Para",
       "To Account": "Para conta",
       "To Account Type": "Para o tipo de conta",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index c1d5973a8..59166df4e 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -524,9 +524,11 @@
       "greater equal to than 0": "kubwa zaidi ya 0",
       "invalid": "batili",
       "is": "ni",
+      "Is": "Ni",
       "is required": "inahitajika",
       "least one uppercase": "angalau herufi kubwa moja",
       "lowercase and special character": "herufi ndogo na maalum",
+      "must be": "lazima iwe",
       "must be a positive integer": "lazima iwe nambari chanya",
       "must be an integer between -9999 and 9999": "lazima iwe nambari kamili kati ya -9999 na 9999",
       "must be between 1 and 12": "lazima iwe kati ya 1 na 12",
@@ -954,6 +956,7 @@
       "Amount Recieved/Returned": "Kiasi Kilichopokelewa/Kurejeshwa",
       "Amount to be Reserved": "Kiasi cha Kuhifadhiwa",
       "Annual Fees Transaction Date": "Tarehe ya Muamala wa Ada ya Mwaka",
+      "Applies To": "Inatumika kwa",
       "Applicable From Date": "Inatumika Kuanzia Tarehe",
       "Applicant": "Mwombaji",
       "Application Date": "Tarehe ya maombi",
@@ -1022,6 +1025,7 @@
       "Cashier/Staff": "Keshia/Mfanyakazi",
       "Category": "Kategoria",
       "Category Name": "Jina la Kategoria",
+      "Calculation": "Hesabu",
       "Center Name": "Jina la Kituo",
       "Change Repayment Date": "Badilisha Tarehe ya Kulipa",
       "Changes Affection Date": "Mabadiliko Tarehe ya Mapenzi",
@@ -1541,6 +1545,7 @@
       "Maturity Amount": "Kiasi cha Ukomavu",
       "Maturity Date": "Tarehe ya Kukomaa",
       "Max Age": "Umri wa Max",
+      "Maximum Charge Cap": "Kiwango cha juu cha malipo",
       "Maturity Instructions": "Maagizo ya ukomavu",
       "Maximum Deposit Term": "Muda wa Juu wa Amana",
       "Maximum Overdraft Amount Limit": "Kikomo cha juu cha Kiasi cha Overdraft",
@@ -1797,6 +1802,7 @@
       "Repeats On (M/d)": "Hurudiwa Washa (M/d)",
       "Repeats on Day": "Hurudiwa Siku",
       "Repeats?": "Hurudiwa?",
+      "Repeat Every": "Rudia kila",
       "Repetition Frequency": "Mzunguko wa Kurudia",
       "Repetition Interval": "Muda wa Kurudia",
       "Report Category": "Aina ya Ripoti",
@@ -1933,6 +1939,7 @@
       "Theme": "Mandhari",
       "Theme and Font": "Mandhari na Fonti",
       "Thursday": "Alhamisi",
+      "Time": "Wakati",
       "To": "Kwa",
       "To Account": "Kwa Akaunti",
       "To Account Type": "Kwa Aina ya Akaunti",