diff --git a/Contributing.md b/Contributing.md
index 9ed8983062..ec976c2fc2 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -127,6 +127,23 @@ Each test should have an expect statement. In most cases, tests should only have
       }
 ```
 
-## Contributing:
+# Contributing:
 
-Please feel free to add to and contribute to this documentation!
\ No newline at end of file
+### Best Practices for reporting or requesting for Issues/Enhancements:
+  - Follow the Issue Template while creating the issue.
+  - Include Screenshots if any (specially for UI related issues)
+  - For UI enhancements or workflows, include mockups to get a clear idea.
+
+### Best Practices for assigning an issue:
+- If you would like to work on an issue, inform in the issue ticket by commenting on it.
+- Please be sure that you are able to reproduce the issue, before working on it. If not, please ask for                 clarification by commenting or asking the issue creator.
+
+Note: Please do not work on issues which is already being worked on by another contributor. We don't encourage creating multiple pull requests for the same issue. Also, please allow the assigned person at least 2 days to work on the issue ( The time might vary depending on the difficulty). If there is no progress after the deadline, please comment on the issue asking the contributor whether he/she is still working on it. If there is no reply, then feel free to work on the issue.
+
+
+### Best Practices to send Pull Requests:
+  - Follow the Pull request template.
+  - Commit messages should follow this template: `Fix #<issue-no> - <issue-desc>`
+  - Squash all your commits to a single commit.
+  - Create new branch before adding and commiting your changes ( This allows you to send multiple Pull Requests ) 
+  
diff --git a/app/global-translations/locale-my.json b/app/global-translations/locale-my.json
index 3949670442..37ba96c2a3 100644
--- a/app/global-translations/locale-my.json
+++ b/app/global-translations/locale-my.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Ninjastrikers"
+			"Ninjastrikers",
+			"NandaHtoon"
 		]
 	},
 	"label.heading.totalshares": "ရှယ်ယာစုစုပေါင်း",
@@ -15,6 +16,7 @@
 	"label.heading.allowdividendsforinactiveclients": "ပုံမှန်အသုံးမပြုတော့သည် ဖောက်သည်များအတွက် အစုငွေခွဲခြင်း ခွင့်ပြုရန်",
 	"label.heading.name": "အမည်",
 	"label.heading.alias": "အခြားအမည်",
+	"label.heading.amountDue": "သက်မှတ်ပမာဏ",
 	"label.heading.cbid": "ခရစ်ဒစ်ဗျူရိုအိုင်ဒီ",
 	"label.heading.country": "နိုင်ငံ",
 	"label.heading.cbName": "ခရက်ဒစ်ဗျိူရိုအမည်",
@@ -26,18 +28,18 @@
 	"label.heading.startdate": "စတင်သည့်ရက်စွဲ",
 	"label.heading.enddate": "ကုန်ဆုံးသည့်ရက်စွဲ",
 	"label.heading.is_active": "သည်_လက်ရှိဖြစ်သည်",
-	"label.heading.accnum": "အကောင့် #",
+	"label.heading.accnum": "စာရင်း #",
 	"label.heading.staff": "ဝန်ထမ်း",
 	"label.heading.office": "ရုံး",
 	"label.heading.delete": "ဖျက်",
 	"label.heading.reject": "လက်မခံပါ",
-	"label.heading.deleterole": "ကဏ္ဍကို ပယ်ဖျက်ရန်",
-	"label.heading.disablerole": "ကဏ္ဍကို ခွင့်မပြုရန်",
+	"label.heading.deleterole": "လုပ်ကိုင်ခွင့်ကို ပယ်ဖျက်ရန်",
+	"label.heading.disablerole": "လုပ်ကိုင်ခွင့်ကို ခွင့်မပြုရန်",
 	"label.heading.disabled": "ပိတ်ထားပြီး",
 	"label.heading.enabledrole": "လုပ်ခွင့်ပြုထားပြီး",
-	"label.heading.enablerole": "က႑ ခြင့္ျပဳရန္",
-	"label.heading.unassignstaff": "ဝန္ထမ္းတာဝန္ရုပ္သိမ္းရန္",
-	"label.heading.assignstaff": "ဝန္ထမ္းတာဝန္ေပးရန္",
+	"label.heading.enablerole": "လုပ်ကိုင်ခွင့် ခွင့်ပြုထားပြီး",
+	"label.heading.unassignstaff": "ဝန်ထမ်းတာဝန်ရုပ်သိမ်းရန်",
+	"label.heading.assignstaff": "ဝန်ထမ်းတာဝန်ပေးရန်",
 	"label.heading.general": "အထွေထွေ",
 	"label.heading.performancehistory": "လုပ်ဆောင်ချက် ရာဇဝင်",
 	"label.heading.settings": "အပြင်အဆင်များ",
@@ -47,7 +49,7 @@
 	"label.heading.category": "ကဏ္ဍ",
 	"label.heading.balance": "လက်ကျန်ငွေ",
 	"label.heading.viewreceipts": "ပြေစာကြည့်ရန်",
-	"label.heading.savingaccount": "ငွေစုအကောင့်",
+	"label.heading.savingaccount": "စုငွေစာရင်း",
 	"label.heading.description": "ဖော်ပြချက်",
 	"label.heading.shortname": "အမည်အတို",
 	"label.heading.approve": "အတည်ပြု",
@@ -60,30 +62,30 @@
 	"label.heading.attendance": "အစည်းအဝေးတက်ရောက်မှု",
 	"label.heading.comments": "မှတ်ချက်များ",
 	"label.heading.id": "အိုင်ဒီ",
-	"label.heading.activationdate": "စတင်သက်ဝင်ရက်စွဲ",
-	"label.heading.externalid": "ျပင္ပအိုင္ဒီ",
+	"label.heading.activationdate": "အတည်ပြုရက်စွဲ",
+	"label.heading.externalid": "ပြင်ပအိုင်ဒီ",
 	"label.heading.summary": "အကျဉ်းချုပ်",
 	"label.heading.products": "ထုတ်ကုန်",
 	"label.heading.branch": "ရုံးခွဲ",
 	"label.heading.notes": "မှတ်ချက်များ",
