diff --git a/accounts/doctype/account/locale/_messages_doc.json b/accounts/doctype/account/locale/_messages_doc.json
index 1a21a6f..07dc1c7 100644
--- a/accounts/doctype/account/locale/_messages_doc.json
+++ b/accounts/doctype/account/locale/_messages_doc.json
@@ -18,6 +18,7 @@
  "Rate at which this tax is applied", 
  "Company", 
  "Credit Limit", 
+ "Rgt", 
  "Frozen", 
  "Income Account", 
  "Customer", 
@@ -27,8 +28,10 @@
  "Level", 
  "Fixed Asset Account", 
  "Expense Account", 
+ "Old Parent", 
  "Tax", 
  "Setting Account Type helps in selecting this Account in transactions.", 
+ "Lft", 
  "Rate", 
  "Credit Days", 
  "Accounts", 
diff --git a/accounts/doctype/bank_reconciliation/locale/_messages_doc.json b/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
index 8e42374..01eb6ba 100644
--- a/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
+++ b/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
@@ -1,13 +1,13 @@
 [
  "Select account head of the bank where cheque was deposited.", 
  "Update Clearance Date", 
- "Total Amount", 
+ "Company", 
  "Bank Account", 
- "Head HTML", 
  "To Date", 
  "Accounts", 
  "From Date", 
  "Entries", 
  "Get Non Reconciled Entries", 
- "Bank Reconciliation"
+ "Bank Reconciliation", 
+ "Total Amount"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/c_form/locale/_messages_doc.json b/accounts/doctype/c_form/locale/_messages_doc.json
index b94b89a..7088f70 100644
--- a/accounts/doctype/c_form/locale/_messages_doc.json
+++ b/accounts/doctype/c_form/locale/_messages_doc.json
@@ -6,6 +6,7 @@
  "Series", 
  "Company", 
  "Received Date", 
+ "Amended From", 
  "IV", 
  "II", 
  "I", 
diff --git a/accounts/doctype/journal_voucher/locale/_messages_doc.json b/accounts/doctype/journal_voucher/locale/_messages_doc.json
index 2d4d441..092f7e3 100644
--- a/accounts/doctype/journal_voucher/locale/_messages_doc.json
+++ b/accounts/doctype/journal_voucher/locale/_messages_doc.json
@@ -5,14 +5,11 @@
  "JV", 
  "eg. Cheque Number", 
  "Remark", 
- "Voucher Date", 
  "Amended From", 
  "Cancel Reason", 
  "Select Print Heading", 
  "User Remark will be added to Auto Remark", 
- "Date of entry (not posting to ledgers)", 
  "Contra Voucher", 
- "Supplier Account", 
  "Aging Date", 
  "No", 
  "Journal Voucher", 
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/locale/_messages_doc.json b/accounts/doctype/payment_to_invoice_matching_tool/locale/_messages_doc.json
index 0698b4d..cd96a13 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/locale/_messages_doc.json
+++ b/accounts/doctype/payment_to_invoice_matching_tool/locale/_messages_doc.json
@@ -1,23 +1,24 @@
 [
- "Voucher No", 
- "Account", 
- "Filter By Amount", 
- "Pull Payment Entries", 
- "Amount <=", 
- "Voucher Type", 
+ "To Date", 
  "From Date", 
+ "Pull Payment Entries", 
+ "Company", 
  "Journal Voucher", 
  "Payment to Invoice Matching Tool", 
- "Help HTML", 
- "Outstanding Amount", 
- "Amount >=", 
- "Sales Invoice", 
- "Allocate", 
- "Payment Entries", 
+ "Filter By Date", 
  "Accounts", 
- "To Date", 
- "Update allocated amount in the above table and then click \"Allocate\" button", 
  "Purchase Invoice", 
+ "Voucher Type", 
+ "Account", 
+ "Amount >=", 
+ "Amount <=", 
+ "Outstanding Amount", 
+ "Payment Entries", 
+ "Update allocated amount in the above table and then click \"Allocate\" button", 
+ "Help HTML", 
+ "Voucher No", 
+ "Filter By Amount", 
+ "Sales Invoice", 
  "Total Amount", 
- "Filter By Date"
+ "Allocate"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice/locale/_messages_doc.json b/accounts/doctype/purchase_invoice/locale/_messages_doc.json
index 8ca00e5..aeb1c5e 100644
--- a/accounts/doctype/purchase_invoice/locale/_messages_doc.json
+++ b/accounts/doctype/purchase_invoice/locale/_messages_doc.json
@@ -1,41 +1,45 @@
 [
  "Mode of Payment", 
- "Taxes and Charges Added (Import)", 
- "Net Total (Import)", 
+ "Select Items from Purchase Receipt", 
  "Contact Info", 
- "Write Off Amount", 
+ "Price List Exchange Rate", 
  "No", 
- "Bill Conversion Rate", 
+ "Price List Currency", 
  "Get Advances Paid", 
  "Calculate Tax", 
  "Totals", 
  "Supplier Address", 
+ "Net Total (Import)", 
  "Grand Total (Import)", 
  "Select Items from Purchase Order", 
  "Credit To", 
  "Supplier", 
  "Write Off Cost Center", 
- "Select Print Heading", 
+ "Currency", 
  "If not applicable please enter: NA", 
- "Net Total", 
- "Cancel Reason", 
+ "Exchange Rate", 
+ "Select Print Heading", 
  "Contact Person", 
  "File List", 
- "The date at which current entry will get or has actually executed.", 
+ "The account to which you will pay (have paid) the money to.", 
  "Advances", 
  "Aging Date", 
  "Will be calculated automatically when you enter the details", 
  "Amended From", 
- "Amendment Date", 
+ "Taxes and Charges Deducted", 
  "Get Items", 
  "Tax Calculation", 
  "Purchase Receipt", 
  "Entries", 
  "Remarks", 
  "Purchase Taxes and Charges", 
+ "Cancel Reason", 
  "Purchase Invoice", 
  "Posting Date", 
+ "Price List", 
+ "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
  "BILLJ", 
+ "Net Total", 
  "Name", 
  "Due Date", 
  "To manage multiple series please go to Setup > Manage Series", 
@@ -46,31 +50,30 @@
  "Total Advance", 
  "Taxes", 
  "Purchase Order", 
- "Fiscal Year", 
+ "Outstanding Amount", 
  "Bill No", 
  "In Words", 
  "Mobile No", 
- "Select Items from Purchase Receipt", 
- "Bill Currency", 
- "Grand Total", 
+ "Write Off Account", 
+ "Taxes and Charges Added (Import)", 
  "Add / Edit Taxes and Charges", 
  "Against Expense Account", 
  "More Info", 
  "Is Opening", 
- "Get Tax Detail", 
+ "Currency & Price List", 
  "Bill Date", 
  "Contact Email", 
- "The date at which current entry is corrected in the system.", 
+ "Write Off Amount", 
  "BILL", 
  "Total Amount To Pay", 
- "Outstanding Amount", 
+ "Fiscal Year", 
  "In Words will be visible once you save the Purchase Invoice.", 
- "The account to which you will pay (have paid) the money to.", 
- "Write Off Account", 
+ "Get Tax Detail", 
+ "The date at which current entry will get or has actually executed.", 
+ "Grand Total", 
  "Contact", 
  "Accounts", 
  "The rate at which Bill Currency is converted into company's base currency", 
- "Taxes and Charges Deducted", 
  "Series", 
  "Yes", 
  "Recalculate", 
diff --git a/buying/doctype/purchase_order/locale/_messages_doc.json b/buying/doctype/purchase_order/locale/_messages_doc.json
index 6dd71c9..b2bfac5 100644
--- a/buying/doctype/purchase_order/locale/_messages_doc.json
+++ b/buying/doctype/purchase_order/locale/_messages_doc.json
@@ -1,87 +1,92 @@
 [
- "The date at which current entry is corrected in the system.", 
- "Taxes and Charges Added (Import)", 
- "Net Total (Import)", 
- "Contact Info", 
- "No", 
- "Calculate Tax", 
- "Totals", 
- "In Words", 
- "Amendment Date", 
- "Select Terms and Conditions", 
+ "Price List Currency", 
  "Grand Total (Import)", 
- "File List", 
- "Cancel Reason", 
  "Supplier", 
- "Get Items", 
- "Select Print Heading", 
- "More Info", 
- "Select Purchase Request", 
- "Terms and Conditions HTML", 
- "Status", 
- "Letter Head", 
- "Is Subcontracted", 
- "Purchase Order Date", 
- "Contact Person", 
- "% of materials billed against this Purchase Order.", 
- "Conversion Rate", 
- "Get Terms and Conditions", 
- "Company", 
- "Supplier's currency", 
- "Amended From", 
- "Taxes and Charges Deducted", 
- "Re-Calculate Values", 
- "Tax Calculation", 
- "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
  "Required raw materials issued to the supplier for producing a sub - contracted item.", 
- "Address", 
+ "Purchase Order Date", 
+ "% of materials billed against this Purchase Order.", 
+ "Company", 
+ "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.", 
+ "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
+ "Price List", 
+ "Net Total*", 
+ "Purchase Order Items Supplied", 
+ "Taxes", 
+ "Purchase Order", 
+ "Price List Exchange Rate", 
+ "Cancelled", 
+ "Get Terms and Conditions", 
+ "Letter Head", 
+ "Currency & Price List", 
+ "More Info", 
+ "Net Total (Import)", 
+ "% Received", 
+ "Select Print Heading", 
+ "Select Purchase Request", 
+ "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
+ "Is Subcontracted", 
+ "Contact Person", 
+ "Supplier's currency", 
+ "Get Items", 
+ "File List", 
+ "Items", 
  "% of materials received against this Purchase Order", 
- "In Words will be visible once you save the Purchase Order.", 
  "In Words(Import)", 
- "Ref SQ", 
  "PO", 
  "Buying", 
  "Total Tax*", 
  "Rounded Total", 
- "Name", 
  "To manage multiple series please go to Setup > Manage Series", 
- "Items", 
- "Taxes and Charges Added", 
- "Terms and Conditions1", 
- "Submitted", 
- "Taxes", 
- "Purchase Order", 
- "% Received", 
- "Remarks", 
- "Fiscal Year", 
+ "The date at which current entry is corrected in the system.", 
+ "In Words", 
  "Contact", 
- "Stopped", 
  "Purchase Order Items", 
- "Mobile No", 
  "Select Supplier Quotation", 
- "Cancelled", 
+ "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
+ "Rate at which supplier's currency is converted to company's base currency", 
+ "Currency", 
+ "Purchase Taxes and Charges", 
+ "Yes", 
+ "Select Terms and Conditions", 
+ "No", 
+ "Calculate Tax", 
+ "Totals", 
+ "Draft", 
+ "Terms and Conditions HTML", 
+ "Status", 
+ "Cancel Reason", 
  "Terms and Conditions", 
+ "Re-Calculate Values", 
+ "Tax Calculation", 
+ "Ref SQ", 
+ "Taxes and Charges Added", 
+ "Submitted", 
+ "Taxes and Charges Added (Import)", 
+ "Stopped", 
+ "Mobile No", 
+ "Taxes and Charges Deducted", 
+ "Amendment Date", 
+ "The date at which current entry is made in system.", 
+ "Series", 
+ "Contact Info", 
+ "Supplier Address", 
+ "Exchange Rate", 
+ "Amended From", 
+ "Terms and Conditions1", 
+ "Address", 
+ "Remarks", 
+ "Taxes and Charges Deducted (Import)", 
+ "Instructions", 
+ "Name", 
+ "Fiscal Year", 
  "% Billed", 
- "Grand Total", 
  "Supplier (vendor) name as entered in supplier master", 
- "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.", 
  "Payment Terms", 
  "Raw Material Details", 
- "Net Total*", 
- "The date at which current entry is made in system.", 
- "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
  "Select the relevant company name if you have multiple companies", 
  "Get Tax Detail", 
  "Contact Email", 
- "Rate at which supplier's currency is converted to company's base currency", 
  "Get Last Purchase Rate", 
- "Purchase Order Items Supplied", 
- "Currency", 
- "Purchase Taxes and Charges", 
- "Taxes and Charges Deducted (Import)", 
- "Series", 
- "Draft", 
- "Yes", 
- "Instructions", 
- "Supplier Address"
+ "Grand Total", 
+ "In Words will be visible once you save the Purchase Order."
 ]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation/locale/_messages_doc.json b/buying/doctype/supplier_quotation/locale/_messages_doc.json
index 904d2f7..a698600 100644
--- a/buying/doctype/supplier_quotation/locale/_messages_doc.json
+++ b/buying/doctype/supplier_quotation/locale/_messages_doc.json
@@ -2,10 +2,11 @@
  "The date at which current entry is corrected in the system.", 
  "Net Total (Import)", 
  "Contact Info", 
+ "Price List Exchange Rate", 
  "No", 
  "Quotation Items", 
  "SQTN", 
- "Totals", 
+ "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
  "In Words", 
  "Amendment Date", 
  "Select Terms and Conditions", 
@@ -13,17 +14,17 @@
  "File List", 
  "Cancel Reason", 
  "Supplier", 
- "Get Items", 
+ "Supplier Address", 
  "Select Print Heading", 
  "More Info", 
  "Select Purchase Request", 
  "Terms and Conditions HTML", 
- "Status", 
- "Supplier Address", 
+ "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
+ "Exchange Rate", 
  "Is Subcontracted", 
  "Terms and Conditions", 
  "Contact Person", 
- "Conversion Rate", 
+ "Get Items", 
  "Get Terms and Conditions", 
  "Company", 
  "Supplier's currency", 
@@ -31,12 +32,13 @@
  "Letter Head", 
  "Re-Calculate Values", 
  "Tax Calculation", 
- "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
+ "Price List Currency", 
  "Address", 
  "Purchase Taxes and Charges", 
  "In Words(Import)", 
  "Buying", 
- "Total Tax*", 
+ "Price List", 
+ "Status", 
  "Rounded Total", 
  "Name", 
  "To manage multiple series please go to Setup > Manage Series", 
@@ -45,29 +47,32 @@
  "Terms and Conditions1", 
  "Submitted", 
  "Taxes", 
- "Grand Total", 
+ "Taxes and Charges Added (Import)", 
  "Fiscal Year", 
  "Contact", 
  "Stopped", 
  "Calculate Tax", 
  "Mobile No", 
  "Cancelled", 
- "Taxes and Charges Added (Import)", 
+ "Totals", 
  "Supplier (vendor) name as entered in supplier master", 
  "Taxes and Charges Deducted", 
+ "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
  "Net Total*", 
  "The date at which current entry is made in system.", 
- "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
+ "Currency & Price List", 
  "Select the relevant company name if you have multiple companies", 
  "Quotation Date", 
  "Contact Email", 
  "Rate at which supplier's currency is converted to company's base currency", 
  "Currency", 
+ "Grand Total", 
  "Get Tax Detail", 
  "Supplier Quotation", 
  "Taxes and Charges Deducted (Import)", 
  "Series", 
  "Draft", 
  "Yes", 
+ "Total Tax*", 
  "In Words will be visible once you save the Purchase Order."
 ]
\ No newline at end of file
diff --git a/controllers/locale/_messages_py.json b/controllers/locale/_messages_py.json
index 11b07c3..f59e45e 100644
--- a/controllers/locale/_messages_py.json
+++ b/controllers/locale/_messages_py.json
@@ -1,9 +1,11 @@
 [
  "then", 
- "checked", 
+ " cannot be 0", 
  "cannot be included in item's rate", 
  "should also have", 
+ "Please enter valid ", 
  "Please specify a valid", 
+ "checked", 
  "Row", 
  "is checked for", 
  "If"
diff --git a/hr/doctype/appraisal_template/locale/_messages_doc.json b/hr/doctype/appraisal_template/locale/_messages_doc.json
index 77d42f0..66a7090 100644
--- a/hr/doctype/appraisal_template/locale/_messages_doc.json
+++ b/hr/doctype/appraisal_template/locale/_messages_doc.json
@@ -4,5 +4,5 @@
  "Description", 
  "HR", 
  "Total Points", 
- "KRA Title"
+ "Appraisal Template Title"
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_template/locale/_messages_py.json b/hr/doctype/appraisal_template/locale/_messages_py.json
index 85a7b24..d7a88a7 100644
--- a/hr/doctype/appraisal_template/locale/_messages_py.json
+++ b/hr/doctype/appraisal_template/locale/_messages_py.json
@@ -1,3 +1,4 @@
 [
- "Total Points should be 100"
+ "Total (sum of) points distribution for all goals should be 100.", 
+ "Not"
 ]
\ No newline at end of file
diff --git a/hr/doctype/employee/locale/_messages_doc.json b/hr/doctype/employee/locale/_messages_doc.json
index 0bac79b..221b569 100644
--- a/hr/doctype/employee/locale/_messages_doc.json
+++ b/hr/doctype/employee/locale/_messages_doc.json
@@ -25,6 +25,7 @@
  "Rented", 
  "ESIC CARD No", 
  "Provide email id registered in company", 
+ "You can enter any date manually", 
  "HR", 
  "Gratuity LIC ID", 
  "Bank A/C No.", 
diff --git a/hr/doctype/other_income_detail/locale/_messages_doc.json b/hr/doctype/other_income_detail/locale/_messages_doc.json
index 4b80e72..cb67d82 100644
--- a/hr/doctype/other_income_detail/locale/_messages_doc.json
+++ b/hr/doctype/other_income_detail/locale/_messages_doc.json
@@ -1,10 +1,4 @@
 [
- "Other Income Detail", 
- "Under Section", 
- "Modified Amount", 
- "Actual Amount", 
  "HR", 
- "Max. Limit", 
- "Eligible Amount", 
- "Particulars"
+ "Other Income Detail"
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json b/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json
index c1b72b8..6af1e77 100644
--- a/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json
+++ b/manufacturing/doctype/production_planning_tool/locale/_messages_doc.json
@@ -5,14 +5,18 @@
  "To Date", 
  "Filter based on item", 
  "From Date", 
+ "Raise Purchase Request", 
  "Use Multi-Level BOM", 
  "Download Materials Required", 
+ "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty", 
  "Company", 
  "Get Items", 
+ "Materials Requirement Planning (MRP)", 
  "Production Plan Items", 
  "Select Sales Orders", 
  "Pull sales orders (pending to deliver) based on the above criteria", 
  "Create Production Orders", 
+ "Purchase Request For Warehouse", 
  "Pull items from Sales Order mentioned in the above table.", 
  "Production Planning Tool", 
  "Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.", 
diff --git a/projects/doctype/project/locale/_messages_doc.json b/projects/doctype/project/locale/_messages_doc.json
index 99ff7e9..a258213 100644
--- a/projects/doctype/project/locale/_messages_doc.json
+++ b/projects/doctype/project/locale/_messages_doc.json
@@ -48,5 +48,6 @@
  "Customer Group", 
  "Yes", 
  "Open", 
+ "Company", 
  "Email Id"
 ]
\ No newline at end of file
diff --git a/projects/doctype/task/locale/_messages_doc.json b/projects/doctype/task/locale/_messages_doc.json
index 17a9ecb..74bc310 100644
--- a/projects/doctype/task/locale/_messages_doc.json
+++ b/projects/doctype/task/locale/_messages_doc.json
@@ -12,7 +12,7 @@
  "File List", 
  "Actual Start Date", 
  "Expected End Date", 
- "Total Hours (Actual)", 
+ "Company", 
  "Review Date", 
  "More Details", 
  "Projects", 
diff --git a/public/js/locale/_messages_js.json b/public/js/locale/_messages_js.json
index b8668bb..5dabf93 100644
--- a/public/js/locale/_messages_js.json
+++ b/public/js/locale/_messages_js.json
@@ -25,6 +25,7 @@
  "Journal Voucher", 
  "Payment to Invoice Matching Tool", 
  "Letter Head", 
+ "Job Opening", 
  "Leave Control Panel", 
  "Authorization Rule", 
  "Workflow State", 
@@ -38,19 +39,19 @@
  "Production Order", 
  "Account", 
  "Employee Training", 
+ "Jobs Email Settings", 
  "Website Script", 
  "Sales and Purchase Return Item", 
  "Setup", 
+ "Timesheet Detail", 
  "Batch", 
- "Analysis", 
- "Cost Center", 
+ "Deduction Type", 
  "Project", 
  "Warehouse Type", 
  "SMS Center", 
  "Sales Taxes and Charges Master", 
  "DocField", 
  "Packing Slip Item", 
- "Approved by HR", 
  "GL Control", 
  "Maintenance Visit", 
  "Appraisal", 
@@ -65,7 +66,6 @@
  "Purchase Invoice", 
  "Leave Type", 
  "Sales and Purchase Return Tool", 
- "Landed Cost Master", 
  "Global Defaults", 
  "Tag", 
  "Accounts", 
@@ -89,12 +89,10 @@
  "HR", 
  "Shipping Address", 
  "Budget Distribution", 
- "System", 
  "Packing Slip", 
  "Supplier", 
  "State", 
  "Employee External Work History", 
- "Landed Cost Master Detail", 
  "Employee", 
  "Products Settings", 
  "UOM Conversion Detail", 
@@ -110,12 +108,12 @@
  "Budget Distribution Detail", 
  "Print Heading", 
  "Update Delivery Date", 
+ "Sales Email Settings", 
  "Utilities", 
- "Rejected", 
  "Website Slideshow", 
  "Profile Control", 
  "Landed Cost Wizard", 
- "Timesheet Detail", 
+ "Patch Log", 
  "Report", 
  "Sales Invoice", 
  "Website Item Group", 
@@ -163,12 +161,11 @@
  "Appraisal Template Goal", 
  "Support", 
  "Activity Type", 
- "Deduction Type", 
+ "Cost Center", 
  "Product Settings", 
  "Delivery Note Item", 
  "Company Control", 
  "Purchase Request Item", 
- "Reject", 
  "Answer", 
  "Email Settings", 
  "Holiday", 
@@ -184,15 +181,13 @@
  "Payment to Invoice Matching Tool Detail", 
  "Contact Us Settings", 
  "Expense Claim Detail", 
- "Setup Masters", 
- "Stock Ledger Entry", 
  "Communication Log", 
+ "Stock Ledger Entry", 
  "Bank Reconciliation", 
  "Salary Slip", 
  "Delivery Note Packing Item", 
  "Employment Type", 
  "Purchase Receipt Item", 
- "Pending HR Approval", 
  "Earning Type", 
  "Designation", 
  "Question", 
@@ -210,6 +205,7 @@
  "Sales Partner", 
  "Customer Issue", 
  "Feed", 
+ "Scheduler Log", 
  "Appraisal Goal", 
  "Customize Form Field", 
  "GL Mapper Detail", 
@@ -244,13 +240,12 @@
  "BOM Item", 
  "Blog", 
  "Other Income Detail", 
- "Task", 
+ "Production", 
  "Setup Control", 
  "Expense Claim Type", 
- "Approved", 
  "Website Product Category", 
  "Stock", 
- "Development", 
+ "Profile", 
  "Authorization Control", 
  "Product", 
  "Salary Manager", 
@@ -263,16 +258,17 @@
  "DocType", 
  "SMS Parameter", 
  "Maintenance Schedule", 
+ "Task", 
  "Event User", 
  "Stock Reconciliation", 
  "Purchase Receipt", 
  "Address", 
  "About Us Settings", 
+ "Job Applicant", 
  "Manufacturing", 
  "Opportunity", 
  "Customize Form", 
  "Customer", 
- "Profile", 
  "Sales Team", 
  "Top Bar Item", 
  "Custom Script", 
@@ -290,13 +286,11 @@
  "Journal Voucher Detail", 
  "Project Milestone", 
  "Purchase Order", 
- "Approve", 
  "Page", 
  "Leave Application", 
  "Stock Entry Detail", 
  "Live Chat", 
  "Item Supplier", 
- "Applied", 
  "Cross List Item Group", 
  "Company History", 
  "Website Slideshow Item", 
diff --git a/selling/doctype/lead/locale/_messages_doc.json b/selling/doctype/lead/locale/_messages_doc.json
index 0df6536..fb2e8d3 100644
--- a/selling/doctype/lead/locale/_messages_doc.json
+++ b/selling/doctype/lead/locale/_messages_doc.json
@@ -4,6 +4,7 @@
  "Contact Info", 
  "Lead", 
  "Address Line 1", 
+ "Fiscal Year", 
  "Address Line 2", 
  "Lost Reason", 
  "Blog", 
@@ -54,7 +55,7 @@
  "Contact in Future", 
  "Market Segment", 
  "Request Type", 
- "Fiscal Year", 
+ "Replied", 
  "Upper Income", 
  "Not interested", 
  "Contacted", 
diff --git a/selling/doctype/opportunity/locale/_messages_doc.json b/selling/doctype/opportunity/locale/_messages_doc.json
index 1a3132f..2c5f004 100644
--- a/selling/doctype/opportunity/locale/_messages_doc.json
+++ b/selling/doctype/opportunity/locale/_messages_doc.json
@@ -4,7 +4,7 @@
  "Contact Info", 
  "Customer's Vendor", 
  "Lead", 
- "ENQUIRY", 
+ "Customer Address", 
  "Cold Calling", 
  "Potential Sales Deal", 
  "Supplier Reference", 
@@ -19,7 +19,7 @@
  "Status", 
  "Contact Mobile No", 
  "Selling", 
- "Contact Person", 
+ "OPPT", 
  "Next Contact Date", 
  "Company", 
  "<a href=\"#Sales Browser/Customer Group\">To manage Territory, click here</a>", 
@@ -34,13 +34,11 @@
  "Customer", 
  "Opportunity From", 
  "Name", 
- "Customer Address", 
  "To manage multiple series please go to Setup > Manage Series", 
  "Items", 
  "Customer Group", 
  "Quotation Lost Reason", 
  "Submitted", 
- "ENQ", 
  "Fiscal Year", 
  "Contact", 
  "Customer Name", 
@@ -48,7 +46,7 @@
  "Cancelled", 
  "Quotation Sent", 
  "Your sales person who will contact the customer in future", 
- "Opportunity Date", 
+ "Contact Person", 
  "Amendment Date", 
  "Items which do not exist in Item master can also be entered on customer's request", 
  "The date at which current entry is made in system.", 
@@ -62,6 +60,7 @@
  "Opportunity Type", 
  "Your sales person will get a reminder on this date to contact the customer", 
  "More Info", 
+ "Opportunity Date", 
  "Contact Email", 
  "Existing Customer", 
  "Campaign"
diff --git a/setup/doctype/country/locale/_messages_doc.json b/setup/doctype/country/locale/_messages_doc.json
index a3d35b6..bee8686 100644
--- a/setup/doctype/country/locale/_messages_doc.json
+++ b/setup/doctype/country/locale/_messages_doc.json
@@ -1,5 +1,7 @@
 [
+ "Time Zones", 
  "Country", 
  "Setup", 
- "Country Name"
+ "Country Name", 
+ "Date Format"
 ]
\ No newline at end of file
diff --git a/setup/doctype/currency/locale/_messages_doc.json b/setup/doctype/currency/locale/_messages_doc.json
index 54801ce..f9428fd 100644
--- a/setup/doctype/currency/locale/_messages_doc.json
+++ b/setup/doctype/currency/locale/_messages_doc.json
@@ -1,6 +1,11 @@
 [
- "Currency", 
+ "Fraction Units", 
+ "Number Format", 
  "Setup", 
+ "Symbol", 
+ "Enabled", 
+ "Currency", 
  "Currency Name", 
+ "Fraction", 
  "**Currency** Master"
 ]
\ No newline at end of file
diff --git a/setup/doctype/global_defaults/locale/_messages_doc.json b/setup/doctype/global_defaults/locale/_messages_doc.json
index e414711..6de5c68 100644
--- a/setup/doctype/global_defaults/locale/_messages_doc.json
+++ b/setup/doctype/global_defaults/locale/_messages_doc.json
@@ -13,49 +13,61 @@
  "Purchase Receipt Required", 
  "Allow Negative Stock", 
  "Moving Average", 
+ "Accounts Frozen Upto", 
  "CGHelp", 
  "Default Valuation Method", 
- "Employee Records to be created by ", 
+ "Naming Series", 
  "Supplier Name", 
  "Default Price List Currency", 
+ "#,###.##", 
  "Stock", 
  "Default Warehouse Type", 
  "Account Info", 
+ "Maintain same rate throughout purchase cycle", 
  "Default Item Group", 
  "Default Company", 
  "Applicable only if valuation method is moving average", 
+ "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
  "Company", 
  "Date Format", 
- "Employee record is created using selected field. ", 
+ "Yes", 
  "HR", 
- "Allowance Percent", 
- "Accounts Frozen Upto", 
+ "3", 
+ "2", 
+ "5", 
+ "4", 
+ "#,##,###.##", 
  "Customer Master created by ", 
- "Employee Number", 
- "Default Currency Format", 
- "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
+ "Allowance Percent", 
+ "dd-mm-yyyy", 
+ "mm/dd/yyyy", 
  "Supplier Master created by ", 
- "Authorized Role (Frozen Entry)", 
+ "#.###,##", 
  "Credit Controller", 
- "Maintain same rate throughout purchase cycle", 
+ "SMS Sender Name", 
+ "IGHelp", 
  "Default Currency", 
  "Default Stock UOM", 
+ "Number Format", 
  "Setup", 
- "IGHelp", 
+ "6", 
  "Stock Frozen Upto", 
  "Default Currency Fraction", 
  "Customer Name", 
  "FIFO", 
  "Authourized Role (Frozen Entry)", 
+ "Employee Number", 
  "Current Fiscal Year", 
  "yyyy-mm-dd", 
- "dd-mm-yyyy", 
- "SMS Sender Name", 
+ "Employee record is created using selected field. ", 
+ "Default Currency Format", 
+ "Employee Records to be created by ", 
  "Selling", 
  "Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>", 
  "Session Expiry", 
  "Default Customer Group", 
  "TerritoryHelp", 
+ "Float Precision", 
  "Sales Order Required", 
  "Users with this role are allowed to do / modify accounting entry before frozen date", 
  "General", 
@@ -63,10 +75,11 @@
  "Global Defaults", 
  "Lacs", 
  "Accounts", 
- "Naming Series", 
+ "Authorized Role (Frozen Entry)", 
  "Raise Purchase Request when stock reaches re-order level", 
+ "######", 
  "Default Territory", 
- "Yes", 
- "mm/dd/yyyy", 
+ "# ###.##", 
+ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", 
  "Millions"
 ]
\ No newline at end of file
diff --git a/setup/doctype/notification_control/locale/_messages_doc.json b/setup/doctype/notification_control/locale/_messages_doc.json
index de6b3cb..115ea34 100644
--- a/setup/doctype/notification_control/locale/_messages_doc.json
+++ b/setup/doctype/notification_control/locale/_messages_doc.json
@@ -6,26 +6,26 @@
  "Select Transaction", 
  "Expense Claim Approved", 
  "Sales Order Message", 
- "When any of the checked transactions are \"Submitted\", an email is automatically sent to the associated \"Contact\" in that transaction, with the transaction as an attachment.", 
+ "Expense Claim Rejected", 
  "Quotation Message", 
  "Expense Claim Rejected Message", 
  "Expense Claim Approved Message", 
  "Update", 
+ "Prompt for Email on Submission of", 
  "Purchase Receipt", 
  "Delivery Note Message", 
  "Quotation", 
  "Purchase", 
- "Send automatic emails to Contacts on Submitting transactions.", 
  "Purchase Order Message", 
  "Setup", 
- "Expense Claim Rejected", 
+ "Send automatic emails to Contacts on Submitting transactions.", 
  "Purchase Order", 
+ "When any of the checked transactions are \"Submitted\", an email pop-up automatically opened to send an email to the associated \"Contact\" in that transaction, with the transaction as an attachment. The user may or may not send the email.", 
  "Expense Claim", 
  "Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.", 
  "Notification Control", 
  "Sales", 
  "Delivery Note", 
  "Sales Invoice", 
- "Send Email Automatically on Submission of", 
  "Sales Order"
 ]
\ No newline at end of file
diff --git a/startup/__init__.py b/startup/__init__.py
index adacd4c..0fd0918 100644
--- a/startup/__init__.py
+++ b/startup/__init__.py
@@ -21,10 +21,13 @@
 
 lang_names = {
 	"हिंदी": "hi",
-	"English": "en"
+	"English": "en",
+	"español": "es",
+	"français": "fr",
+	"português": "pt"
 }
 
-lang_list = ["en", "hi"]
+lang_list = ["en", "hi", "es", "fr", "pt"]
 
 product_name = "ERPNext"
 profile_defaults = {
diff --git a/stock/doctype/item/locale/_messages_doc.json b/stock/doctype/item/locale/_messages_doc.json
index 3e54ab4..92d393a 100644
--- a/stock/doctype/item/locale/_messages_doc.json
+++ b/stock/doctype/item/locale/_messages_doc.json
@@ -60,8 +60,7 @@
  "Is Asset Item", 
  "Sales Details", 
  "Standard Rate", 
- "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
- "Trash Reason", 
+ "Price Lists and Rates", 
  "Item Name", 
  "Sales Rate", 
  "No", 
@@ -86,6 +85,7 @@
  "Generates HTML to include selected image in the description", 
  "Allow Bill of Materials", 
  "Allow Production Order", 
+ "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
  "Notify by Email on Re-order", 
  "Select \"Yes\" if this item is used for some internal purpose in your company.", 
  "Description HTML", 
diff --git a/stock/doctype/item_price/locale/_messages_doc.json b/stock/doctype/item_price/locale/_messages_doc.json
index 64f7d08..333a63a 100644
--- a/stock/doctype/item_price/locale/_messages_doc.json
+++ b/stock/doctype/item_price/locale/_messages_doc.json
@@ -1,7 +1,11 @@
 [
+ "Allow this price in purchase related forms", 
+ "Price List Name", 
+ "Item Price", 
+ "For Buying", 
  "Currency", 
  "Ref Rate", 
- "Item Price", 
- "Price List Name", 
+ "For Selling", 
+ "Allow this price in sales related forms", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_wizard/locale/_messages_doc.json b/stock/doctype/landed_cost_wizard/locale/_messages_doc.json
index 4259dd6..67911ed 100644
--- a/stock/doctype/landed_cost_wizard/locale/_messages_doc.json
+++ b/stock/doctype/landed_cost_wizard/locale/_messages_doc.json
@@ -1,13 +1,11 @@
 [
- "Landed Cost Items", 
  "Update PR", 
  "Landed Cost Purchase Receipts", 
  "Process", 
  "Get Purchase Receipt", 
  "To PR Date", 
  "Currency", 
- "Get Details", 
- "Select Landed Cost Items Master", 
+ "Landed Cost Items", 
  "Landed Cost Wizard", 
  "From PR Date", 
  "Stock"
diff --git a/stock/doctype/purchase_receipt/locale/_messages_doc.json b/stock/doctype/purchase_receipt/locale/_messages_doc.json
index 4df0e7a..cbc7f2b 100644
--- a/stock/doctype/purchase_receipt/locale/_messages_doc.json
+++ b/stock/doctype/purchase_receipt/locale/_messages_doc.json
@@ -1,4 +1,5 @@
 [
+ "Price List Currency", 
  "Grand Total (Import)", 
  "In Words will be visible once you save the Purchase Receipt.", 
  "Supplier", 
@@ -7,18 +8,20 @@
  "Company", 
  "Add / Edit Taxes and Charges", 
  "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
- "LR Date", 
+ "Price List", 
  "Supplier warehouse where you have issued raw materials for sub - contracting", 
  "Taxes", 
  "Purchase Order", 
  "Purchase Receipt Item Supplieds", 
+ "Price List Exchange Rate", 
  "Cancelled", 
  "Transporter lorry number", 
  "Get Terms and Conditions", 
  "Date on which lorry started from supplier warehouse", 
- "Conversion Rate", 
+ "LR Date", 
  "Challan No", 
  "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.", 
+ "Currency & Price List", 
  "Time at which materials were received", 
  "The date at which current entry will get or has actually executed.", 
  "More Info", 
@@ -28,15 +31,15 @@
  "Net Total (Import)", 
  "Select Print Heading", 
  "Name", 
+ "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
  "Is Subcontracted", 
  "Contact Person", 
  "Supplier's currency", 
  "LR No", 
  "File List", 
- "Items", 
  "Rounded Total", 
  "To manage multiple series please go to Setup > Manage Series", 
- "The date at which current entry is corrected in the system.", 
+ "Items", 
  "Detailed Breakup of the totals", 
  "In Words", 
  "Range", 
@@ -69,7 +72,6 @@
  "Supplier Warehouse", 
  "Mobile No", 
  "Taxes and Charges Deducted", 
- "Amendment Date", 
  "Bill Date", 
  "% of materials billed against this Purchase Receipt", 
  "Series", 
@@ -77,6 +79,7 @@
  "Supplier Address", 
  "Purchase Receipt Items", 
  "Stock", 
+ "Exchange Rate", 
  "Pull Purchase Order Details", 
  "Amended From", 
  "Challan Date", 
diff --git a/stock/doctype/sales_and_purchase_return_tool/locale/_messages_doc.json b/stock/doctype/sales_and_purchase_return_tool/locale/_messages_doc.json
index de04b5a..979f20f 100644
--- a/stock/doctype/sales_and_purchase_return_tool/locale/_messages_doc.json
+++ b/stock/doctype/sales_and_purchase_return_tool/locale/_messages_doc.json
@@ -4,6 +4,7 @@
  "Sales Return", 
  "Get Items", 
  "Delivery Note No", 
+ "Company", 
  "Customer/Supplier", 
  "Sales and Purchase Return Tool", 
  "Make Debit Note", 
diff --git a/stock/doctype/stock_entry/locale/_messages_py.json b/stock/doctype/stock_entry/locale/_messages_py.json
index 3aafa61..cbf5d79 100644
--- a/stock/doctype/stock_entry/locale/_messages_py.json
+++ b/stock/doctype/stock_entry/locale/_messages_py.json
@@ -1,22 +1,24 @@
 [
+ "' does not exists in ", 
+ "Purpose must be one of ", 
+ " or the BOM is cancelled or inactive", 
+ "does not belong to BOM: ", 
+ "Atleast one warehouse is mandatory", 
+ "Source and Target Warehouse cannot be same", 
+ "Item: '", 
  "Production Order", 
  "All items have already been transferred \\\t\t\t\tfor this Production Order.", 
- "Hence, maximum allowed Manufacturing Quantity", 
- "Source and Target Warehouse cannot be same", 
- " or the BOM is cancelled or inactive", 
- "Purpose must be one of ", 
+ "To fetch items again, click on 'Get Items' button \\\t\t\t\t\t\tor update the Quantity manually.", 
  "Source Warehouse", 
- "Quantity already manufactured", 
  "Item", 
+ "Quantity should be equal to Manufacturing Quantity. ", 
+ "Row #", 
+ "Quantity already manufactured", 
+ "Hence, maximum allowed Manufacturing Quantity", 
  "Target Warehouse", 
  "Manufacturing Quantity", 
  " should be same as that in ", 
  "For Item ", 
  " is mandatory", 
- "Quantity should be equal to Manufacturing Quantity. ", 
- "Row #", 
- "Row # ", 
- "does not belong to BOM: ", 
- "To fetch items again, click on 'Get Items' button \\\t\t\t\t\t\tor update the Quantity manually.", 
- "Atleast one warehouse is mandatory"
+ "Row # "
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_ledger_entry/locale/_messages_doc.json b/stock/doctype/stock_ledger_entry/locale/_messages_doc.json
index fdeda58..4086ea1 100644
--- a/stock/doctype/stock_ledger_entry/locale/_messages_doc.json
+++ b/stock/doctype/stock_ledger_entry/locale/_messages_doc.json
@@ -1,30 +1,25 @@
 [
  "No", 
- "Is Stock Entry", 
- "FIFO Rate", 
  "Batch No", 
  "Warehouse", 
  "Stock", 
+ "Stock Queue (FIFO)", 
  "Incoming Rate", 
  "Company", 
+ "Actual Qty After Transaction", 
  "Stock UOM", 
  "Stock Ledger Entry", 
  "Posting Date", 
- "Moving Average Rate", 
  "Is Cancelled", 
  "Voucher Type", 
- "Bin Actual Qty After Transaction", 
  "Fiscal Year", 
  "Actual Quantity", 
  "Voucher Detail No", 
  "Item Code", 
  "Voucher No", 
- "The date at which current entry is made in system.", 
- "Transaction Date", 
  "Stock Value", 
  "Serial No", 
  "The date at which current entry will get or has actually executed.", 
- "FIFO Stack", 
  "Warehouse Type", 
  "Yes", 
  "Valuation Rate", 
diff --git a/stock/doctype/stock_reconciliation/locale/_messages_doc.json b/stock/doctype/stock_reconciliation/locale/_messages_doc.json
index bca2ab1..b17e712 100644
--- a/stock/doctype/stock_reconciliation/locale/_messages_doc.json
+++ b/stock/doctype/stock_reconciliation/locale/_messages_doc.json
@@ -1,14 +1,12 @@
 [
- "Reconciliation Time", 
- "Remark", 
- "Amendment Date", 
- "The date at which current entry is corrected in the system.", 
- "Diff Info", 
- "Reconciliation Date", 
- "File List", 
- "Steps", 
+ "Reconciliation JSON", 
+ "Reconciliation HTML", 
  "Amended From", 
- "Download Template", 
  "Stock Reconciliation", 
+ "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", 
+ "Upload HTML", 
+ "Reconciliation Data", 
+ "Posting Time", 
+ "Posting Date", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/support/doctype/support_ticket/locale/_messages_doc.json b/support/doctype/support_ticket/locale/_messages_doc.json
index 41827d8..ab384b0 100644
--- a/support/doctype/support_ticket/locale/_messages_doc.json
+++ b/support/doctype/support_ticket/locale/_messages_doc.json
@@ -4,7 +4,6 @@
  "Content Type", 
  "Closed", 
  "SUP", 
- "Resolution Time", 
  "Raised By (Email)", 
  "Thread HTML", 
  "Opening Time", 
@@ -15,6 +14,7 @@
  "To Reply", 
  "Hold", 
  "Naming Series", 
+ "First Responded On", 
  "Customer", 
  "Support Ticket", 
  "Contact",