-	"label.heading.closedaccount": "ပိတ္သည့္ စာရင္း",
+	"label.heading.closedaccount": "ပိတ်ထားသည့်စာရင်း",
 	"label.heading.transactiondate": "လုပ္ေဆာင္သည့္ရက္",
-	"label.heading.account": "စာရင္း",
-	"label.heading.debit": "ၿမီစား",
-	"label.heading.credit": "အေၾကြး၊ ေခ်းေငြ၊ ဘဏ္စာရင္းရွိေငြ၊ ဘဏ္သြင္းေငြ၊ ၿမီရွင္စာရင္း",
+	"label.heading.account": "စာရင်း",
+	"label.heading.debit": "မြီစား",
+	"label.heading.credit": "အကြွေး၊ ချေးငွေ၊ ဘဏ်စာရင်းရှိငွေ၊ ဘဏ်သွင်းငွေ၊ မွီရှင်",
 	"label.heading.updatedby": "ေဖာ္ျပပါရက္မတိုင္မီ update လုပ္ရန္",
 	"label.heading.updatedon": "Update ျပဳလုပ္သည့္ရက္",
 	"label.heading.error": "အမွားတက္သည္",
 	"label.heading.client": "ေငြေခ်းသူ",
 	"label.heading.accounttype": "စာရင္းအမ်ိဳးအစား",
 	"label.heading.user": "အသုံးပြုသူ",
-	"label.heading.loan": "ေခ်းေငြ",
-	"label.heading.principal": "အရင္း",
+	"label.heading.loan": "ချေးငွေ",
+	"label.heading.principal": "အရင်း",
 	"label.heading.amount": "ပမာဏ",
-	"label.heading.date": "ရက္စြဲ",
+	"label.heading.date": "ရက်စွဲ",
 	"label.heading.transactiontype": "လုပ္ငန္းလုပ္ေဆာင္မႈအမ်ိဳးအစား",
-	"label.heading.due": "က်သင့္ေငြ",
-	"label.heading.paid": "ေပးၿပီးေငြ",
+	"label.heading.due": "ကျသင့်ငွေ",
+	"label.heading.paid": "ပေးပြီးငွေ",
 	"label.heading.waived": "ကင္းလြတ္ေပးသည့္ေငြ",
 	"label.heading.outstanding": "က်န္ရွိေငြ",
 	"label.heading.installmentamount": "အရစ္က်ေပးေခ်မႈပမာဏ",
@@ -190,6 +192,7 @@
 	"label.input.firstname": "ပထမအမည္",
 	"label.input.lastname": "မိသားစု/မ်ိဳးႏြယ္အမည္",
 	"label.input.middlename": "အလယ္အမည္",
+	"label.input.qualification": "အရည်အချင်း",
 	"label.input.mobileNumber": "မိုဘိုင်းဖုန်းနံပါတ်",
 	"label.input.age": "အသက်",
 	"label.input.isDependent": "အမှီအခို ဖြစ်ပါသလား?",
@@ -252,6 +255,8 @@
 	"label.input.triggerType": "Trigger ပုံစံ",
 	"label.input.businessRule": "စီးပြားေရးစည္းမ်ဥ္း",
 	"label.input.campaignMessage": "လႈပ္ရွားမႈအတြက္စာအေၾကာင္းအရာ",
+	"label.input.isStaff": "၀န်ထမ်းဖြစ်ပါသလား။",
+	"label.nextrepaymentdate": "နောက်တစ်ကြိမ် ပြန်ဆပ်ရမည့်ရက်စွဲ",
 	"label.button.previous": "ယခင္",
 	"label.button.next": "ေနာက္တစ္ခု",
 	"label.button.save": "တင္သြင္းရန္",
@@ -336,7 +341,7 @@
 	"error.login.failed": "သင္၏သက္ေသခံအေထာက္အထားမ်ားသည္အက်ံဳးမဝင္ပါ။ ထပ္မံႀကိဳးစားၾကည့္ပါ",
 	"error.connection.failed": "ဆာဗာႏွင့္ ဆက္သြယ္၍မရပါ။ Settings အသံုးျပဳမႈ မွန္ကန္မႈရွိမရွိ ျပန္စစ္ပါ",
 	"error.msg.command.unsupported": "ပ႐ိုဂရမ္သမား၏အမွား",
-	"error.msg.query.parameter.value.unsupported": "{} ကို ေမးျမန္းမႈအတြက္ ကန္႔သတ္ခ်က္ေဘာင္ တန္ဖိုး {} အျဖစ္ သတ္မွတ္၍မရပါ",
+	"error.msg.query.parameter.value.unsupported": "`{{params[0].value}}` ကို မေးမြန်းမှုအတွက် ကန့်သတ်ချက်ဘောင် တန်ဖိုး `{{params[1].value}}` အဖြစ် သတ်မှတ်၍မရပါ။",
 	"error.msg.not.authorized": "ဤလုုပ္ေဆာင္ခ်က္ကိုု ျပဳလုုပ္ဖို႕  လံုေလာက္သည့္အထူးအခြင့္အေရးမရွိပါ",
 	"error.msg.invalid.request.body": "တောင်းဆိုချက်၌ ပေးထားသော JSON သည်မမှန်ကန်ပါ သို့မဟုတ် ပေျာက်ဆုံးနေပါသည်",
 	"error.msg.parameter.unsupported": "သတ္မွတ္ခ်က္ေဘာင္ {} သည္သတ္မွတ္ၿပီး၍ဤေတာင္းဆိုမႈမျပဳလုပ္ေပးႏိုင္ပါ",
@@ -346,13 +351,13 @@
 	"validation.msg.productivecollectionsheet.staffId.cannot.be.blank": "ဝန္ထမ္းကိုမျဖစ္မေနျဖည့္စြက္ရမည္",
 	"validation.msg.domain.rule.violation": "အမွားတြင္ domain စည္းမ်ဥ္းေဖာက္ဖ်က္မႈဆိုသည့္ အေၾကာင္းရင္းပါဝင္သည္",
 	"validation.msg.invalid.date.format": "ရက္စြဲပံုစံ အက်ံဳးမဝင္ပါ",
-	"validation.msg.invalid.month.day": "{} သည္ အက်ံဳးမဝင္သည့္ လ ရက္ ျဖစ္သည္",
+	"validation.msg.invalid.month.day": "`{{params[0].value}}` သည် မဆီလျော်သည့် လတစ်လ၏နေ့ရက်ဖြစ်သည်။",
 	"validation.msg.missing.dateFormat.parameter": "သတ်မှတ်ချက်ဘောင် `ရက်စွဲ ပုံစံ` လိုအပ်သည်။",
 	"validation.msg.missing.locale.parameter": "သတ္မွတ္ခ်က္ေဘာင္ 'တည္ေနရာ' ကိုလုိအပ္သည္",
-	"validation.msg.invalid.number.format": "{} သည္ အက်ံဳးမဝင္သည့္ ကိန္းျပည့္ ျဖစ္သည္",
-	"validation.msg.invalid.integer": "{} သည္ အက်ံဳးမဝင္သည့္ ကိန္းျပည့္ ျဖစ္သည္",
-	"validation.msg.invalid.integer.format": "{} သည္ အက်ံဳးမဝင္သည့္ ကိန္းျပည့္ ျဖစ္သည္",
-	"validation.msg.invalid.decimal.format": "{} သည္ အက်ံဳးမဝင္သည့္ ဒသမကိန္း ျဖစ္သည္",
+	"validation.msg.invalid.number.format": "`{{params[0].value}}` သည် မဆီလျော်သည့် ကိန်းပြည့်ဖြစ်သည်။",
+	"validation.msg.invalid.integer": "`{{params[0].value}}` သည် မဆီလျော်သည့် ကိန်းပြည့်ဖြစ်သည်။",
+	"validation.msg.invalid.integer.format": "`{{params[0].value}}` သည် မဆီလျော်သည့် ကိန်းပြည့်ဖြစ်သည်။",
+	"validation.msg.invalid.decimal.format": "`{{params[0].value}}` သည်မဆီလျော်သည့် ဒသမကိန်းဖြစ်သည်။",
 	"error.msg.document.file.too.big": "၅မီဂါဘိုက္ထက္ႀကီးသည္ဖိုင္ကိုတင္ခြင့္မျပဳပါ",
 	"validation.msg.document.fileName.cannot.be.blank": "ဖိုင္တစ္ခုေရြးခ်ယ္ပါ",
 	"validation.msg.document.name.cannot.be.blank": "စာရြက္စာတမ္းအမည္ကိုျဖည့္စြက္ပါ",
diff --git a/app/global-translations/locale-pt.json b/app/global-translations/locale-pt.json
index e7b5249aa7..b7808b38fe 100644
--- a/app/global-translations/locale-pt.json
+++ b/app/global-translations/locale-pt.json
@@ -580,11 +580,11 @@
 	"label.anchor.reactivate": "Reativar",
 	"label.anchor.undoReject": "Anular Rejeição",
 	"label.anchor.undoWithdrawn": "Desfazer retirada",
-	"label.input.filterbynameaccno": "Filtrar apresentação por nome/# do cliente/colaborador/escritório",
-	"label.input.searchByNameAccNo": "Buscar por nome/# do celular/# do cliente/Id externo/# identificador",
+	"label.input.filterbynameaccno": "Filtrar apresentação por nome/cliente/equipa/escritório",
+	"label.input.searchByNameAccNo": "Procurar por nome/telemóvel/cliente/Id externo/identificador",
 	"label.input.selectclientimage": "Selecione a imagem do cliente",
 	"label.input.selectfile": "Selecionar Ficheiro",
-	"label.input.documenttype": "Estado",
+	"label.input.documenttype": "Tipo de documento",
 	"label.input.uniqueidentification": "ID unico #",
 	"label.input.mobilenumber": "Número de telemóvel",
 	"label.input.client.activationdate": "Data De Activação",
@@ -1279,7 +1279,7 @@
 	"label.input.city": "Cidade",
 	"label.input.zip": "Zip",
 	"label.input.mobile": "TeleMóvel",
-	"label.input.residence": "Residência",
+	"label.input.residence": "Telefone residencial #",
 	"label.input.purpose": "Propósito",
 	"label.input.syncrepaymentswithmeeting": "Sincronização de pagamentos com a reunião",
 	"label.input.syncdisbursementdatewithmeeting": "Sincronização Data de desembolso com reunião",
@@ -1600,7 +1600,7 @@
 	"label.heading.routingcode": "Código de roteamento",
 	"label.heading.receiptnumber": "N.º do recibo",
 	"label.heading.banknumber": "N.º do banco",
-	"label.heading.savingapplication": "Solicitação de poupança",
+	"label.heading.savingapplication": "Nova solicitação de poupança",
 	"label.heading.repaymentsevery": "Reembolsos a cada",
 	"label.heading.fieldofficer": "Agente de campo",
 	"label.heading.accountdetail": "Detalhe da conta",
diff --git a/app/global-translations/locale-qqq.json b/app/global-translations/locale-qqq.json
index af0cca4c43..b1626b934b 100644
--- a/app/global-translations/locale-qqq.json
+++ b/app/global-translations/locale-qqq.json
@@ -12,17 +12,19 @@
 			"Alber85",
 			"Verdy p",
 			"Vandasay",
-			"NeverBehave"
+			"NeverBehave",
+			"Андрей"
 		]
 	},
 	"label.heading.name": "{{Identical|Name}}",
 	"label.heading.alias": "{{Identical|Alias}}",
 	"label.heading.country": "{{Identical|Country}}",
+	"label.heading.stale_period": "stale_period",
 	"label.heading.startdate": "{{Identical|Start date}}",
 	"label.heading.accnum": "{{Identical|Account}}",
 	"label.heading.staff": "{{Identical|Staff}}",
-	"label.heading.office": "{{Identical|Office}}",
-	"label.heading.delete": "{{Identical|Delete}}",
+	"label.heading.office": "Аофис",
+	"label.heading.delete": "Ианыхтәуп",
 	"label.heading.reject": "{{Identical|Reject}}",
 	"label.heading.deleterole": "Mifos:X-label.heading.provisioningliabilityaccount/qqq",
 	"label.heading.disablerole": "Disable Role",
@@ -46,16 +48,16 @@
 	"label.heading.actions": "{{Identical|Action}}",
 	"label.heading.loanaccoverview": "Loan Account Overview",
 	"label.heading.members": "{{Identical|Member}}",
-	"label.heading.confirm": "{{Identical|Confirm}}",
+	"label.heading.confirm": "Ишьақәырӷәӷәатәуп",
 	"label.heading.attendance": "{{Identical|Attendance}}",
 	"label.heading.comments": "{{Identical|Comment}}",
-	"label.heading.id": "{{Identical|ID}}",
+	"label.heading.id": "ID",
 	"label.heading.activationdate": "{{Identical|Activation date}}",
 	"label.heading.externalid": "{{Identical|External ID}}",
 	"label.heading.summary": "{{Identical|Summary}}",
 	"label.heading.products": "{{Identical|Product}}",
 	"label.heading.branch": "{{Identical|Branch}}",
-	"label.heading.notes": "{{Identical|Note}}",
+	"label.heading.notes": "Азгәаҭақәа",
 	"label.heading.closedaccount": "{{Identical|Closed account}}",
 	"label.heading.transactiondate": "{{Identical|Transaction date}}",
 	"label.heading.account": "{{Identical|Account}}",
@@ -66,7 +68,7 @@
 	"label.heading.error": "{{Identical|Error}}",
 	"label.heading.client": "{{Identical|Client}}",
 	"label.heading.accounttype": "{{Identical|Account type}}",
-	"label.heading.user": "{{Identical|User}}",
+	"label.heading.user": "Ахархәаҩ",
 	"label.heading.loan": "{{Identical|Loan}}",
 	"label.heading.principal": "{{Identical|Principal}}",
 	"label.heading.amount": "{{Identical|Amount}}",
@@ -83,7 +85,9 @@
 	"label.heading.next": "See also:\n* {{msg-mifos|X-label.heading.prev}}",
 	"label.heading.prev": "See also:\n* {{msg-mifos|X-label.heading.next}}",
 	"label.heading.provisioningcategory": "{{Identical|Category}}",
-	"label.heading.provisioningpercentage": "{{Identical|Percentage}}",
+	"label.heading.minimumage": "Иминималу Ақәра",
+	"label.heading.maximumage": "Имаксималу Ақәра",
+	"label.heading.provisioningpercentage": "Апроцент",
 	"label.heading.provisioningliabilityaccount": "",
 	"label.input.between": "{{Identical|Between}}",
 	"label.heading.count": "{{Identical|Count}}",
diff --git a/app/global-translations/locale-zh_CN.json b/app/global-translations/locale-zh_CN.json
index abbd91bdad..6617533dfd 100644
--- a/app/global-translations/locale-zh_CN.json
+++ b/app/global-translations/locale-zh_CN.json
@@ -1342,6 +1342,7 @@
 	"label.selectfromdate": "从日期中选择",
 	"label.selecttodate": "选择日期",
 	"label.tooltip.overpaymentliability": "记入多付款项目，并记入发生在客户端退款的债务账户。",
+	"label.tooltip.frequencytorecalculate": "一旦客户做出了高级还款，他的未偿债款原则上可能会每周、每半月、每月或每季度重新计算一次，从而使每周、每半月、每月未偿债款降低到平衡。",
 	"label.tooltip.frequencytocompounding": "组合利息/费用的频率可以为每周、每半个月、每月或每季度，从而增加未偿还余额",
 	"label.tooltip.loanProduct.active": "活跃",
 	"label.tooltip.loanProduct.inActive": "不活跃",
@@ -1349,6 +1350,7 @@
 	"label.tooltip.loanproduct.decimalplaces": "要用于追踪并报告贷款的小数位的数字。",
 	"label.tooltip.loanproduct.canUseForTopup": "如果选择，贷款产品可被用于申请充满贷款。",
 	"label.tooltip.days": "由贷款产品而定",
+	"label.tooltip.arearstolerance": "通过“拖欠宽容”，您可以指定宽容金额，并且如果贷款超期（存在拖欠），但在宽容金额内，它将不会被归类为“超期”以及风险公文包之一。",
 	"label.tooltip.daysinmonth": "月内天数。",
 	"label.tooltip.deleteInstruction": "删除委付款项",
 	"label.tooltip.viewInstruction": "查看委付款项",
diff --git a/app/global-translations/locale-zh_TW.json b/app/global-translations/locale-zh_TW.json
index 886f78e092..7a29d3d2e0 100644
--- a/app/global-translations/locale-zh_TW.json
+++ b/app/global-translations/locale-zh_TW.json
@@ -149,7 +149,7 @@
 	"label.heading.approvedshares": "已核准股份",
 	"label.heading.pendingforapproval": "待核准股份",
 	"label.heading.purchasedsharesoverview": "交易概要",
-	"label.heading.purchasedorredeemedprice": "購買/贖回價格",
+	"label.heading.purchasedorredeemedprice": "申購/贖回價格",
 	"label.heading.linkedsavingsaccountnumber": "連結儲蓄帳戶（股利過帳）",
 	"label.heading.applyadditionalshares": "申請額外股份",
 	"label.heading.approveadditionalshares": "核准額外股份",
@@ -321,13 +321,13 @@
 	"label.createdby": "建立由",
 	"label.createdon": "建立在",
 	"label.areyousure": "您確定嗎？",
-	"label.requiredfield": "必填欄位",
+	"label.requiredfield": "必要欄位",
 	"label.edit": "編輯",
 	"label.all": "全部",
 	"currency.USD": "美元",
 	"currency.KES": "肯亞先令",
 	"label.selectone": "選擇其一",
-	"label.requirefield": "必填欄位",
+	"label.requirefield": "必要欄位",
 	"label.none": "無",
 	"label.savesuccessfully": "儲存成功",
 	"label.nodatafound": "未找出與所輸入搜尋參數的關聯資料。",
@@ -1417,6 +1417,7 @@
 	"label.tooltip.receivableinterest": "用於應計利息的資產帳戶",
 	"label.tooltip.receivablefees": "用於應計佣金的資產帳戶",
 	"label.tooltip.receivablepnalties": "用於應計罰款的資產帳戶",
+	"label.tooltip.transfersinsuspense": "追蹤在轉移貸款投資組合的資產帳戶會被用作為暫記帳戶",
 	"label.tooltip.incomefrominterest": "利息支付期間收入帳戶為貸記。",
 	"label.tooltip.incomefromfees": "當有佣金透過此帳戶持有者支付時，收入帳戶為貸記",
 	"label.tooltip.incomefrompenalties": "當有罰款透過此帳戶持有者支付時，收入帳戶為貸記",
@@ -1424,13 +1425,18 @@
 	"label.tooltip.loseswrittenoff": "支出帳戶在本金註銷時為借記（另外在基於帳目的利息、佣金，與收益情況下的罰款註銷也為借記。）",
 	"label.tooltip.overpaymentliability": "在超額償付以及向客戶退款時，負債帳戶為貸記。",
 	"label.tooltip.recalculateinterest": "若您想要重新計算任一基於未償月份/週份週期裡的利息，就請勾選。一旦您勾選後，這會顯示出原先隱藏住用來重新計算利息的欄位。",
+	"label.tooltip.interestrecalculation": "若您未做選擇的話，在下一次週期（月份或週份）僅會計算在本金上的利息。若您選擇佣金，在下一次週期會重新計算本金上利息 + 佣金。若您選擇利息，在下一次週期會重新計算本金上的利息 + 利息。若您選擇「佣金與利息」，在下一次週期會重新計算本金上的利息 + 利息 + 佣金",
 	"label.tooltip.advancepayments": "下一次分期付款無論客戶是否做出進階支出，我們都會減少每月等額分期付款的金額或是數目。否則的話，我們會重新安排下一次的還款。",
 	"label.tooltip.precloseinterestcalculationstrategy": "當有預期終止請求時，方針會套用在利息計算上。",
 	"label.tooltip.frequencytorecalculate": "一旦客戶有做出進階還款，對方的未償本金會在基於週、隔週、月，或是每季時間來重新計算。另外餘款也會基於週、隔週、月，或是每季時間來減少。",
+	"label.tooltip.frequencyInterval": "此欄位會伴隨「用於在重新計算未償本金的頻率」。例如：選擇區間為 1 以及頻率為月份時，這將會讓餘款於每月計算（減少）。",
 	"label.tooltip.frequencydate": "減少餘款的日期會被用來計算。",
 	"label.tooltip.frequencytocompounding": "用於複利/佣金的週期可以隨增加餘款為週、隔週、月，或是季",
+	"label.tooltip.frequencycompoundinginterval": "此欄位會伴隨「用於在未償本金複利的頻率」。例如：選擇區間為 1 以及頻率為月份時，這將會讓餘款於每月計算（增加）。",
 	"label.tooltip.frequencycompoundingdate": "增加餘款的日期會被用來計算。",
+	"label.tooltip.numberofdays": "一旦超過此欄位所輸入的天數時貸款會成為拖欠狀態。若此欄位留空，貸款會在未取得所安排的支付後成為拖欠狀態。",
 	"label.tooltip.maxNumberofDays": "一旦超過此欄位所輸入的天數時貸款會成為不良資產（Non performing asset、NPA）。若此欄位留空，貸款會在未取得所安排的支付後成為不良資產。",
+	"label.tooltip.isMultiDisburseLoan": "若貸款為單一支出貸款，不必勾選此方框；若貸款為多樣支出貸款，則勾選此方框。請查看在於此類型貸款之所需額外欄位的額外訊息。",
 	"label.tooltip.maxtranchecount": "貸款帳戶所允許的最大支出次數",
 	"label.tooltip.maxAllowedOutstandingBalance": "在此時間點所允許的最大未償貸款帳戶結餘。",
 	"label.tooltip.loanProduct.active": "有效",
@@ -1456,17 +1462,23 @@
 	"label.tooltip.loanproduct.variableinstallments": "這些欄位用來定義用於貸款產品的分期付款中最小與最大間隔",
 	"label.tooltip.loanproduct.canUseForTopup": "若有選擇，貸款產品可用來套用在追加貸款。",
 	"label.tooltip.product": "貸款產品名稱為貸款帳戶所依據",
+	"label.tooltip.loanofficer": "金融機構代表著為與貸款帳戶相關聯的客戶/群組負責以及往來",
+	"label.tooltip.loanpurpose": "提供有關所提供基金如何透過貸款來導向，以及使用在有相同報告目的群組貸款之指示",
 	"label.tooltip.submittedon": "貸款帳戶申請日期已接收",
 	"label.tooltip.disbursementon": "貸款帳戶預計支付的日期",
 	"label.tooltip.externalid": "提供貸款帳戶的外部 ID",
 	"label.tooltip.firstrepaymenton": "可輸入覆蓋系統將安排的日期",
 	"label.tooltip.interestchargedfrom": "可輸入覆蓋系統將開始收取利息的日期",
+	"label.tooltip.moratorium": "如果本金支付為「6」且客戶的還款頻率為「每月」，則客戶在前六個月僅需支付利息（在過了前六個月後才會需要支付本金金額）。",
 	"label.tooltip.days": "依貸款產品設定",
 	"label.tooltip.repaidevery": "這些欄位被輸入來計算貸款帳戶的還款安排以及判斷支付何時到期。",
 	"label.tooltip.amortization": "輸入分期償還值來計算支付貸款還款的金額。",
 	"label.tooltip.interest": "輸入利息方法值來計算支付貸款還款的金額。",
 	"label.tooltip.repaymentstrategy": "還款方針決定了任一支付部份的順序。",
-	"label.tooltip.interestcalculationperiod": "每日 - 會用來計算基於每日的利息，例如：共有 28 天的二月會計算 28 天裡的利息，如同還款週期 - 會用於計算即 30 天的當月。",
+	"label.tooltip.interestcalculationperiod": "每日 - 用來計算基於每日的利息，例如：共有 28 天的二月裡，會計算 28 天裡的利息。同還款週期 - 用來計算當月（即 30 天）。",
+	"label.tooltip.allowpartialperiodinterestcalcualtion": "與「同還款週期」使用 - 用於來計算部份週期裡的準確利息，例如：利息是在 4 月 5 日裡索取時，本金為 10000 以及每月利息為 1% 的情況下，利息會是（10000 * 1%）*（25 / 30），這是會先從月份開始，然後從起始日期與結束日期之間的準確範圍做計算（可以是小數）。",
+	"label.tooltip.interestfreeperiod": "如果無息週期為「4」且客戶的還款頻率為「每週」，則客戶在前四週不需支付利息（在過了前四週後才會需要支付利息）。",
+	"label.tooltip.arearstolerance": "在「拖欠寬限」下，若貸款遲滯時（拖欠）您可以指定寬限金額。但當在寬限時，這不會被歸類為「拖欠」以及風險投資組合的一部份。",
 	"label.tooltip.daysinyear": "設定用來計算利息的一年天數",
 	"label.tooltip.daysinmonth": "月內天數。",
 	"label.tooltip.deleteInstruction": "刪除常行指示",
@@ -1481,19 +1493,23 @@
 	"label.tooltip.csi.fromAccount": "帳戶名稱 - 基金來源的編號。",
 	"label.tooltip.csi.destination": "目標可以是俱有初始帳戶（持有帳戶）的相同客戶，或是其它金融機構的客戶。",
 	"label.tooltip.csi.toOffice": "目標帳戶所在的營業處。",
+	"label.tooltip.csi.toClient": "持有目標帳戶的客戶會在目標為持有帳戶之情況下，由系統所填入。如果目標是在銀行的情況下，則為必要項目。",
 	"label.tooltip.csi.toaccountType": "用於目標帳戶的帳戶類型。帳戶類型清單將會僅顯示有效帳戶類型。",
 	"label.tooltip.csi.toAccount": "目標帳戶名稱 - 號碼。",
 	"label.tooltip.csi.standinginstructiontype": "常行指示類型設定支付金額為各轉移的固定金額，或是若有貸款還款時在轉移日期的到期金額。",
 	"label.tooltip.csi.amount": "若常行指示類型為固定，金額欄位會被填充。若類型為應付，欄位則會留空。",
 	"label.tooltip.csi.validity-from-to": "請提供讓常行指示有效的起始日期，也可另外提供會使常行指示過期的結束日期。",
+	"label.tooltip.csi.recurrence-type": "要聯繫基金轉移循環與貸款帳戶還款安排，請選擇各個應付循環。要為基金轉移建立獨立安排，選擇週期性循環。",
 	"label.tooltip.csi.interval": "在區間欄位的值為數字，並且與循環頻率欄位的值一同使用來設定基金轉移方面安排。",
 	"label.tooltip.csi.recurrence-frequency": "這會與區間欄位的值一同用於在設定基金轉移上的安排。",
+	"label.tooltip.csi.on-month-day": "作為每月轉移之循環頻率與區間的替代時，需指定月份裡的日期。",
 	"label.tooltip.floatingratename": "浮動率方案的唯一名稱。",
 	"label.tooltip.isBaseLendingRate": "檢查此浮動率方案是否被視為用於組織的基本借貸率",
 	"label.tooltip.isActive": "檢查此浮動率方案是否被生效",
 	"label.tooltip.rateperiods": "用於此浮動率方案的浮動利率與起始日期",
 	"label.tooltip.floatingfromdate": "利息生效開始日期",
 	"label.tooltip.floatigannualinterest": "年度利率",
+	"label.tooltip.floatingisdifferential": "若有勾選的話，所提及利率會被添加在此週期開始日期的基本借貸率上，否則絕對",
 	"loanTransactionType.disbursement": "支出",
 	"loanTransactionType.repayment": "還款",
 	"loanTransactionType.waiver": "免除利息",
@@ -1553,6 +1569,7 @@
 	"validation.msg.loan.interestChargedFromDate.must.be.entered.when.using.repayments.startfrom.field": "當已提供用於還款的起始日期時，開始索取利息的日期不可留空。",
 	"validation.msg.loan.inArrearsTolerance.not.zero.or.greater": "拖欠寬限必須大於或等於零。",
 	"validation.msg.loan.submittedOnDate.cannot.be.blank": "需提供提交日期",
+	"validation.msg.loan.charges.specific.loancharge.with.calculation.type.interest.not.allowed": "指定的利息以 % 之到期日費用不可用在支援利息重新計算產品上",
 	"validation.msg.loan.charges.installment.loancharge.with.calculation.type.principal.not.allowed": "作為 % 本金分期付款費用不可用於支援利息重新計算產品",
 	"validation.msg.loan.numberOfRepayments.lesser.than.minimumNumberOfRepayments": "此貸款的已計算還款次數總計（「{{params[0].value}}」）小於所允許最小值「{{params[1].value}}」",
 	"validation.msg.loan.numberOfRepayments.greater.than.maximumNumberOfRepayments": "此貸款的已計算還款次數總計（「{{params[0].value}}」）大於所允許最大值「{{params[1].value}}」",
@@ -1749,8 +1766,8 @@
 	"label.heading.activateshareaccount": "生效股份帳戶",
 	"label.heading.undoapproveshareaccount": "撤銷核准股份帳戶",
 	"label.heading.requesteddate": "請求日期",
-	"label.heading.approvesharespurchase": "准許股份購買請求",
-	"label.heading.rejectsharespurchase": "駁回股份購買請求",
+	"label.heading.approvesharespurchase": "准許股份申購請求",
+	"label.heading.rejectsharespurchase": "駁回股份申購請求",
 	"label.heading.initiatedividend": "發起股利",
 	"label.heading.closeshareaccount": "關閉股份帳戶",
 	"label.anchor.addsavingcharges": "新增儲蓄費用",
@@ -1852,6 +1869,7 @@
 	"label.button.addcharge": "新增費用",
 	"label.button.undoapproval": "撤銷核准",
 	"label.button.deposit": "存款",
+	"label.button.postInterestAsOn": "發佈利息如同於",
 	"label.button.withdraw": "撤回",
 	"label.button.calculateInterest": "利息計算",
 	"label.button.postInterest": "發佈利息",
@@ -1937,7 +1955,7 @@
 	"label.tooltip.sharesperclient": "這些欄位用來定義各顧客的最少、預設，與最多股份",
 	"label.tooltip.minimumactiveperiod": "用於股利計算的最小有效週期",
 	"label.tooltip.suspenseaccount": "在核准之前股份金額會保留在此暫記帳戶",
-	"label.tooltip.equityaccount": "股本帳戶當股份購買核准時為借記",
+	"label.tooltip.equityaccount": "股本帳戶當股份申購核准時為借記",
 	"label.tooltip.allowdividendsforinactiveclients": "允許用於失效客戶的股利",
 	"label.tooltip.marketprice": "各股份價格",
 	"label.tooltip.interestpostingperiod": "利率發佈或貸記至一個儲蓄帳戶時的週期",
@@ -1954,10 +1972,14 @@
 	"label.tooltip.minoverdraftforinterestcalculation": "設定用於利息計算的所需透支",
 	"label.tooltip.savingreference": "資產帳戶（一般情況是現金帳戶）會在透過帳戶擁有者做出存款時為借記；會在帳戶擁有者做出提款時為貸記。",
 	"label.tooltip.overdraftprotfolio": "資產帳戶（一般情況是現金帳戶）會在客戶弄出透支提款時增加",
+	"label.tooltip.savingcontrol": "代表著儲蓄存款帳戶投資組合的負債帳戶在存款成立時為貸記；提款時為借記",
 	"label.tooltip.interestonsavings": "當利息到期要支付給顧客時，支出帳戶為借記",
 	"label.tooltip.Writeoffoverdraft": "支出帳戶會在客戶尚未還款透支結餘時增加金額",
 	"label.tooltip.incomefromoverdraftinterest": "收入帳戶會在客戶支付透支利息時產生收入",
+	"label.tooltip.savingsuspense": "追蹤在轉移貸款投資組合的資產帳戶會被用作為暫記帳戶",
 	"label.tooltip.withholdtax": "附加稅務在利息過帳的布林值標籤",
+	"label.tooltip.sharereference": "資產帳戶（一般情況是現金帳戶）會在透過帳戶擁有者做出新的股份申購時為借記；會在帳戶擁有者做出贖回時為貸記。",
+	"label.tooltip.sharecontrol": "代表著股份存款帳戶投資組合的負債帳戶在股份申購核准時為借記；股份申購駁回時回貸記",
 	"label.tooltip.fixeddepositproduct.defaultamount": "在此定期存款產品的帳戶為開啟時的預期預設存款金額。",
 	"label.tooltip.fixeddepositproduct.minimumamount": "在開啟此定期存款產品的帳戶時需最小存款金額。",
 	"label.tooltip.fixeddepositproduct.maximumamount": "最大存款金額在此定期存款產品的帳戶為開啟時允許。",
@@ -1965,6 +1987,7 @@
 	"label.tooltip.fixeddepositproduct.postingperiod": "在發佈利率或是貸記基於此定期存款產品之帳戶的週期。",
 	"label.tooltip.fixeddepositproduct.calcmethod": "使用在計算利息的方法。",
 	"label.tooltip.fixeddepositproduct.daysinyear": "設定用來計算利息的一年天數。",
+	"label.tooltip.fixeddepositproduct.lockinperiod": "在此開啓之後，基於此定期存款產品之帳戶的週期期間裡將會被鎖定。",
 	"label.tooltip.fixeddepositproduct.minimumterm": "基金保留在存款帳戶來賺取完整利息收入的最小時間長度。",
 	"label.tooltip.fixeddepositproduct.maximumterm": "基金存於基於定期存款產品的帳戶之最大時間長度。",
 	"label.tooltip.fixeddepositproduct.termmultiplesof": "在通過最小存款期限結束後，需指定額外的存款期間。",
@@ -2662,12 +2685,14 @@
 	"label.tooltip.global.min-clients-in-group": "決定在群組裡客戶的最小數量。",
 	"label.tooltip.global.office-opening-balances-contra-account": "啟動此來協助所給予組織在總帳（General Ledger、GL）結餘方面的設定。",
 	"label.tooltip.global.office-specific-products-enabled": "決定是否啟用營業處指定產品。",
+	"label.tooltip.global.organisation-start-date": "在啟動並提供組織起始日期時，所有計算都會從該日期生效。若您想要使用帳目模組，建議啟動此項目。您可以從資料庫裡的「c_configuration」表格中，在有關日期值的行列裡提供起始日期來做設定。",
 	"label.tooltip.global.paymenttype-applicable-for-disbursement-charges": "決定可用於支出費用的支付類型。",
 	"label.tooltip.global.penalty-wait-period": "定義期限天數。定義逾期罰款在被索取前會有多少個天數逾期。",
 	"label.tooltip.global.reschedule-future-repayments": "如果啟動，落於非工作日的還款會被按照已設置規則來重新安排。",
 	"label.tooltip.global.reschedule-repayments-on-holidays": "決定是否重新安排發生在假日裡的還款。",
 	"label.tooltip.global.restrict-products-to-user-office": "啟動此項目會協助在指定營業處的使用者於產品上的限制。",
 	"label.tooltip.global.rounding-mode": "啟動此項目可讓金額進位功能運作。可用的值為：0 - 進位到較高值、1 - 捨去到較低值、2 - 無條件進位、3 - 無條件捨去（向零靠攏）、4 - 最近數字進位、5 - 最近數字捨去、6 - 最近數字取偶數",
+	"label.tooltip.global.savings-interest-posting-current-period-end": "此項目建議僅在於作業一開始時變動。當設定為「否」（此為預設值）時，利息會在下一次週期裡的開頭日期發佈；若設定為「是」時，利息會在目前週期裡的最後一個日期發佈。這在利息金額發佈裡並無差別。",
 	"label.tooltip.global.skip-repayment-on-first-day-of-month": "決定出現在每月第一天的還款是否可忽略。",
 	"label.heading.addproductmix": "新增產品組合",
 	"label.heading.editproductmix": "編輯產品組合",
@@ -2990,7 +3015,7 @@
 	"chargeTimeType.annualFee": "年費",
 	"chargeTimeType.monthlyFee": "月費",
 	"chargeTimeType.activation": "股份帳戶生效",
-	"chargeTimeType.sharespurchase": "股份購買",
+	"chargeTimeType.sharespurchase": "股份申購",
 	"chargeTimeType.sharesredeem": "股份贖回",
 	"chargeTimeType.instalmentFee": "分期付款佣金",
 	"chargeTimeType.overdueInstallment": "逾期佣金",
@@ -3689,6 +3714,8 @@
 	"label.heading.cashmgmt.cashier.txnDetails": "詳情",
 	"label.heading.cashmgmt.cashier.txnTotals": "總計",
 	"label.heading.cashmgmt.cashier.txnAmountAlloc": "分配",
+	"label.heading.cashmgmt.cashier.txnAmountCashIn": "現金流入",
+	"label.heading.cashmgmt.cashier.txnAmountCashOut": "現金兌現",
 	"label.heading.cashmgmt.cashier.txnAmountSettle": "結算",
 	"label.heading.cashmgmt.cashier.netAmount": "淨",
 	"label.input.cashiername": "收款員",
@@ -3807,6 +3834,8 @@
 	"Aging Summary (Arrears in Weeks)": "帳齡摘要（在週內的拖欠）",
 	"Aging Summary (Arrears in Weeks)(Pentaho)": "帳齡摘要（在週內的拖欠）（Pentaho）",
 	"Branch Expected Cash Flow": "分部預期現金流",
+	"Branchwise Loan Summary": "分部方面貸款摘要",
+	"Daily Loan Officer Wise Loan Summary": "每日信貸員方面貸款摘要",
 	"Expected Payments By Date - Basic": "按日期的預計支付 - 基本",
 	"Expected Payments By Date - Basic(Pentaho)": "按日期的預計支付 - 基本（Pentaho）",
 	"Expected Payments By Date - Formatted": "按日期的預計支付 - 已編排",
diff --git a/app/views/products/createfixeddepositproduct.html b/app/views/products/createfixeddepositproduct.html
index dd3198ab53..6784403eec 100755
--- a/app/views/products/createfixeddepositproduct.html
+++ b/app/views/products/createfixeddepositproduct.html
@@ -427,7 +427,6 @@ <h3>{{ 'label.heading.interestchart' | translate }}
                                             | translate}}</a>
                                     </div>
                                 </td>
-                                <td>&nbsp;</td>
                             </tr>
 
                             <tr ng-repeat="chartSlab in chart.chartSlabs">
diff --git a/app/views/products/createrecurringdepositproduct.html b/app/views/products/createrecurringdepositproduct.html
index 8e940c1777..897e17cbc4 100755
--- a/app/views/products/createrecurringdepositproduct.html
+++ b/app/views/products/createrecurringdepositproduct.html
@@ -1143,7 +1143,6 @@ <h3 class="bolder">{{'label.heading.customerattributes' | translate}}</h3>
                                 | translate}}</a>
                         </div>
                     </td>
-                    <td>&nbsp;</td>
                 </tr>
                 <tr ng-repeat="incentiveData in chartSlab.incentives">
                     <td>
diff --git a/app/views/products/editfixeddepositproduct.html b/app/views/products/editfixeddepositproduct.html
index 9e81c3945a..c08b9dc62d 100755
--- a/app/views/products/editfixeddepositproduct.html
+++ b/app/views/products/editfixeddepositproduct.html
@@ -602,7 +602,6 @@ <h3 class="bolder">{{'label.heading.customerattributes' | translate}}</h3>
                             | translate}}</a>
                     </div>
                 </td>
-                <td>&nbsp;</td>
             </tr>
             <tr ng-repeat="incentiveData in chartSlab.incentives">
                 <td>
diff --git a/app/views/products/editrecurringdepositproduct.html b/app/views/products/editrecurringdepositproduct.html
index 98c9bd28c9..0698b65696 100755
--- a/app/views/products/editrecurringdepositproduct.html
+++ b/app/views/products/editrecurringdepositproduct.html
@@ -353,7 +353,6 @@ <h3>{{ 'label.heading.interestchart' | translate }}</h3>
                         | translate}}</a>
                 </div>
             </td>
-            <td>&nbsp;</td>
         </tr>
 
         <tr ng-repeat="chartSlab in chart.chartSlabs">
@@ -651,7 +650,6 @@ <h3 class="bolder">{{'label.heading.customerattributes' | translate}}</h3>
                             | translate}}</a>
                     </div>
                 </td>
-                <td>&nbsp;</td>
             </tr>
             <tr ng-repeat="incentiveData in chartSlab.incentives">
                 <td>