diff --git a/accounts/doctype/account/locale/_messages_doc.json b/accounts/doctype/account/locale/_messages_doc.json
index 0f91662..c117005 100644
--- a/accounts/doctype/account/locale/_messages_doc.json
+++ b/accounts/doctype/account/locale/_messages_doc.json
@@ -1,5 +1,4 @@
 [
- "Master Name", 
  "Group or Ledger", 
  "No", 
  "Parent Account", 
@@ -22,6 +21,7 @@
  "Rgt", 
  "Frozen", 
  "Income Account", 
+ "Master Name", 
  "Customer", 
  "Account", 
  "Debit or Credit", 
diff --git a/accounts/doctype/bank_reconciliation/locale/_messages_doc.json b/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
index 01eb6ba..76f9008 100644
--- a/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
+++ b/accounts/doctype/bank_reconciliation/locale/_messages_doc.json
@@ -1,12 +1,12 @@
 [
  "Select account head of the bank where cheque was deposited.", 
+ "Entries", 
  "Update Clearance Date", 
  "Company", 
  "Bank Account", 
  "To Date", 
  "Accounts", 
  "From Date", 
- "Entries", 
  "Get Non Reconciled Entries", 
  "Bank Reconciliation", 
  "Total Amount"
diff --git a/accounts/doctype/budget_control/locale/_messages_doc.json b/accounts/doctype/budget_control/locale/_messages_doc.json
index 5e1218a..f42d3be 100644
--- a/accounts/doctype/budget_control/locale/_messages_doc.json
+++ b/accounts/doctype/budget_control/locale/_messages_doc.json
@@ -1,4 +1,4 @@
 [
- "Budget Control", 
- "Accounts"
+ "Accounts", 
+ "Budget Control"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution/locale/_messages_doc.json b/accounts/doctype/budget_distribution/locale/_messages_doc.json
index 3762ccb..62324e0 100644
--- a/accounts/doctype/budget_distribution/locale/_messages_doc.json
+++ b/accounts/doctype/budget_distribution/locale/_messages_doc.json
@@ -4,7 +4,7 @@
  "Budget Distribution", 
  "Name of the Budget Distribution", 
  "Fiscal Year", 
- "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
  "Accounts", 
+ "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
  "Budget Distribution Details"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution_detail/locale/_messages_doc.json b/accounts/doctype/budget_distribution_detail/locale/_messages_doc.json
index ad64d35..321e638 100644
--- a/accounts/doctype/budget_distribution_detail/locale/_messages_doc.json
+++ b/accounts/doctype/budget_distribution_detail/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
  "Budget Distribution Detail", 
- "Percentage Allocation", 
  "Accounts", 
+ "Percentage Allocation", 
  "Month"
 ]
\ 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 7088f70..c7f6667 100644
--- a/accounts/doctype/c_form/locale/_messages_doc.json
+++ b/accounts/doctype/c_form/locale/_messages_doc.json
@@ -1,22 +1,22 @@
 [
- "Customer", 
  "C-FORM/", 
+ "Received Date", 
  "State", 
  "C-Form", 
- "Series", 
  "Company", 
- "Received Date", 
  "Amended From", 
- "IV", 
- "II", 
- "I", 
- "Fiscal Year", 
+ "Total Invoiced Amount", 
  "File List", 
  "Accounts", 
- "C-Form No", 
- "Invoice Details", 
- "Quarter", 
  "III", 
- "Total Amount", 
- "Total Invoiced Amount"
+ "Customer", 
+ "I", 
+ "IV", 
+ "II", 
+ "Fiscal Year", 
+ "Quarter", 
+ "Series", 
+ "Invoice Details", 
+ "C-Form No", 
+ "Total Amount"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/cost_center/locale/_messages_doc.json b/accounts/doctype/cost_center/locale/_messages_doc.json
index 8e53edb..7f3f130 100644
--- a/accounts/doctype/cost_center/locale/_messages_doc.json
+++ b/accounts/doctype/cost_center/locale/_messages_doc.json
@@ -1,22 +1,22 @@
 [
- "rgt", 
  "Trash Reason", 
- "Select Budget Distribution, if you want to track based on seasonality.", 
  "Group or Ledger", 
- "Distribution Id", 
- "Group", 
- "Track separate Income and Expense for product verticals or divisions.", 
- "Company", 
- "Cost Center Details", 
- "old_parent", 
+ "Select Budget Distribution, if you want to track based on seasonality.", 
  "Cost Center", 
- "Ledger", 
- "Add rows to set annual budgets on Accounts.", 
  "lft", 
- "Budget", 
- "Define Budget for this Cost Center. To set budget action, see <a href=\"#!List/Company\">Company Master</a>", 
- "Accounts", 
+ "Group", 
+ "Add rows to set annual budgets on Accounts.", 
+ "rgt", 
+ "Distribution Id", 
+ "Company", 
  "Cost Center Name", 
+ "Track separate Income and Expense for product verticals or divisions.", 
+ "Cost Center Details", 
+ "Budget", 
+ "Ledger", 
  "Parent Cost Center", 
- "Budget Details"
+ "Budget Details", 
+ "old_parent", 
+ "Define Budget for this Cost Center. To set budget action, see <a href=\"#!List/Company\">Company Master</a>", 
+ "Accounts"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/fiscal_year/locale/_messages_doc.json b/accounts/doctype/fiscal_year/locale/_messages_doc.json
index 450be4a..07be4e6 100644
--- a/accounts/doctype/fiscal_year/locale/_messages_doc.json
+++ b/accounts/doctype/fiscal_year/locale/_messages_doc.json
@@ -2,10 +2,10 @@
  "Trash Reason", 
  "No", 
  "For e.g. 2012, 2012-13", 
+ "Year Name", 
  "Fiscal Year Details", 
  "Fiscal Year", 
  "Accounts", 
- "Year Name", 
  "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
  "Year Start Date", 
  "Yes", 
diff --git a/accounts/doctype/fiscal_year/locale/_messages_py.json b/accounts/doctype/fiscal_year/locale/_messages_py.json
index 12ca215..b1845cf 100644
--- a/accounts/doctype/fiscal_year/locale/_messages_py.json
+++ b/accounts/doctype/fiscal_year/locale/_messages_py.json
@@ -1,3 +1,3 @@
 [
- " is now the default Fiscal Year. \\\t\t\tPlease refresh your browser for the change to take effect."
+ " is now the default Fiscal Year. \\\n\t\t\tPlease refresh your browser for the change to take effect."
 ]
\ No newline at end of file
diff --git a/accounts/doctype/gl_control/locale/_messages_doc.json b/accounts/doctype/gl_control/locale/_messages_doc.json
index e7bfed9..09c89e5 100644
--- a/accounts/doctype/gl_control/locale/_messages_doc.json
+++ b/accounts/doctype/gl_control/locale/_messages_doc.json
@@ -1,4 +1,4 @@
 [
- "GL Control", 
- "Accounts"
+ "Accounts", 
+ "GL Control"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/gl_entry/locale/_messages_doc.json b/accounts/doctype/gl_entry/locale/_messages_doc.json
index 9bf382e..9de3b0b 100644
--- a/accounts/doctype/gl_entry/locale/_messages_doc.json
+++ b/accounts/doctype/gl_entry/locale/_messages_doc.json
@@ -8,7 +8,7 @@
  "Aging Date", 
  "Journal Voucher", 
  "Remarks", 
- "Sales Invoice", 
+ "Accounts", 
  "Purchase Invoice", 
  "GL Entry", 
  "Posting Date", 
@@ -23,7 +23,7 @@
  "The date at which current entry is made in system.", 
  "Transaction Date", 
  "The date at which current entry will get or has actually executed.", 
- "Accounts", 
+ "Sales Invoice", 
  "Yes", 
  "Company"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/gl_entry/locale/_messages_py.json b/accounts/doctype/gl_entry/locale/_messages_py.json
index 9601ce0..80fa751 100644
--- a/accounts/doctype/gl_entry/locale/_messages_py.json
+++ b/accounts/doctype/gl_entry/locale/_messages_py.json
@@ -1,13 +1,13 @@
 [
- "Outstanding cannot be less than zero. \\\t\t\t\t \tPlease match exact outstanding.", 
  "GL Entry: Debit or Credit amount is mandatory for ", 
  " is mandatory for GL Entry", 
- "Negative balance is not allowed for account ", 
+ " will become ", 
  "You are not authorized to do/modify back dated entries before ", 
  " does not belong to the company: ", 
- " has been freezed. \\\t\t\t\tOnly Accounts Manager can do transaction against this account", 
+ "Negative balance is not allowed for account ", 
  "Outstanding for Voucher ", 
- " will become ", 
+ " has been freezed. \\\n\t\t\t\tOnly Accounts Manager can do transaction against this account", 
+ "Outstanding cannot be less than zero. \\\n\t\t\t\t \tPlease match exact outstanding.", 
  "Account: ", 
  " is not active", 
  " is not a ledger", 
diff --git a/accounts/doctype/journal_voucher_detail/locale/_messages_doc.json b/accounts/doctype/journal_voucher_detail/locale/_messages_doc.json
index bb280cf..c3d2225 100644
--- a/accounts/doctype/journal_voucher_detail/locale/_messages_doc.json
+++ b/accounts/doctype/journal_voucher_detail/locale/_messages_doc.json
@@ -5,11 +5,11 @@
  "Against Sales Invoice", 
  "Cost Center", 
  "Account Balance", 
+ "Is Advance", 
  "Credit", 
  "Accounts", 
  "Debit", 
  "Journal Voucher Detail", 
- "Is Advance", 
  "Yes", 
  "Against Purchase Invoice", 
  "Against Account"
diff --git a/accounts/doctype/multi_ledger_report_detail/locale/_messages_doc.json b/accounts/doctype/multi_ledger_report_detail/locale/_messages_doc.json
index ee7393e..25f3627 100644
--- a/accounts/doctype/multi_ledger_report_detail/locale/_messages_doc.json
+++ b/accounts/doctype/multi_ledger_report_detail/locale/_messages_doc.json
@@ -1,5 +1,5 @@
 [
- "Multi Ledger Report Detail", 
+ "Accounts", 
  "Account", 
- "Accounts"
+ "Multi Ledger Report Detail"
 ]
\ No newline at end of file
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 c342425..560ec21 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
@@ -3,11 +3,11 @@
  "From Date", 
  "Account Type", 
  "Pull Payment Entries", 
- "Total Amount", 
+ "Company", 
  "Journal Voucher", 
  "Payment to Invoice Matching Tool", 
  "Filter By Date", 
- "Sales Invoice", 
+ "Accounts", 
  "Purchase Invoice", 
  "Amount >=", 
  "Account", 
@@ -19,7 +19,7 @@
  "Help HTML", 
  "Voucher No", 
  "Filter By Amount", 
- "Accounts", 
- "Company", 
+ "Sales Invoice", 
+ "Total Amount", 
  "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 aeb1c5e..9de230e 100644
--- a/accounts/doctype/purchase_invoice/locale/_messages_doc.json
+++ b/accounts/doctype/purchase_invoice/locale/_messages_doc.json
@@ -10,7 +10,6 @@
  "Totals", 
  "Supplier Address", 
  "Net Total (Import)", 
- "Grand Total (Import)", 
  "Select Items from Purchase Order", 
  "Credit To", 
  "Supplier", 
@@ -27,6 +26,7 @@
  "Will be calculated automatically when you enter the details", 
  "Amended From", 
  "Taxes and Charges Deducted", 
+ "Yes", 
  "Get Items", 
  "Tax Calculation", 
  "Purchase Receipt", 
@@ -75,7 +75,7 @@
  "Accounts", 
  "The rate at which Bill Currency is converted into company's base currency", 
  "Series", 
- "Yes", 
+ "Grand Total (Import)", 
  "Recalculate", 
  "Total Tax", 
  "Company", 
diff --git a/accounts/doctype/purchase_invoice_item/locale/_messages_doc.json b/accounts/doctype/purchase_invoice_item/locale/_messages_doc.json
index 5cde9d3..57ef817 100644
--- a/accounts/doctype/purchase_invoice_item/locale/_messages_doc.json
+++ b/accounts/doctype/purchase_invoice_item/locale/_messages_doc.json
@@ -20,7 +20,7 @@
  "Ref Rate*", 
  "Purchase Invoice Item", 
  "Item", 
- "Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges", 
+ "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
  "Qty", 
  "Item Tax Amount", 
  "Accounts", 
diff --git a/accounts/doctype/purchase_taxes_and_charges/locale/_messages_doc.json b/accounts/doctype/purchase_taxes_and_charges/locale/_messages_doc.json
index 3e29dd4..b13e0ed 100644
--- a/accounts/doctype/purchase_taxes_and_charges/locale/_messages_doc.json
+++ b/accounts/doctype/purchase_taxes_and_charges/locale/_messages_doc.json
@@ -4,19 +4,19 @@
  "On Previous Row Amount", 
  "Cost Center", 
  "Add", 
+ "Purchase Taxes and Charges", 
  "Type", 
- "Cheating FieldPlease do not delete ", 
  "Description", 
  "Item Wise Tax Detail ", 
- "Purchase Taxes and Charges", 
+ "Accounts", 
  "Valuation", 
  "Actual", 
  "Tax Amount", 
  "Amount", 
  "Deduct", 
  "Add or Deduct", 
- "Accounts", 
  "Enter Row", 
+ "Cheating Field\nPlease do not delete ", 
  "Parenttype", 
  "Valuation and Total", 
  "On Previous Row Total", 
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/locale/_messages_doc.json b/accounts/doctype/purchase_taxes_and_charges_master/locale/_messages_doc.json
index 1483ba5..7b4b695 100644
--- a/accounts/doctype/purchase_taxes_and_charges_master/locale/_messages_doc.json
+++ b/accounts/doctype/purchase_taxes_and_charges_master/locale/_messages_doc.json
@@ -1,9 +1,9 @@
 [
+ "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
  "Title", 
  "Default", 
  "Company", 
  "Purchase Taxes and Charges Master", 
  "Accounts", 
- "Purchase Taxes and Charges", 
- "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.10. Add or Deduct: Whether you want to add or deduct the tax."
+ "Purchase Taxes and Charges"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/locale/_messages_doc.json b/accounts/doctype/sales_invoice/locale/_messages_doc.json
index 3959266..88e5fe6 100644
--- a/accounts/doctype/sales_invoice/locale/_messages_doc.json
+++ b/accounts/doctype/sales_invoice/locale/_messages_doc.json
@@ -8,6 +8,7 @@
  "Sales Invoice Advance", 
  "Select Terms and Conditions", 
  "Price List and Currency", 
+ "The date on which next invoice will be generated. It is generated on submit.\n", 
  "Territory", 
  "Debit To", 
  "Half-yearly", 
@@ -60,7 +61,7 @@
  "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", 
  "The date at which current entry is corrected in the system.", 
  "Gross Profit (%)", 
- "Accounts", 
+ "Sales Invoice", 
  "Rounded Total", 
  "To manage multiple series please go to Setup > Manage Series", 
  "Items", 
@@ -69,6 +70,7 @@
  "Contact", 
  "Recurring Id", 
  "INV/10-11/", 
+ "Accounts", 
  "Is Opening", 
  "Total Commission", 
  "INV", 
@@ -83,7 +85,6 @@
  "Rounded Total (Export)", 
  "Totals", 
  "In Words (Export)", 
- "Sales Invoice", 
  "Quarterly", 
  "Contact Info", 
  "Select the currency in which price list is maintained", 
@@ -107,7 +108,6 @@
  "Write Off Amount", 
  "Delivery Note", 
  "Customer Group", 
- "The date on which next invoice will be generated. It is generated on submit.", 
  "Mode of Payment", 
  "Basic Info", 
  "Next Date", 
diff --git a/accounts/doctype/sales_taxes_and_charges/locale/_messages_doc.json b/accounts/doctype/sales_taxes_and_charges/locale/_messages_doc.json
index c9544e9..70dfb3a 100644
--- a/accounts/doctype/sales_taxes_and_charges/locale/_messages_doc.json
+++ b/accounts/doctype/sales_taxes_and_charges/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
  "On Net Total", 
- "Amount", 
- "Enter Row", 
- "Actual", 
- "Description", 
- "Is this Tax included in Basic Rate?", 
- "Item Wise Tax Detail ", 
- "Total Amount", 
- "Parenttype", 
+ "Total Tax Amount", 
  "On Previous Row Amount", 
  "Cost Center", 
- "Total Tax Amount", 
+ "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
+ "Type", 
+ "Description", 
+ "Total Amount", 
+ "Item Wise Tax Detail ", 
+ "Cheating Field\nPlease do not delete ", 
+ "Actual", 
+ "Amount", 
+ "Enter Row", 
+ "Sales Taxes and Charges", 
+ "Is this Tax included in Basic Rate?", 
+ "Parenttype", 
  "On Previous Row Total", 
  "Rate", 
- "Cheating FieldPlease do not delete ", 
  "Accounts", 
  "Account Head", 
- "Sales Taxes and Charges", 
- "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
- "Total", 
- "Type"
+ "Total"
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_taxes_and_charges_master/locale/_messages_doc.json b/accounts/doctype/sales_taxes_and_charges_master/locale/_messages_doc.json
index 531bf37..34e53dc 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/locale/_messages_doc.json
+++ b/accounts/doctype/sales_taxes_and_charges_master/locale/_messages_doc.json
@@ -2,8 +2,8 @@
  "Title", 
  "Default", 
  "Company", 
+ "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
  "* Will be calculated in the transaction.", 
- "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
  "Accounts", 
  "Sales Taxes and Charges Master"
 ]
\ No newline at end of file
diff --git a/accounts/locale/_messages_py.json b/accounts/locale/_messages_py.json
index 228ade4..820a08e 100644
--- a/accounts/locale/_messages_py.json
+++ b/accounts/locale/_messages_py.json
@@ -1,4 +1,4 @@
 [
- "Payment Entry has been modified after you pulled it. \t\t\tPlease pull it again.", 
+ "Payment Entry has been modified after you pulled it. \n\t\t\tPlease pull it again.", 
  "not within Fiscal Year"
 ]
\ No newline at end of file
diff --git a/accounts/module_def/accounts/locale/_messages_doc.json b/accounts/module_def/accounts/locale/_messages_doc.json
index b587937..a1a3236 100644
--- a/accounts/module_def/accounts/locale/_messages_doc.json
+++ b/accounts/module_def/accounts/locale/_messages_doc.json
@@ -1,17 +1,17 @@
 [
  "Trial Balance", 
+ "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
  "Voucher Import Tool", 
+ "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
  "Track separate Income and Expense for product verticals or divisions.", 
  "Delivered Items To Be Billed", 
- "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
- "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
+ "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
  "Financial Statements", 
  "General Ledger", 
- "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.To distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
- "Accounts Home", 
  "Ordered Items To Be Billed", 
  "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
  "Financial Analytics", 
  "Accounts Browser", 
- "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.#### NoteThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.#### Description of Columns1. Calculation Type:     - This can be on **Net Total** (that is the sum of basic amount).    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.    - **Actual** (as mentioned).2. Account Head: The Account ledger under which this tax will be booked3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.4. Description: Description of the tax (that will be printed in invoices / quotes).5. Rate: Tax rate.6. Amount: Tax amount.7. Total: Cumulative total to this point.8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.10. Add or Deduct: Whether you want to add or deduct the tax."
+ "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
+ "Accounts Home"
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_common/locale/_messages_py.json b/buying/doctype/purchase_common/locale/_messages_py.json
index a5e81e5..5e03b57 100644
--- a/buying/doctype/purchase_common/locale/_messages_py.json
+++ b/buying/doctype/purchase_common/locale/_messages_py.json
@@ -1,3 +1,3 @@
 [
- "Hey there! You need to put at least one item in \\\t\t\t\tthe item table."
+ "Hey there! You need to put at least one item in \\\n\t\t\t\tthe item table."
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/locale/_messages_doc.json b/buying/doctype/purchase_order/locale/_messages_doc.json
index 31be1c1..4da9445 100644
--- a/buying/doctype/purchase_order/locale/_messages_doc.json
+++ b/buying/doctype/purchase_order/locale/_messages_doc.json
@@ -21,6 +21,7 @@
  "Currency & Price List", 
  "More Info", 
  "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", 
+ "Draft", 
  "Net Total (Import)", 
  "% Received", 
  "Select Print Heading", 
@@ -51,7 +52,6 @@
  "No", 
  "Calculate Tax", 
  "Totals", 
- "Draft", 
  "Terms and Conditions HTML", 
  "Status", 
  "Cancel Reason", 
diff --git a/buying/doctype/purchase_order_item/locale/_messages_doc.json b/buying/doctype/purchase_order_item/locale/_messages_doc.json
index 905fb5c..cf17b80 100644
--- a/buying/doctype/purchase_order_item/locale/_messages_doc.json
+++ b/buying/doctype/purchase_order_item/locale/_messages_doc.json
@@ -29,7 +29,7 @@
  "Ref Rate*", 
  "Quantity", 
  "UOM Conversion Factor", 
- "Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges", 
+ "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
  "Supplier Quotation", 
  "Purchase Order Item", 
  "Page Break", 
diff --git a/buying/doctype/purchase_request/locale/_messages_doc.json b/buying/doctype/purchase_request/locale/_messages_doc.json
index 16b7f31..f99e053 100644
--- a/buying/doctype/purchase_request/locale/_messages_doc.json
+++ b/buying/doctype/purchase_request/locale/_messages_doc.json
@@ -3,7 +3,6 @@
  "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template", 
  "IDT", 
  "Select Terms and Conditions", 
- "Draft", 
  "Name of the entity who has requested for the Purchase Requisition", 
  "Status", 
  "Purchase Request", 
@@ -36,6 +35,7 @@
  "Purchase Requisition Details", 
  "More Info", 
  "One or multiple Sales Order no which generated this Purchase Requisition", 
+ "Draft", 
  "Terms and Conditions Content", 
  "% of materials ordered against this Purchase Requisition"
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_request_item/locale/_messages_doc.json b/buying/doctype/purchase_request_item/locale/_messages_doc.json
index a8706dc..5607dd9 100644
--- a/buying/doctype/purchase_request_item/locale/_messages_doc.json
+++ b/buying/doctype/purchase_request_item/locale/_messages_doc.json
@@ -1,4 +1,5 @@
 [
+ "Item Group", 
  "Item Name", 
  "Description", 
  "Required Date", 
@@ -7,7 +8,6 @@
  "Ordered Qty", 
  "Page Break", 
  "Stock UOM", 
- "Item Group", 
  "Min Order Qty", 
  "Purchase Request Item", 
  "Warehouse", 
diff --git a/buying/doctype/supplier_quotation/locale/_messages_doc.json b/buying/doctype/supplier_quotation/locale/_messages_doc.json
index 32bb54e..7c7cd0a 100644
--- a/buying/doctype/supplier_quotation/locale/_messages_doc.json
+++ b/buying/doctype/supplier_quotation/locale/_messages_doc.json
@@ -10,8 +10,8 @@
  "In Words", 
  "Amendment Date", 
  "Select Terms and Conditions", 
- "Grand Total (Import)", 
  "File List", 
+ "Draft", 
  "Cancel Reason", 
  "Supplier", 
  "Supplier Address", 
@@ -23,13 +23,13 @@
  "Is Subcontracted", 
  "Terms and Conditions", 
  "Contact Person", 
- "Get Items", 
+ "Re-Calculate Values", 
  "Get Terms and Conditions", 
  "Company", 
  "Supplier's currency", 
  "Amended From", 
  "Letter Head", 
- "Re-Calculate Values", 
+ "Get Items", 
  "Tax Calculation", 
  "Price List Currency", 
  "Address", 
@@ -70,7 +70,7 @@
  "Supplier Quotation", 
  "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", 
  "Series", 
- "Draft", 
+ "Grand Total (Import)", 
  "Yes", 
  "Total Tax*", 
  "In Words will be visible once you save the Purchase Order.", 
diff --git a/buying/doctype/supplier_quotation_item/locale/_messages_doc.json b/buying/doctype/supplier_quotation_item/locale/_messages_doc.json
index c5685ca..76a61a8 100644
--- a/buying/doctype/supplier_quotation_item/locale/_messages_doc.json
+++ b/buying/doctype/supplier_quotation_item/locale/_messages_doc.json
@@ -24,6 +24,6 @@
  "Material Request Date", 
  "Ref Rate*", 
  "Quantity", 
- "Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges", 
+ "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
  "Page Break"
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal/locale/_messages_doc.json b/hr/doctype/appraisal/locale/_messages_doc.json
index 9846642..1d32ed6 100644
--- a/hr/doctype/appraisal/locale/_messages_doc.json
+++ b/hr/doctype/appraisal/locale/_messages_doc.json
@@ -1,7 +1,6 @@
 [
  "HR", 
  "Comments", 
- "Draft", 
  "Status", 
  "Appraisal Template", 
  "Completed", 
@@ -16,13 +15,14 @@
  "Select template from which you want to get the Goals", 
  "Submitted", 
  "Employee Details", 
+ "Other Details", 
  "Cancelled", 
  "Appraisal", 
  "For Employee Name", 
  "Calculate Total Score", 
  "Fiscal Year", 
  "Select the Employee for whom you are creating the Appraisal.", 
- "Other Details", 
+ "Draft", 
  "Start Date", 
  "Company"
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_template_goal/locale/_messages_doc.json b/hr/doctype/appraisal_template_goal/locale/_messages_doc.json
index f796274..a429ba0 100644
--- a/hr/doctype/appraisal_template_goal/locale/_messages_doc.json
+++ b/hr/doctype/appraisal_template_goal/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "HR", 
  "Appraisal Template Goal", 
+ "HR", 
  "Key Performance Area", 
- "KRA", 
- "Weightage (%)"
+ "Weightage (%)", 
+ "KRA"
 ]
\ No newline at end of file
diff --git a/hr/doctype/attendance_control_panel/locale/_messages_doc.json b/hr/doctype/attendance_control_panel/locale/_messages_doc.json
index 4359b81..374cb70 100644
--- a/hr/doctype/attendance_control_panel/locale/_messages_doc.json
+++ b/hr/doctype/attendance_control_panel/locale/_messages_doc.json
@@ -7,17 +7,17 @@
  "Import", 
  "Get Template", 
  "mm/dd/yyyy", 
- "To import attendance data, click on \"Add\" button, select the saved CSV file and click on \"Upload\".Select the date format as attendance date format in CSV file.Click on \"Import\".", 
  "File List", 
+ "To import attendance data, click on \"Add\" button, select the saved CSV file and click on \"Upload\".\nSelect the date format as attendance date format in CSV file.\nClick on \"Import\".", 
  "Import Log", 
  "dd-mm-yyyy", 
  "Attendance Control Panel", 
- "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.Fill data in the template. Save the template in CSV format.All attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.", 
  "Import Log1", 
  "dd/mm/yyyy", 
  "Selected Attendance date will comes in the attendance template.", 
  "yyyy-mm-dd", 
  "mm/dd/yy", 
+ "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.", 
  "All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.", 
  "Overwrite", 
  "Download Template"
diff --git a/hr/doctype/deduction_type/locale/_messages_doc.json b/hr/doctype/deduction_type/locale/_messages_doc.json
index bf6d2bb..ca2430a 100644
--- a/hr/doctype/deduction_type/locale/_messages_doc.json
+++ b/hr/doctype/deduction_type/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "HR", 
- "Description", 
  "Trash Reason", 
+ "Description", 
+ "HR", 
  "Deduction Type", 
  "Name"
 ]
\ No newline at end of file
diff --git a/hr/doctype/department/locale/_messages_doc.json b/hr/doctype/department/locale/_messages_doc.json
index b0e9b38..ba99f6a 100644
--- a/hr/doctype/department/locale/_messages_doc.json
+++ b/hr/doctype/department/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "HR", 
- "Department", 
  "Trash Reason", 
- "Days for which Holidays are blocked for this department.", 
- "Leave Block List"
+ "HR", 
+ "Leave Block List", 
+ "Department", 
+ "Days for which Holidays are blocked for this department."
 ]
\ 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 e3e304e..67e9a40 100644
--- a/hr/doctype/employee/locale/_messages_doc.json
+++ b/hr/doctype/employee/locale/_messages_doc.json
@@ -8,6 +8,7 @@
  "Branch", 
  "Department", 
  "Bio", 
+ "Exit", 
  "PF Number", 
  "Company", 
  "User ID", 
@@ -59,7 +60,6 @@
  "Contract End Date", 
  "No", 
  "Leave Encashed?", 
- "Exit", 
  "Educational Qualification Details", 
  "Final Confirmation Date", 
  "Status", 
diff --git a/hr/doctype/employee_education/locale/_messages_doc.json b/hr/doctype/employee_education/locale/_messages_doc.json
index 4ee11a5..cbcb8f8 100644
--- a/hr/doctype/employee_education/locale/_messages_doc.json
+++ b/hr/doctype/employee_education/locale/_messages_doc.json
@@ -7,7 +7,7 @@
  "Graduate", 
  "Employee Education", 
  "Under Graduate", 
- "Post Graduate", 
  "Qualification", 
+ "Post Graduate", 
  "Class / Percentage"
 ]
\ No newline at end of file
diff --git a/hr/doctype/expense_claim/locale/_messages_doc.json b/hr/doctype/expense_claim/locale/_messages_doc.json
index e3eec27..9593a81 100644
--- a/hr/doctype/expense_claim/locale/_messages_doc.json
+++ b/hr/doctype/expense_claim/locale/_messages_doc.json
@@ -1,22 +1,22 @@
 [
  "Employees Email Id", 
- "Amendment Date", 
- "Remark", 
  "HR", 
+ "Total Claimed Amount", 
+ "Draft", 
+ "Amended From", 
+ "Expense Claim Details", 
+ "Employee Name", 
  "Company", 
  "Approver", 
  "Total Sanctioned Amount", 
  "Rejected", 
- "Approved", 
  "Expense Details", 
+ "Approved", 
+ "Posting Date", 
+ "Remark", 
  "Fiscal Year", 
- "Total Claimed Amount", 
- "Draft", 
- "Amended From", 
  "Approval Status", 
- "Expense Claim Details", 
- "From Employee", 
- "Employee Name", 
  "Expense Claim", 
- "Posting Date"
+ "Amendment Date", 
+ "From Employee"
 ]
\ No newline at end of file
diff --git a/hr/doctype/holiday_block_list/locale/_messages_doc.json b/hr/doctype/holiday_block_list/locale/_messages_doc.json
index e521830..9f03794 100644
--- a/hr/doctype/holiday_block_list/locale/_messages_doc.json
+++ b/hr/doctype/holiday_block_list/locale/_messages_doc.json
@@ -8,9 +8,9 @@
  "Holiday Block List Dates", 
  "Holiday Block List", 
  "Stop users from making Leave Applications on following days.", 
- "Applies to Company", 
  "Holiday Block List Name", 
  "Year", 
  "If not checked, the list will have to be added to each Department where it has to be applied.", 
+ "Applies to Company", 
  "Allow the following users to make Leave Applications for block days."
 ]
\ No newline at end of file
diff --git a/hr/doctype/holiday_block_list_date/locale/_messages_doc.json b/hr/doctype/holiday_block_list_date/locale/_messages_doc.json
index 4a98b98..20482bd 100644
--- a/hr/doctype/holiday_block_list_date/locale/_messages_doc.json
+++ b/hr/doctype/holiday_block_list_date/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
  "HR", 
- "Reason", 
  "Holiday Block List Date", 
+ "Reason", 
  "Block Date"
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_application/locale/_messages_py.json b/hr/doctype/leave_application/locale/_messages_py.json
index 9d2a3b7..b07f499 100644
--- a/hr/doctype/leave_application/locale/_messages_py.json
+++ b/hr/doctype/leave_application/locale/_messages_py.json
@@ -1,11 +1,12 @@
 [
  "New Leave Application", 
- "Following dates are blocked for Leave", 
- "Hurray! The day(s) on which you are applying for leave \\\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.", 
+ "Hurray! The day(s) on which you are applying for leave \\\n\t\t\t\t\tcoincide with holiday(s). You need not apply for leave.", 
  "Leave by", 
+ "Cannot approve leave as you are not authorized to approve leaves on Block Dates.", 
  "Employee", 
  "Leave Blocked", 
  "Holiday", 
+ "Warning: Leave application contains following block dates", 
  " (Half Day)", 
  "Leave Application"
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_block_list/locale/_messages_doc.json b/hr/doctype/leave_block_list/locale/_messages_doc.json
index 47b1fa5..0a165a7 100644
--- a/hr/doctype/leave_block_list/locale/_messages_doc.json
+++ b/hr/doctype/leave_block_list/locale/_messages_doc.json
@@ -7,9 +7,9 @@
  "Company", 
  "Leave Block List", 
  "Stop users from making Leave Applications on following days.", 
- "Applies to Company", 
  "Year", 
  "If not checked, the list will have to be added to each Department where it has to be applied.", 
+ "Applies to Company", 
  "Leave Block List Name", 
  "Leave Block List Allowed", 
  "Leave Block List Dates"
diff --git a/hr/doctype/salary_manager/locale/_messages_doc.json b/hr/doctype/salary_manager/locale/_messages_doc.json
index c0d4405..dd95645 100644
--- a/hr/doctype/salary_manager/locale/_messages_doc.json
+++ b/hr/doctype/salary_manager/locale/_messages_doc.json
@@ -4,23 +4,12 @@
  "Creates salary slip for above mentioned criteria.", 
  "Branch", 
  "Department", 
- "02", 
- "03", 
- "01", 
- "06", 
- "07", 
- "04", 
- "05", 
  "Send Email", 
  "Company", 
- "09", 
  "Create Bank Voucher for the total salary paid for the above selected criteria", 
  "Designation", 
- "10", 
  "Fiscal Year", 
- "11", 
  "Document Description", 
- "12", 
  "Grade", 
  "Salary Manager", 
  "Submit Salary Slip", 
@@ -28,6 +17,5 @@
  "Activity Log", 
  "Submit all salary slips for the above selected criteria", 
  "Check if you want to send salary slip in mail to each employee while submitting salary slip", 
- "Make Bank Voucher", 
- "08"
+ "Make Bank Voucher"
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip/locale/_messages_doc.json b/hr/doctype/salary_slip/locale/_messages_doc.json
index 3b4f906..52389a9 100644
--- a/hr/doctype/salary_slip/locale/_messages_doc.json
+++ b/hr/doctype/salary_slip/locale/_messages_doc.json
@@ -10,15 +10,7 @@
  "Department", 
  "Employee Name", 
  "Email", 
- "02", 
- "03", 
- "01", 
- "06", 
- "07", 
- "04", 
- "05", 
  "Company", 
- "09", 
  "Total days in month", 
  "Amended From", 
  "Bank Name", 
@@ -38,14 +30,10 @@
  "Fiscal Year", 
  "Letter Head", 
  "Leave Without Pay", 
- "11", 
- "10", 
- "12", 
  "Deductions", 
  "Grade", 
  "Bank Account No.", 
  "Gross Pay", 
  "Month", 
- "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction", 
- "08"
+ "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction"
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_deduction/locale/_messages_doc.json b/hr/doctype/salary_slip_deduction/locale/_messages_doc.json
index 6f771a0..222cc4b 100644
--- a/hr/doctype/salary_slip_deduction/locale/_messages_doc.json
+++ b/hr/doctype/salary_slip_deduction/locale/_messages_doc.json
@@ -1,8 +1,8 @@
 [
  "Modified Amount", 
  "HR", 
- "Salary Slip Deduction", 
- "Amount", 
  "Type", 
+ "Amount", 
+ "Salary Slip Deduction", 
  "Depends on LWP"
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_structure_deduction/locale/_messages_doc.json b/hr/doctype/salary_structure_deduction/locale/_messages_doc.json
index 320da83..0596958 100644
--- a/hr/doctype/salary_structure_deduction/locale/_messages_doc.json
+++ b/hr/doctype/salary_structure_deduction/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
  "HR", 
- "Amount", 
- "Type", 
  "Depend on LWP", 
- "Salary Structure Deduction"
+ "Amount", 
+ "Salary Structure Deduction", 
+ "Type"
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_structure_earning/locale/_messages_doc.json b/hr/doctype/salary_structure_earning/locale/_messages_doc.json
index 63e39b1..217305a 100644
--- a/hr/doctype/salary_structure_earning/locale/_messages_doc.json
+++ b/hr/doctype/salary_structure_earning/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
  "HR", 
- "Amount", 
  "Salary Structure Earning", 
- "Type", 
- "Depend on LWP"
+ "Depend on LWP", 
+ "Amount", 
+ "Type"
 ]
\ No newline at end of file
diff --git a/hr/module_def/hr/locale/_messages_doc.json b/hr/module_def/hr/locale/_messages_doc.json
index bfcee9d..e3ac57e 100644
--- a/hr/module_def/hr/locale/_messages_doc.json
+++ b/hr/module_def/hr/locale/_messages_doc.json
@@ -1,7 +1,8 @@
 [
- "Description of a Job Opening", 
- "Apply / Approve Leaves", 
  "Block Holidays on important days.", 
  "Applicant for a Job", 
- "Human Resources Home"
+ "Description of a Job Opening", 
+ "Apply / Approve Leaves", 
+ "Human Resources Home", 
+ "Employee Leave Balance"
 ]
\ No newline at end of file
diff --git a/hr/page/hr_home/locale/_messages_js.json b/hr/page/hr_home/locale/_messages_js.json
index d56452f..0d744e0 100644
--- a/hr/page/hr_home/locale/_messages_js.json
+++ b/hr/page/hr_home/locale/_messages_js.json
@@ -1,6 +1,7 @@
 [
  "Leave Setup", 
  "Documents", 
+ "Employee Leave Balance", 
  "Attendance record.", 
  "Employee records.", 
  "Leave Block List", 
@@ -33,6 +34,7 @@
  "Designation", 
  "Generate Salary Slips", 
  "Employee Designation.", 
+ "Reports", 
  "Deduction Type", 
  "Holiday List", 
  "Monthly salary template.", 
diff --git a/manufacturing/doctype/bom_item/locale/_messages_doc.json b/manufacturing/doctype/bom_item/locale/_messages_doc.json
index 314ac7e..44ed814 100644
--- a/manufacturing/doctype/bom_item/locale/_messages_doc.json
+++ b/manufacturing/doctype/bom_item/locale/_messages_doc.json
@@ -1,11 +1,11 @@
 [
- "Amount", 
  "Item Description", 
- "BOM Item", 
+ "Qty", 
+ "Amount", 
  "Scrap %", 
  "Operation No", 
  "Rate", 
- "Qty", 
+ "BOM Item", 
  "BOM No", 
  "Stock UOM", 
  "Qty Consumed Per Unit", 
diff --git a/manufacturing/doctype/production_order/locale/_messages_doc.json b/manufacturing/doctype/production_order/locale/_messages_doc.json
index 37a83a4..1707c88 100644
--- a/manufacturing/doctype/production_order/locale/_messages_doc.json
+++ b/manufacturing/doctype/production_order/locale/_messages_doc.json
@@ -1,7 +1,6 @@
 [
  "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
  "Qty To Manufacture", 
- "Draft", 
  "Use Multi-Level BOM", 
  "Status", 
  "Project Name", 
@@ -25,6 +24,7 @@
  "Manufactured quantity will be updated in this warehouse", 
  "Item To Manufacture", 
  "Manufacture against Sales Order", 
+ "Draft", 
  "Sales Order", 
  "Completed"
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json b/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json
index eab278c..8645992 100644
--- a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json
+++ b/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json
@@ -1,13 +1,13 @@
 [
  "Customer", 
  "Get Open Sales Order", 
- "Manufacturing", 
+ "Sales Order", 
  "Company", 
  "Update Delivery Date", 
  "To Date", 
  "From Date", 
  "Entries", 
- "Sales Order", 
+ "Manufacturing", 
  "Territory", 
  "Update Sales Order"
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/workstation/locale/_messages_doc.json b/manufacturing/doctype/workstation/locale/_messages_doc.json
index 69f5942..6ab9889 100644
--- a/manufacturing/doctype/workstation/locale/_messages_doc.json
+++ b/manufacturing/doctype/workstation/locale/_messages_doc.json
@@ -1,5 +1,4 @@
 [
- "Hour Rate Rent", 
  "Workstation", 
  "Units/Shifts", 
  "Capacity", 
@@ -10,10 +9,11 @@
  "Capacity Units", 
  "Units/Hour", 
  "Over Heads", 
- "Overhead", 
  "Hour Rate Electricity", 
  "Warehouse", 
+ "Overhead", 
  "Manufacturing", 
+ "Hour Rate Rent", 
  "Workstation Name", 
  "Hour Rate Labour"
 ]
\ No newline at end of file
diff --git a/manufacturing/module_def/manufacturing/locale/_messages_doc.json b/manufacturing/module_def/manufacturing/locale/_messages_doc.json
index b47bc77..c8da7cf 100644
--- a/manufacturing/module_def/manufacturing/locale/_messages_doc.json
+++ b/manufacturing/module_def/manufacturing/locale/_messages_doc.json
@@ -1,4 +1,4 @@
 [
- "Manufacturing Home", 
- "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM"
+ "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM", 
+ "Manufacturing Home"
 ]
\ No newline at end of file
diff --git a/projects/doctype/project/locale/_messages_doc.json b/projects/doctype/project/locale/_messages_doc.json
index a258213..320f6b3 100644
--- a/projects/doctype/project/locale/_messages_doc.json
+++ b/projects/doctype/project/locale/_messages_doc.json
@@ -3,14 +3,12 @@
  "Tasks belonging to this Project.", 
  "Completion Date", 
  "No", 
- "Customer Address", 
  "Customer Details", 
  "Trash Reason", 
  "Priority", 
  "Project Tasks", 
  "Internal", 
  "Low", 
- "Contact Person", 
  "Project Start Date", 
  "Milestones will be added as Events in the Calendar", 
  "Status", 
@@ -32,22 +30,17 @@
  "Notes", 
  "Project", 
  "Project Type", 
- "Customer Name", 
  "Cancelled", 
  "Project will get saved and will be searchable with project name given", 
  "Margin", 
  "Estimated Material Cost", 
- "Territory", 
  "Tasks", 
- "Contact No", 
  "Is Active", 
  "High", 
  "Other", 
  "Select name of Customer to whom project belongs", 
  "Project Milestones", 
- "Customer Group", 
  "Yes", 
  "Open", 
- "Company", 
- "Email Id"
+ "Company"
 ]
\ No newline at end of file
diff --git a/projects/doctype/project_activity/locale/_messages_doc.json b/projects/doctype/project_activity/locale/_messages_doc.json
index a4f1731..f1d2810 100644
--- a/projects/doctype/project_activity/locale/_messages_doc.json
+++ b/projects/doctype/project_activity/locale/_messages_doc.json
@@ -1,35 +1,14 @@
 [
  "Percent Complete", 
  "New Update", 
- "60", 
  "Add", 
- "65", 
  "Updates HTML", 
- "80", 
- "85", 
- "25", 
- "20", 
  "Activity Name", 
- "45", 
- "40", 
  "Hours", 
- "0", 
- "5", 
  "Updates", 
  "Last Update By", 
  "Projects", 
  "Last Update", 
  "Project Activity", 
- "Project", 
- "75", 
- "70", 
- "90", 
- "100", 
- "95", 
- "10", 
- "15", 
- "55", 
- "30", 
- "50", 
- "35"
+ "Project"
 ]
\ No newline at end of file
diff --git a/projects/doctype/project_activity_update/locale/_messages_doc.json b/projects/doctype/project_activity_update/locale/_messages_doc.json
index 4fb3488..1e98c39 100644
--- a/projects/doctype/project_activity_update/locale/_messages_doc.json
+++ b/projects/doctype/project_activity_update/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Hours", 
  "e.g. 0.5, 2.5 etc", 
+ "Update", 
+ "Hours", 
  "Project Activity Update", 
- "Projects", 
- "Update"
+ "Projects"
 ]
\ No newline at end of file
diff --git a/projects/doctype/project_milestone/locale/_messages_doc.json b/projects/doctype/project_milestone/locale/_messages_doc.json
index 7b64ba4..f9f4393 100644
--- a/projects/doctype/project_milestone/locale/_messages_doc.json
+++ b/projects/doctype/project_milestone/locale/_messages_doc.json
@@ -3,7 +3,7 @@
  "Project Milestone", 
  "Completed", 
  "Milestone Date", 
- "Projects", 
+ "Pending", 
  "Milestone", 
- "Pending"
+ "Projects"
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet/locale/_messages_doc.json b/projects/doctype/timesheet/locale/_messages_doc.json
index 8793f2c..7c5d297 100644
--- a/projects/doctype/timesheet/locale/_messages_doc.json
+++ b/projects/doctype/timesheet/locale/_messages_doc.json
@@ -1,14 +1,14 @@
 [
  "Status", 
- "Amendment Date", 
  "Timesheet By", 
  "Notes", 
  "Timesheet", 
  "Submitted", 
- "Draft", 
+ "Amendment Date", 
  "Timesheet Date", 
  "Timesheet Details", 
  "Cancelled", 
+ "Draft", 
  "Amended From", 
  "Projects"
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet_detail/locale/_messages_doc.json b/projects/doctype/timesheet_detail/locale/_messages_doc.json
index a8451d0..eff7cbd 100644
--- a/projects/doctype/timesheet_detail/locale/_messages_doc.json
+++ b/projects/doctype/timesheet_detail/locale/_messages_doc.json
@@ -5,9 +5,9 @@
  "Actual Start Time", 
  "Project", 
  "Total Hours (Actual)", 
- "Customer Name", 
- "Projects", 
+ "Additional Info", 
  "Timesheet Detail", 
+ "Customer Name", 
  "Task Name", 
- "Additional Info"
+ "Projects"
 ]
\ No newline at end of file
diff --git a/selling/doctype/customer/locale/_messages_doc.json b/selling/doctype/customer/locale/_messages_doc.json
index f108abd..ccbabdb 100644
--- a/selling/doctype/customer/locale/_messages_doc.json
+++ b/selling/doctype/customer/locale/_messages_doc.json
@@ -20,10 +20,10 @@
  "Default Sales Partner", 
  "Customer Details", 
  "Customer", 
- "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>", 
+ "Contact Desc", 
  "Default Currency", 
  "CUST", 
- "Contact Desc", 
+ "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>", 
  "Communication HTML", 
  "Your Customer's TAX registration numbers (if applicable) or any general information", 
  "Default Commission Rate", 
diff --git a/selling/doctype/installation_note/locale/_messages_doc.json b/selling/doctype/installation_note/locale/_messages_doc.json
index be4dbec..00d8175 100644
--- a/selling/doctype/installation_note/locale/_messages_doc.json
+++ b/selling/doctype/installation_note/locale/_messages_doc.json
@@ -1,7 +1,6 @@
 [
  "Installation Note Item", 
  "Customer Address", 
- "Draft", 
  "Cancel Reason", 
  "Territory", 
  "Installation Note", 
@@ -15,9 +14,9 @@
  "Remarks", 
  "Delivery Note No", 
  "Customer", 
- "Series", 
  "Name", 
  "The date at which current entry is corrected in the system.", 
+ "Customer Group", 
  "Submitted", 
  "Fiscal Year", 
  "Contact", 
@@ -30,5 +29,6 @@
  "Installation Date", 
  "Contact Email", 
  "Item Details", 
- "Customer Group"
+ "Series", 
+ "Draft"
 ]
\ No newline at end of file
diff --git a/selling/doctype/lead/locale/_messages_doc.json b/selling/doctype/lead/locale/_messages_doc.json
index d8e7e05..55eea2d 100644
--- a/selling/doctype/lead/locale/_messages_doc.json
+++ b/selling/doctype/lead/locale/_messages_doc.json
@@ -11,7 +11,6 @@
  "Source", 
  "Country", 
  "Interested", 
- "Call", 
  "Exhibition", 
  "Your sales person who will contact the lead in future", 
  "Supplier", 
@@ -35,6 +34,7 @@
  "Lead Owner", 
  "Advertisement", 
  "Consultant", 
+ "Call", 
  "Date on which the lead was last contacted", 
  "Naming Series", 
  "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>", 
diff --git a/selling/doctype/opportunity/locale/_messages_doc.json b/selling/doctype/opportunity/locale/_messages_doc.json
index 2c5f004..64d1189 100644
--- a/selling/doctype/opportunity/locale/_messages_doc.json
+++ b/selling/doctype/opportunity/locale/_messages_doc.json
@@ -11,7 +11,6 @@
  "Sales", 
  "Date on which the lead was last contacted", 
  "Source", 
- "Draft", 
  "Exhibition", 
  "Maintenance", 
  "Territory", 
@@ -63,5 +62,6 @@
  "Opportunity Date", 
  "Contact Email", 
  "Existing Customer", 
+ "Draft", 
  "Campaign"
 ]
\ No newline at end of file
diff --git a/selling/doctype/quotation_item/locale/_messages_doc.json b/selling/doctype/quotation_item/locale/_messages_doc.json
index 35bf286..6149535 100644
--- a/selling/doctype/quotation_item/locale/_messages_doc.json
+++ b/selling/doctype/quotation_item/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
- "Item Tax Rate", 
  "Item Name", 
- "Description", 
- "Basic Rate*", 
- "Quotation Item", 
- "Brand", 
- "Amount", 
- "Amount*", 
- "Price List Rate*", 
- "Rate", 
+ "UOM", 
+ "Item Tax Rate", 
  "Selling", 
- "Item Group", 
- "Page Break", 
+ "Description", 
+ "Brand", 
+ "Quantity", 
+ "Discount (%)", 
  "Customer's Item Code", 
  "Against Docname", 
- "Against Doctype", 
- "Price List Rate", 
- "Discount (%)", 
+ "Amount*", 
+ "Amount", 
+ "Item Group", 
  "Item Code", 
- "UOM", 
- "Quantity"
+ "Price List Rate*", 
+ "Quotation Item", 
+ "Basic Rate*", 
+ "Rate", 
+ "Against Doctype", 
+ "Page Break", 
+ "Price List Rate"
 ]
\ No newline at end of file
diff --git a/selling/doctype/sales_order/locale/_messages_doc.json b/selling/doctype/sales_order/locale/_messages_doc.json
index c42376c..af6b136 100644
--- a/selling/doctype/sales_order/locale/_messages_doc.json
+++ b/selling/doctype/sales_order/locale/_messages_doc.json
@@ -22,10 +22,11 @@
  "Conversion Rate", 
  "Not Billed", 
  "Sales Taxes and Charges", 
- "Campaign", 
  "Reference", 
+ "Campaign", 
  "Customer's currency", 
  "SO/10-11/", 
+ "Draft", 
  "Sales Order", 
  "Grand Total (Export)", 
  "Delivery Status", 
@@ -69,7 +70,6 @@
  "P.O. Date", 
  "Totals", 
  "In Words (Export)", 
- "Draft", 
  "Maintenance", 
  "Select the currency in which price list is maintained", 
  "Display all the individual items delivered with the main items", 
diff --git a/selling/doctype/shipping_address/locale/_messages_doc.json b/selling/doctype/shipping_address/locale/_messages_doc.json
index 38b52b8..42fd035 100644
--- a/selling/doctype/shipping_address/locale/_messages_doc.json
+++ b/selling/doctype/shipping_address/locale/_messages_doc.json
@@ -7,7 +7,7 @@
  "Customer Address", 
  "Shipping Address", 
  "Customer Name", 
- "Shipping Details", 
  "Yes", 
+ "Shipping Details", 
  "Is Primary Address"
 ]
\ No newline at end of file
diff --git a/selling/doctype/sms_center/locale/_messages_doc.json b/selling/doctype/sms_center/locale/_messages_doc.json
index 17ed762..c7a4dde 100644
--- a/selling/doctype/sms_center/locale/_messages_doc.json
+++ b/selling/doctype/sms_center/locale/_messages_doc.json
@@ -1,21 +1,21 @@
 [
- "Customer", 
  "All Lead (Open)", 
  "Send To", 
  "Selling", 
  "All Sales Person", 
- "Create Receiver List", 
- "All Supplier Contact", 
- "Receiver List", 
+ "Branch", 
  "All Customer Contact", 
+ "Receiver List", 
+ "All Supplier Contact", 
  "All Sales Partner Contact", 
  "All Contact", 
  "Message greater than 160 character will be splitted into multiple mesage", 
- "Department", 
+ "Supplier", 
  "All Employee (Active)", 
  "SMS Center", 
- "Branch", 
- "Supplier", 
+ "Department", 
  "Send SMS", 
- "Message"
+ "Customer", 
+ "Message", 
+ "Create Receiver List"
 ]
\ No newline at end of file
diff --git a/setup/doctype/authorization_rule/locale/_messages_doc.json b/setup/doctype/authorization_rule/locale/_messages_doc.json
index e72d1b0..7efab8a 100644
--- a/setup/doctype/authorization_rule/locale/_messages_doc.json
+++ b/setup/doctype/authorization_rule/locale/_messages_doc.json
@@ -19,12 +19,12 @@
  "Purchase Receipt", 
  "Grand Total", 
  "Appraisal", 
+ "Applicable To (Employee)", 
  "Applicable To (User)", 
- "Applicable To (Role)", 
  "Delivery Note", 
  "Sales Invoice", 
  "Average Discount", 
  "Sales Order", 
  "Approving User", 
- "Applicable To (Employee)"
+ "Applicable To (Role)"
 ]
\ No newline at end of file
diff --git a/setup/doctype/contact_control/locale/_messages_doc.json b/setup/doctype/contact_control/locale/_messages_doc.json
index 09d529c..3c6d3a6 100644
--- a/setup/doctype/contact_control/locale/_messages_doc.json
+++ b/setup/doctype/contact_control/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
  "Customer Intro", 
- "Header", 
+ "Supplier Intro", 
  "Setup", 
- "Contact Control", 
- "Supplier Intro"
+ "Header", 
+ "Contact Control"
 ]
\ No newline at end of file
diff --git a/setup/doctype/country/locale/_messages_doc.json b/setup/doctype/country/locale/_messages_doc.json
index bee8686..1b38803 100644
--- a/setup/doctype/country/locale/_messages_doc.json
+++ b/setup/doctype/country/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Time Zones", 
  "Country", 
  "Setup", 
+ "Date Format", 
  "Country Name", 
- "Date Format"
+ "Time Zones"
 ]
\ 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 5b8c2a5..3502c13 100644
--- a/setup/doctype/currency/locale/_messages_doc.json
+++ b/setup/doctype/currency/locale/_messages_doc.json
@@ -1,22 +1,15 @@
 [
  "Fraction Units", 
- "#,###.###", 
+ "Currency Name", 
+ "Fraction", 
+ "Sub-currency. For e.g. \"Cent\"", 
+ "1 Currency = [?] Fraction\nFor e.g. 1 USD = 100 Cent", 
+ "Symbol", 
+ "A symbol for this currency. For e.g. $", 
+ "**Currency** Master", 
  "Number Format", 
  "Setup", 
- "Symbol", 
  "Enabled", 
- "#,##,###.##", 
  "How should this currency be formatted? If not set, will use system defaults", 
- "Currency", 
- "A symbol for this currency. For e.g. $", 
- "Currency Name", 
- "1 Currency = [?] FractionFor e.g. 1 USD = 100 Cent", 
- "Fraction", 
- "#.###,##", 
- "#,###", 
- "# ###.##", 
- "Sub-currency. For e.g. \"Cent\"", 
- "**Currency** Master", 
- "#,###.##", 
- "#.###"
+ "Currency"
 ]
\ No newline at end of file
diff --git a/setup/doctype/customer_group/locale/_messages_doc.json b/setup/doctype/customer_group/locale/_messages_doc.json
index d9dafb9..ccbb2d5 100644
--- a/setup/doctype/customer_group/locale/_messages_doc.json
+++ b/setup/doctype/customer_group/locale/_messages_doc.json
@@ -3,10 +3,10 @@
  "rgt", 
  "Only leaf nodes are allowed in transaction", 
  "No", 
- "Parent Customer Group", 
+ "Has Child Node", 
  "Setup", 
  "This Price List will be selected as default for all Customers under this Group.", 
- "Has Child Node", 
+ "Parent Customer Group", 
  "Customer Group Name", 
  "old_parent", 
  "lft", 
diff --git a/setup/doctype/email_digest/locale/_messages_doc.json b/setup/doctype/email_digest/locale/_messages_doc.json
index 9c41c66..3e21e3d 100644
--- a/setup/doctype/email_digest/locale/_messages_doc.json
+++ b/setup/doctype/email_digest/locale/_messages_doc.json
@@ -6,7 +6,6 @@
  "New Material Requests", 
  "Send regular summary reports via Email.", 
  "Select Digest Content", 
- "Collections", 
  "Expenses Booked", 
  "Income", 
  "Stock", 
@@ -44,6 +43,7 @@
  "Open Tickets", 
  "Accounts", 
  "Projects", 
+ "Collections", 
  "Email Digest", 
  "Weekly"
 ]
\ No newline at end of file
diff --git a/setup/doctype/features_setup/locale/_messages_doc.json b/setup/doctype/features_setup/locale/_messages_doc.json
index 369d0ed..c06680f 100644
--- a/setup/doctype/features_setup/locale/_messages_doc.json
+++ b/setup/doctype/features_setup/locale/_messages_doc.json
@@ -3,16 +3,16 @@
  "Purchase Discounts", 
  "To enable <b>Point of Sale</b> features", 
  "To get Item Group in details table", 
- "If you involve in manufacturing activity<br>Enables item <b>Is Manufactured</b>", 
  "Features Setup", 
  "Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice", 
- "Item Groups in Details", 
  "Enables <b>More Info.</b> in all documents", 
  "Item Serial Nos", 
- "All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.", 
+ "All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>\nDelivery Note, POS, Quotation, Sales Invoice, Sales Order etc.", 
+ "Item Groups in Details", 
  "Item Barcode", 
  "Sales Discounts", 
  "Exports", 
+ "To track brand name in the following documents<br>\nDelivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", 
  "Item Advanced", 
  "Packing Detials", 
  "Item Batch Nos", 
@@ -21,27 +21,27 @@
  "Manufacturing", 
  "If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page", 
  "Sales and Purchase", 
- "If you follow Quality Inspection<br>Enables item QA Required and QA No in Purchase Receipt", 
- "If Sale BOM is defined, the actual BOM of the Pack is displayed as table.Available in Delivery Note and Sales Order", 
+ "If Sale BOM is defined, the actual BOM of the Pack is displayed as table.\nAvailable in Delivery Note and Sales Order", 
+ "Page Break", 
+ "If you follow Quality Inspection<br>\nEnables item QA Required and QA No in Purchase Receipt", 
  "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.", 
  "Setup", 
- "All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.", 
+ "Available in \nBOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", 
  "Sales Extras", 
  "Materials", 
  "Miscelleneous", 
  "Recurring Invoice", 
- "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", 
+ "If you involve in manufacturing activity<br>\nEnables item <b>Is Manufactured</b>", 
  "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order", 
  "More Info", 
  "Point of Sale", 
  "Imports", 
  "If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity", 
  "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", 
- "To track brand name in the following documents<br>Delivery Note, Enuiry, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No", 
  "To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>", 
  "After Sale Installations", 
  "Projects", 
- "Page Break", 
+ "All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>\nPurchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.", 
  "To track any installation or commissioning related work after sales", 
  "Quality", 
  "1. To maintain the customer wise item code and to make them searchable based on their code use this option"
diff --git a/setup/doctype/global_defaults/locale/_messages_doc.json b/setup/doctype/global_defaults/locale/_messages_doc.json
index 259e7b4..79a7f11 100644
--- a/setup/doctype/global_defaults/locale/_messages_doc.json
+++ b/setup/doctype/global_defaults/locale/_messages_doc.json
@@ -1,87 +1,75 @@
 [
  "Session Expiry in Hours e.g. 06:00", 
- "mm-dd-yyyy", 
- "Default Supplier Type", 
- "Users with this role are allowed to do / modify stock entry before frozen date", 
- "No", 
- "Buying", 
- "Default Price List", 
- "Purchase Order Required", 
- "System", 
+ "Raise Material Request when stock reaches re-order level", 
+ "Employee record is created using selected field. ", 
  "dd/mm/yyyy", 
  "Stock level frozen up to this date, nobody can do / modify entry except authorized person", 
- "Employee Records to be created by ", 
- "Purchase Receipt Required", 
  "Allow Negative Stock", 
- "Moving Average", 
- "Accounts Frozen Upto", 
- "CGHelp", 
- "Default Valuation Method", 
- "Naming Series", 
- "Supplier Name", 
- "Default Price List Currency", 
- "#,###.##", 
- "Stock", 
- "Default Warehouse Type", 
+ "Employee Records to be created by ", 
+ "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
  "Account Info", 
- "Maintain same rate throughout purchase cycle", 
- "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", 
  "Default Company", 
  "Applicable only if valuation method is moving average", 
  "Company", 
- "Raise Material Request when stock reaches re-order level", 
- "Date Format", 
- "Employee record is created using selected field. ", 
- "HR", 
- "3", 
- "2", 
- "5", 
- "4", 
- "#,##,###.##", 
- "Customer Master created by ", 
- "Default Item Group", 
  "dd-mm-yyyy", 
- "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
- "Supplier Master created by ", 
- "#.###,##", 
- "If disable, 'Rounded Total' field will not be visible in any transaction", 
- "Credit Controller", 
+ "Naming Series", 
  "SMS Sender Name", 
- "IGHelp", 
- "Default Currency", 
- "Default Stock UOM", 
- "Number Format", 
+ "Default Warehouse Type", 
  "Setup", 
- "6", 
- "Stock Frozen Upto", 
- "Disable Rounded Total", 
- "Hide Currency Symbol", 
+ "Maintain same rate throughout purchase cycle", 
  "Customer Name", 
- "FIFO", 
- "Authourized Role (Frozen Entry)", 
- "Employee Number", 
- "Current Fiscal Year", 
- "yyyy-mm-dd", 
- "# ###.##", 
- "#.###", 
- "Do not show any symbol like $ etc next to currencies.", 
+ "Default Price List Currency", 
  "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>", 
+ "Global Defaults", 
+ "Accounts", 
+ "mm-dd-yyyy", 
+ "Users with this role are allowed to do / modify stock entry before frozen date", 
+ "HR", 
+ "System", 
+ "FIFO", 
+ "Purchase Receipt Required", 
+ "Default Valuation Method", 
+ "Accounts Frozen Upto", 
+ "Allowance Percent", 
+ "Customer Master created by ", 
+ "Buying", 
+ "Supplier Master created by ", 
+ "Selling", 
+ "Default Territory", 
+ "Default Supplier Type", 
+ "CGHelp", 
  "Session Expiry", 
  "Default Customer Group", 
- "TerritoryHelp", 
- "#,###.###", 
- "Float Precision", 
  "Sales Order Required", 
- "Allowance Percent", 
+ "Employee Number", 
+ "Yes", 
+ "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", 
+ "No", 
+ "Default Price List", 
+ "Default Item Group", 
+ "mm/dd/yyyy", 
+ "Date Format", 
+ "Disable Rounded Total", 
+ "Authorized Role (Frozen Entry)", 
+ "If disable, 'Rounded Total' field will not be visible in any transaction", 
+ "Credit Controller", 
+ "IGHelp", 
+ "Current Fiscal Year", 
+ "yyyy-mm-dd", 
+ "Do not show any symbol like $ etc next to currencies.", 
+ "Float Precision", 
  "Users with this role are allowed to do / modify accounting entry before frozen date", 
  "General", 
  "Delivery Note Required", 
- "Global Defaults", 
- "#,###", 
- "Accounts", 
- "Authorized Role (Frozen Entry)", 
- "Selling", 
- "Default Territory", 
- "Yes", 
- "mm/dd/yyyy"
+ "Purchase Order Required", 
+ "Moving Average", 
+ "Default Currency", 
+ "Supplier Name", 
+ "Stock", 
+ "Number Format", 
+ "Default Stock UOM", 
+ "Stock Frozen Upto", 
+ "Authourized Role (Frozen Entry)", 
+ "Hide Currency Symbol", 
+ "TerritoryHelp"
 ]
\ No newline at end of file
diff --git a/setup/doctype/item_group/locale/_messages_doc.json b/setup/doctype/item_group/locale/_messages_doc.json
index d78d31e..325ef6a 100644
--- a/setup/doctype/item_group/locale/_messages_doc.json
+++ b/setup/doctype/item_group/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
  "Show in Website", 
- "old_parent", 
- "HTML / Banner that will show on the top of product list.", 
- "rgt", 
- "Website Settings", 
- "Only leaf nodes are allowed in transaction", 
  "No", 
- "Setup", 
+ "Parent Item Group", 
+ "lft", 
+ "Website Settings", 
+ "Item Classification", 
+ "rgt", 
+ "Description", 
  "Check this if you want to show in website", 
  "Has Child Node", 
- "Parent Item Group", 
  "Slideshow", 
- "Item Classification", 
- "lft", 
- "Item Group Name", 
  "File List", 
- "Item Group", 
  "Page Name", 
  "Show this slideshow at the top of the page", 
- "Yes", 
- "Description"
+ "Setup", 
+ "HTML / Banner that will show on the top of product list.", 
+ "Item Group Name", 
+ "Item Group", 
+ "Only leaf nodes are allowed in transaction", 
+ "old_parent", 
+ "Yes"
 ]
\ No newline at end of file
diff --git a/setup/doctype/jobs_email_settings/locale/_messages_doc.json b/setup/doctype/jobs_email_settings/locale/_messages_doc.json
index 62e7095..f759327 100644
--- a/setup/doctype/jobs_email_settings/locale/_messages_doc.json
+++ b/setup/doctype/jobs_email_settings/locale/_messages_doc.json
@@ -8,8 +8,8 @@
  "Setup", 
  "Email settings for jobs email id \"jobs@example.com\"", 
  "Host", 
- "Settings to extract Job Applicants from a mailbox e.g. \"jobs@example.com\"", 
  "POP3 server e.g. (pop.gmail.com)", 
+ "Settings to extract Job Applicants from a mailbox e.g. \"jobs@example.com\"", 
  "Check to activate", 
  "Extract Emails", 
  "Email Id"
diff --git a/setup/doctype/market_segment/locale/_messages_doc.json b/setup/doctype/market_segment/locale/_messages_doc.json
index e20c8c7..fa85763 100644
--- a/setup/doctype/market_segment/locale/_messages_doc.json
+++ b/setup/doctype/market_segment/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Setup", 
- "Segment Name", 
- "Market Segment", 
  "Trash Reason", 
- "Details"
+ "Segment Name", 
+ "Setup", 
+ "Details", 
+ "Market Segment"
 ]
\ No newline at end of file
diff --git a/setup/doctype/sms_parameter/locale/_messages_doc.json b/setup/doctype/sms_parameter/locale/_messages_doc.json
index 0890ad9..daf8dc4 100644
--- a/setup/doctype/sms_parameter/locale/_messages_doc.json
+++ b/setup/doctype/sms_parameter/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
- "Setup", 
  "Parameter", 
+ "Setup", 
  "Value", 
  "SMS Parameter"
 ]
\ No newline at end of file
diff --git a/setup/doctype/terms_and_conditions/locale/_messages_doc.json b/setup/doctype/terms_and_conditions/locale/_messages_doc.json
index 6cad6d5..fd5d7d1 100644
--- a/setup/doctype/terms_and_conditions/locale/_messages_doc.json
+++ b/setup/doctype/terms_and_conditions/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Standard Terms and Conditions that can be added to Sales and Purchases.Examples:1. Validity of the offer.1. Payment Terms (In Advance, On Credit, part advance etc).1. What is extra (or payable by the Customer).1. Safety / usage warning.1. Warranty if any.1. Returns Policy.1. Terms of shipping, if applicable.1. Ways of addressing disputes, indemnity, liability, etc.1. Address and Contact of your Company.", 
- "Setup", 
- "Terms and Conditions", 
  "Trash Reason", 
- "Title"
+ "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
+ "Terms and Conditions", 
+ "Title", 
+ "Setup"
 ]
\ No newline at end of file
diff --git a/setup/doctype/territory/locale/_messages_doc.json b/setup/doctype/territory/locale/_messages_doc.json
index caff54e..c76e2b7 100644
--- a/setup/doctype/territory/locale/_messages_doc.json
+++ b/setup/doctype/territory/locale/_messages_doc.json
@@ -1,22 +1,22 @@
 [
  "Territory Targets", 
- "Parent Territory", 
- "Territory Manager", 
- "For reference", 
- "Only leaf nodes are allowed in transaction", 
- "No", 
- "Setup", 
- "Has Child Node", 
  "Trash Reason", 
  "Target Distribution", 
- "Territory Name", 
- "old_parent", 
+ "No", 
  "lft", 
- "Classification of Customers by region", 
- "Target Details", 
- "rgt", 
- "Yes", 
- "Territory", 
+ "For reference", 
  "Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.", 
- "Select Budget Distribution to unevenly distribute targets across months."
+ "Territory Manager", 
+ "Territory", 
+ "rgt", 
+ "Has Child Node", 
+ "Classification of Customers by region", 
+ "Parent Territory", 
+ "Setup", 
+ "Territory Name", 
+ "Select Budget Distribution to unevenly distribute targets across months.", 
+ "Only leaf nodes are allowed in transaction", 
+ "old_parent", 
+ "Target Details", 
+ "Yes"
 ]
\ No newline at end of file
diff --git a/setup/doctype/uom/locale/_messages_doc.json b/setup/doctype/uom/locale/_messages_doc.json
index 497c763..0c79dff 100644
--- a/setup/doctype/uom/locale/_messages_doc.json
+++ b/setup/doctype/uom/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "UOM Name", 
+ "Trash Reason", 
  "Setup", 
  "UOM Details", 
- "Trash Reason", 
+ "UOM Name", 
  "UOM"
 ]
\ No newline at end of file
diff --git a/setup/doctype/workflow_action_detail/locale/_messages_doc.json b/setup/doctype/workflow_action_detail/locale/_messages_doc.json
index 6def7f1..b97b851 100644
--- a/setup/doctype/workflow_action_detail/locale/_messages_doc.json
+++ b/setup/doctype/workflow_action_detail/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
- "Field", 
- "Setup", 
  "Workflow Action Detail", 
- "Value"
+ "Setup", 
+ "Value", 
+ "Field"
 ]
\ No newline at end of file
diff --git a/setup/doctype/workflow_engine/locale/_messages_doc.json b/setup/doctype/workflow_engine/locale/_messages_doc.json
index f03ed6a..3f3207e 100644
--- a/setup/doctype/workflow_engine/locale/_messages_doc.json
+++ b/setup/doctype/workflow_engine/locale/_messages_doc.json
@@ -1,4 +1,4 @@
 [
- "Setup", 
- "Workflow Engine"
+ "Workflow Engine", 
+ "Setup"
 ]
\ No newline at end of file
diff --git a/setup/doctype/workflow_rule/locale/_messages_doc.json b/setup/doctype/workflow_rule/locale/_messages_doc.json
index fbd8fd8..191f168 100644
--- a/setup/doctype/workflow_rule/locale/_messages_doc.json
+++ b/setup/doctype/workflow_rule/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
+ "Extra Condition", 
+ "No", 
  "Select Form", 
- "Rule Name", 
  "Intro HTML", 
  "Raise Exception", 
- "Define Rule", 
- "Rule Priority", 
  "Action Detail", 
+ "Workflow Action Details", 
+ "Define Rule", 
+ "Active", 
  "Setup", 
- "No", 
- "Extra Condition", 
  "Enter message", 
  "Reject HTML", 
- "Workflow Action Details", 
- "Inactive", 
  "Rule Definition", 
+ "Yes", 
+ "Rule Name", 
+ "Rule Priority", 
+ "Inactive", 
  "Rule Status", 
- "Active", 
  "Action html", 
  "Workflow Rule Details", 
- "Yes", 
  "Workflow Rule"
 ]
\ No newline at end of file
diff --git a/setup/doctype/workflow_rule_detail/locale/_messages_doc.json b/setup/doctype/workflow_rule_detail/locale/_messages_doc.json
index 7019460..b6b0ab5 100644
--- a/setup/doctype/workflow_rule_detail/locale/_messages_doc.json
+++ b/setup/doctype/workflow_rule_detail/locale/_messages_doc.json
@@ -5,7 +5,6 @@
  "Setup", 
  "No", 
  "equal", 
- "[]", 
  "greater than", 
  "Field", 
  "Value", 
diff --git a/setup/locale/_messages_py.json b/setup/locale/_messages_py.json
index a727ba4..f41b905 100644
--- a/setup/locale/_messages_py.json
+++ b/setup/locale/_messages_py.json
@@ -1,3 +1,3 @@
 [
- "Please specify Default Currency in Company Master \\\t\t\tand Global Defaults"
+ "Please specify Default Currency in Company Master \\\n\t\t\tand Global Defaults"
 ]
\ No newline at end of file
diff --git a/setup/module_def/setup/locale/_messages_doc.json b/setup/module_def/setup/locale/_messages_doc.json
index 2d86989..1537348 100644
--- a/setup/module_def/setup/locale/_messages_doc.json
+++ b/setup/module_def/setup/locale/_messages_doc.json
@@ -1,20 +1,20 @@
 [
  "Item Classification", 
- "Webforms", 
- "Modules Setup", 
+ "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
+ "Setup", 
  "Email Settings for Outgoing and Incoming Emails.", 
- "Standard Terms and Conditions that can be added to Sales and Purchases.Examples:1. Validity of the offer.1. Payment Terms (In Advance, On Credit, part advance etc).1. What is extra (or payable by the Customer).1. Safety / usage warning.1. Warranty if any.1. Returns Policy.1. Terms of shipping, if applicable.1. Ways of addressing disputes, indemnity, liability, etc.1. Address and Contact of your Company.", 
+ "Modules Setup", 
  "Price List Master", 
  "**Currency** Master", 
  "Send automatic emails to Contacts on Submitting transactions.", 
- "Setup", 
  "Send regular summary reports via Email.", 
  "Email settings for jobs email id \"jobs@example.com\"", 
  "Email settings to extract Leads from sales email id e.g. \"sales@example.com\"", 
- "Classification of Customers by region", 
  "Set prefix for numbering series on your transactions", 
  "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", 
  "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", 
  "Permission Engine", 
- "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+ "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
+ "Webforms", 
+ "Classification of Customers by region"
 ]
\ No newline at end of file
diff --git a/startup/__init__.py b/startup/__init__.py
index 7abd5e2..05f95a8 100644
--- a/startup/__init__.py
+++ b/startup/__init__.py
@@ -27,6 +27,7 @@
 	"español": "es",
 	"français": "fr",
 	"português": "pt",
+	"português brasileiro": "pt-BR",
 	"nederlands": "nl",
 	"српски":"sr",
 	"தமிழ்": "ta",
@@ -35,7 +36,7 @@
 	"العربية":"ar"
 }
 
-lang_list = ["ar", "en", "hi", "es", "fr", "pt", "nl", "hr", "th"]
+lang_list = ["ar", "en", "hi", "es", "fr", "pt-BR", "pt", "nl", "hr", "th"]
 
 product_name = "ERPNext"
 profile_defaults = {
diff --git a/stock/doctype/delivery_note/locale/_messages_doc.json b/stock/doctype/delivery_note/locale/_messages_doc.json
index 4578016..1144a68 100644
--- a/stock/doctype/delivery_note/locale/_messages_doc.json
+++ b/stock/doctype/delivery_note/locale/_messages_doc.json
@@ -30,6 +30,7 @@
  "Date on which lorry started from your warehouse", 
  "The date at which current entry will get or has actually executed.", 
  "More Info", 
+ "Draft", 
  "Posting Time", 
  "To Warehouse", 
  "Grand Total (Export)", 
@@ -69,7 +70,6 @@
  "Rounded Total (Export)", 
  "Totals", 
  "In Words (Export)", 
- "Draft", 
  "Cancel Reason", 
  "Select the currency in which price list is maintained", 
  "Terms and Conditions HTML", 
diff --git a/stock/doctype/item_customer_detail/locale/_messages_doc.json b/stock/doctype/item_customer_detail/locale/_messages_doc.json
index 86b3d7c..23485ec 100644
--- a/stock/doctype/item_customer_detail/locale/_messages_doc.json
+++ b/stock/doctype/item_customer_detail/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
  "Item Customer Detail", 
+ "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
  "Customer Name", 
  "Ref Code", 
- "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/item_quality_inspection_parameter/locale/_messages_doc.json b/stock/doctype/item_quality_inspection_parameter/locale/_messages_doc.json
index 342c934..19539e5 100644
--- a/stock/doctype/item_quality_inspection_parameter/locale/_messages_doc.json
+++ b/stock/doctype/item_quality_inspection_parameter/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
+ "Item Quality Inspection Parameter", 
  "Parameter", 
  "Acceptance Criteria", 
- "Item Quality Inspection Parameter", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/item_tax/locale/_messages_doc.json b/stock/doctype/item_tax/locale/_messages_doc.json
index 6bdd87e..c747156 100644
--- a/stock/doctype/item_tax/locale/_messages_doc.json
+++ b/stock/doctype/item_tax/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
- "Tax Rate", 
  "Tax", 
+ "Tax Rate", 
  "Item Tax", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/item_website_specification/locale/_messages_doc.json b/stock/doctype/item_website_specification/locale/_messages_doc.json
index a0c1ff8..d93a988 100644
--- a/stock/doctype/item_website_specification/locale/_messages_doc.json
+++ b/stock/doctype/item_website_specification/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Label", 
- "Item Website Specification", 
- "Table for Item that will be shown in Web Site", 
  "Description", 
- "Stock"
+ "Label", 
+ "Table for Item that will be shown in Web Site", 
+ "Stock", 
+ "Item Website Specification"
 ]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_item/locale/_messages_doc.json b/stock/doctype/landed_cost_item/locale/_messages_doc.json
index 3db3283..237ca4c 100644
--- a/stock/doctype/landed_cost_item/locale/_messages_doc.json
+++ b/stock/doctype/landed_cost_item/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
+ "Landed Cost Item", 
  "Description", 
  "Amount", 
- "Landed Cost Item", 
  "Account Head", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_purchase_receipt/locale/_messages_doc.json b/stock/doctype/landed_cost_purchase_receipt/locale/_messages_doc.json
index d975f2d..0a4b18e 100644
--- a/stock/doctype/landed_cost_purchase_receipt/locale/_messages_doc.json
+++ b/stock/doctype/landed_cost_purchase_receipt/locale/_messages_doc.json
@@ -1,6 +1,6 @@
 [
- "Select PR", 
  "Landed Cost Purchase Receipt", 
+ "Select PR", 
  "Purchase Receipt", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/doctype/material_request/locale/_messages_doc.json b/stock/doctype/material_request/locale/_messages_doc.json
index 1fb249f..7ecd1f7 100644
--- a/stock/doctype/material_request/locale/_messages_doc.json
+++ b/stock/doctype/material_request/locale/_messages_doc.json
@@ -2,10 +2,9 @@
  "% of materials ordered against this Material Request", 
  "Select Terms and Conditions", 
  "Material Request Items", 
- "Transfer", 
+ "Material Request Type", 
  "IDT", 
  "Material Request", 
- "Draft", 
  "Select Print Heading", 
  "Stock", 
  "Status", 
@@ -16,7 +15,7 @@
  "Amended From", 
  "File List", 
  "Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template", 
- "Material Request Type", 
+ "Transfer", 
  "Remarks", 
  "Sales Order No", 
  "Filing in Additional Information about the Material Request will help you analyze your data better.", 
@@ -40,6 +39,7 @@
  "The date at which current entry is corrected in the system.", 
  "More Info", 
  "MREQ-", 
+ "Draft", 
  "Terms and Conditions Content", 
  "Print Heading"
 ]
\ No newline at end of file
diff --git a/stock/doctype/packing_slip/locale/_messages_doc.json b/stock/doctype/packing_slip/locale/_messages_doc.json
index 4a921dd..6b6ecf0 100644
--- a/stock/doctype/packing_slip/locale/_messages_doc.json
+++ b/stock/doctype/packing_slip/locale/_messages_doc.json
@@ -15,13 +15,13 @@
  "Gross Weight UOM", 
  "Items", 
  "Package Item Details", 
+ "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
  "Net Weight UOM", 
- "Indicates that the package is a part of this delivery", 
  "Amendment Date", 
  "Package Weight Details", 
  "Series", 
  "Packing Slip", 
  "Delivery Note", 
  "Misc Details", 
- "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+ "Indicates that the package is a part of this delivery"
 ]
\ No newline at end of file
diff --git a/stock/doctype/purchase_receipt/locale/_messages_doc.json b/stock/doctype/purchase_receipt/locale/_messages_doc.json
index 3031b61..167bf61 100644
--- a/stock/doctype/purchase_receipt/locale/_messages_doc.json
+++ b/stock/doctype/purchase_receipt/locale/_messages_doc.json
@@ -25,7 +25,7 @@
  "Time at which materials were received", 
  "The date at which current entry will get or has actually executed.", 
  "More Info", 
- "Other Details", 
+ "Draft", 
  "Total Tax", 
  "Posting Time", 
  "Net Total (Import)", 
@@ -43,6 +43,7 @@
  "In Words", 
  "Range", 
  "Contact", 
+ "Other Details", 
  "GRN", 
  "Rate at which supplier's currency is converted to company's base currency", 
  "Currency", 
@@ -56,7 +57,6 @@
  "No", 
  "Calculate Tax", 
  "Totals", 
- "Draft", 
  "Terms and Conditions HTML", 
  "Status", 
  "Cancel Reason", 
diff --git a/stock/doctype/purchase_receipt_item/locale/_messages_doc.json b/stock/doctype/purchase_receipt_item/locale/_messages_doc.json
index de35b06..2986b6d 100644
--- a/stock/doctype/purchase_receipt_item/locale/_messages_doc.json
+++ b/stock/doctype/purchase_receipt_item/locale/_messages_doc.json
@@ -30,7 +30,7 @@
  "Ref Rate*", 
  "PO No", 
  "Rejected Quantity", 
- "Tax detail table fetched from item master as a string and stored in this field.Used for Taxes and Charges", 
+ "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
  "Discount  %", 
  "QA No", 
  "Serial No", 
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 979f20f..10781c8 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
@@ -1,5 +1,6 @@
 [
  "Make Credit Note", 
+ "Make Stock Entry", 
  "Make Excise Invoice", 
  "Sales Return", 
  "Get Items", 
@@ -10,7 +11,6 @@
  "Make Debit Note", 
  "Cust/Supp Address", 
  "Sales Invoice No", 
- "Make Stock Entry", 
  "Purchase Receipt No", 
  "Purchase Return", 
  "Sales and Purchase Return Items", 
diff --git a/stock/doctype/sales_bom/locale/_messages_doc.json b/stock/doctype/sales_bom/locale/_messages_doc.json
index 93e444e..2e6ecb6 100644
--- a/stock/doctype/sales_bom/locale/_messages_doc.json
+++ b/stock/doctype/sales_bom/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
  "Package Items", 
  "Sales BOM Items", 
- "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials", 
+ "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", 
  "List items that form the package.", 
  "The Item that represents the Package. This Item must have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\"", 
  "Sales BOM Item", 
diff --git a/stock/doctype/stock_entry/locale/_messages_py.json b/stock/doctype/stock_entry/locale/_messages_py.json
index cbf5d79..9dc0e18 100644
--- a/stock/doctype/stock_entry/locale/_messages_py.json
+++ b/stock/doctype/stock_entry/locale/_messages_py.json
@@ -1,18 +1,21 @@
 [
+ "Material Request", 
  "' 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", 
+ "All items have already been transferred \\\n\t\t\t\tfor this Production Order.", 
  "Source and Target Warehouse cannot be same", 
  "Item: '", 
+ "To fetch items again, click on 'Get Items' button \\\n\t\t\t\t\t\tor update the Quantity manually.", 
  "Production Order", 
- "All items have already been transferred \\\t\t\t\tfor this Production Order.", 
- "To fetch items again, click on 'Get Items' button \\\t\t\t\t\t\tor update the Quantity manually.", 
+ "does not match", 
  "Source Warehouse", 
  "Item", 
  "Quantity should be equal to Manufacturing Quantity. ", 
  "Row #", 
+ "of", 
  "Quantity already manufactured", 
  "Hence, maximum allowed Manufacturing Quantity", 
  "Target Warehouse", 
diff --git a/stock/doctype/stock_entry_detail/locale/_messages_doc.json b/stock/doctype/stock_entry_detail/locale/_messages_doc.json
index f509d23..1bbb94e 100644
--- a/stock/doctype/stock_entry_detail/locale/_messages_doc.json
+++ b/stock/doctype/stock_entry_detail/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
- "Valuation Rate", 
- "Description", 
- "Qty as per Stock UOM", 
- "Stock UOM", 
- "Conversion Factor", 
- "Material Request used to make this Stock Entry", 
- "BOM No. for a Finished Good Item", 
  "Material Request", 
- "Amount", 
+ "Batch No", 
+ "UOM", 
+ "Stock", 
+ "Description", 
+ "Conversion Factor", 
+ "Stock UOM", 
+ "Qty as per Stock UOM", 
+ "Material Request used to make this Stock Entry", 
  "Source Warehouse", 
+ "BOM No", 
+ "Amount", 
+ "Item Code", 
+ "Stock Entry Detail", 
+ "BOM No. for a Finished Good Item", 
  "Qty", 
  "Serial No", 
- "BOM No", 
  "Target Warehouse", 
  "Material Request Item", 
- "Batch No", 
- "Stock", 
- "Actual Qty (at source/target)", 
- "Item Code", 
- "UOM", 
- "Stock Entry Detail"
+ "Valuation Rate", 
+ "Actual Qty (at source/target)"
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_reconciliation/locale/_messages_py.json b/stock/doctype/stock_reconciliation/locale/_messages_py.json
index 5c64347..e5f7a14 100644
--- a/stock/doctype/stock_reconciliation/locale/_messages_py.json
+++ b/stock/doctype/stock_reconciliation/locale/_messages_py.json
@@ -1,10 +1,10 @@
 [
  "Stock Reconciliation file not uploaded", 
- "Row # ", 
+ " is less than equals to zero in the system, \\\n\t\t\t\t\t\tvaluation rate is mandatory for this item", 
  "Sorry! We can only allow upto 100 rows for Stock Reconciliation.", 
  "As existing qty for item: ", 
+ "' can not be managed using Stock Reconciliation.\\\n\t\t\t\t\tYou can add/delete Serial No directly, \\\n\t\t\t\t\tto modify stock of this item.", 
  "Serialized Item: '", 
- "' can not be managed using Stock Reconciliation.\\\t\t\t\t\tYou can add/delete Serial No directly, \\\t\t\t\t\tto modify stock of this item.", 
- "Hey! You seem to be using the wrong template. \\\t\t\t\tClick on 'Download Template' button to get the correct template.", 
- " is less than equals to zero in the system, \\\t\t\t\t\t\tvaluation rate is mandatory for this item"
+ "Row # ", 
+ "Hey! You seem to be using the wrong template. \\\n\t\t\t\tClick on 'Download Template' button to get the correct template."
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_uom_replace_utility/locale/_messages_doc.json b/stock/doctype/stock_uom_replace_utility/locale/_messages_doc.json
index f68ca3f..dc55b35 100644
--- a/stock/doctype/stock_uom_replace_utility/locale/_messages_doc.json
+++ b/stock/doctype/stock_uom_replace_utility/locale/_messages_doc.json
@@ -1,9 +1,9 @@
 [
  "New Stock UOM", 
  "Conversion Factor", 
- "Update", 
- "Stock UOM Replace Utility", 
  "Current Stock UOM", 
+ "Stock UOM Replace Utility", 
+ "Update", 
  "Item", 
  "Stock"
 ]
\ No newline at end of file
diff --git a/stock/module_def/stock/locale/_messages_doc.json b/stock/module_def/stock/locale/_messages_doc.json
index 5fae381..e521117 100644
--- a/stock/module_def/stock/locale/_messages_doc.json
+++ b/stock/module_def/stock/locale/_messages_doc.json
@@ -1,23 +1,23 @@
 [
- "Serial No Service Contract Expiry", 
- "Serial No Warranty Expiry", 
- "Ordered Items To Be Delivered", 
  "A logical Warehouse against which stock entries are made.", 
  "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
  "Featured Item in Item Group", 
  "Stock Analytics", 
- "Serial No Status", 
- "Distinct unit of an Item", 
- "Stock Home", 
- "Item-Wise Price List", 
  "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.", 
- "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. The package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.Note: BOM = Bill of Materials", 
- "Stock Level", 
+ "Item-Wise Price List", 
+ "A Product or a Service that is bought, sold or kept in stock.", 
+ "Serial No Status", 
+ "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", 
+ "Stock Home", 
  "Table for Item that will be shown in Web Site", 
+ "Purchase Order Items To Be Received", 
+ "Serial No Warranty Expiry", 
+ "Ordered Items To Be Delivered", 
+ "Stock Ledger", 
+ "Distinct unit of an Item", 
+ "Serial No Service Contract Expiry", 
+ "Stock Level", 
  "Stock Ageing", 
  "Stock Balance", 
- "A Product or a Service that is bought, sold or kept in stock.", 
- "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
- "Purchase Order Items To Be Received", 
- "Stock Ledger"
+ "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule_item/locale/_messages_doc.json b/support/doctype/maintenance_schedule_item/locale/_messages_doc.json
index 6c74641..1aa7188 100644
--- a/support/doctype/maintenance_schedule_item/locale/_messages_doc.json
+++ b/support/doctype/maintenance_schedule_item/locale/_messages_doc.json
@@ -11,10 +11,10 @@
  "Random", 
  "Serial No", 
  "Against Docname", 
- "Half Yearly", 
  "Incharge Name", 
  "Quarterly", 
+ "Half Yearly", 
  "Start Date", 
- "Item Code", 
- "Weekly"
+ "Weekly", 
+ "Item Code"
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit_purpose/locale/_messages_doc.json b/support/doctype/maintenance_visit_purpose/locale/_messages_doc.json
index 4a005d9..47f0d95 100644
--- a/support/doctype/maintenance_visit_purpose/locale/_messages_doc.json
+++ b/support/doctype/maintenance_visit_purpose/locale/_messages_doc.json
@@ -1,11 +1,11 @@
 [
+ "Against Document Detail No", 
  "Item Name", 
  "Description", 
  "Maintenance Visit Purpose", 
  "Support", 
  "Against Document No", 
  "Serial No", 
- "Against Document Detail No", 
  "Work Done", 
  "Service Person", 
  "Document Type", 
diff --git a/support/doctype/newsletter/locale/_messages_doc.json b/support/doctype/newsletter/locale/_messages_doc.json
index 6b608b5..7ebe9e3 100644
--- a/support/doctype/newsletter/locale/_messages_doc.json
+++ b/support/doctype/newsletter/locale/_messages_doc.json
@@ -3,7 +3,7 @@
  "Create and Send Newsletters", 
  "Support", 
  "Lead Source", 
- "Custom", 
+ "Lead Status", 
  "Test", 
  "Test Email Id", 
  "Supplier", 
@@ -18,7 +18,7 @@
  "Send to this list", 
  "Contact", 
  "A Lead with this email id should exist", 
- "Lead Status", 
+ "Custom", 
  "NL-", 
  "Test the Newsletter", 
  "Check how the newsletter looks in an email by sending it to your email.", 
diff --git a/support/doctype/newsletter/locale/_messages_py.json b/support/doctype/newsletter/locale/_messages_py.json
index b113e21..6a5388b 100644
--- a/support/doctype/newsletter/locale/_messages_py.json
+++ b/support/doctype/newsletter/locale/_messages_py.json
@@ -1,4 +1,4 @@
 [
- "Sending newsletters is not allowed for Trial users, \\\t\t\t\tto prevent abuse of this feature.", 
+ "Sending newsletters is not allowed for Trial users, \\\n\t\t\t\tto prevent abuse of this feature.", 
  "Please save the Newsletter before sending."
 ]
\ 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 ab384b0..db8b90d 100644
--- a/support/doctype/support_ticket/locale/_messages_doc.json
+++ b/support/doctype/support_ticket/locale/_messages_doc.json
@@ -18,10 +18,10 @@
  "Customer", 
  "Support Ticket", 
  "Contact", 
- "Waiting for Customer", 
+ "Customer Name", 
  "Resolution Date", 
  "Opening Date", 
- "Customer Name", 
+ "Waiting for Customer", 
  "Open", 
  "Additional Info", 
  "Subject"
diff --git a/utilities/doctype/answer/locale/_messages_doc.json b/utilities/doctype/answer/locale/_messages_doc.json
index 1de6dd5..d114eee 100644
--- a/utilities/doctype/answer/locale/_messages_doc.json
+++ b/utilities/doctype/answer/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Answer", 
- "Points", 
  "Question", 
  "Utilities", 
+ "Points", 
+ "Answer", 
  "Users Voted"
 ]
\ No newline at end of file
diff --git a/utilities/doctype/contact/locale/_messages_doc.json b/utilities/doctype/contact/locale/_messages_doc.json
index c6a0750..88d1090 100644
--- a/utilities/doctype/contact/locale/_messages_doc.json
+++ b/utilities/doctype/contact/locale/_messages_doc.json
@@ -6,12 +6,12 @@
  "Department", 
  "Supplier Name", 
  "Status", 
- "Enter department to which this Contact belongs", 
+ "Designation", 
  "Utilities", 
  "Phone", 
  "Enter designation of this Contact", 
  "Customer", 
- "Designation", 
+ "Enter department to which this Contact belongs", 
  "Contact", 
  "Customer Name", 
  "Mobile No", 
diff --git a/utilities/doctype/rename_tool/locale/_messages_doc.json b/utilities/doctype/rename_tool/locale/_messages_doc.json
index 078879e..3ed7a4f 100644
--- a/utilities/doctype/rename_tool/locale/_messages_doc.json
+++ b/utilities/doctype/rename_tool/locale/_messages_doc.json
@@ -1,6 +1,5 @@
 [
  "Customer", 
- "Profile", 
  "Account", 
  "Document to rename", 
  "Item", 
@@ -10,8 +9,9 @@
  "Warehouse", 
  "Serial No", 
  "Employee", 
- "New Name", 
+ "Profile", 
  "Supplier", 
  "Rename Tool", 
- "Rename"
+ "Rename", 
+ "New Name"
 ]
\ No newline at end of file
diff --git a/utilities/doctype/sms_receiver/locale/_messages_doc.json b/utilities/doctype/sms_receiver/locale/_messages_doc.json
index 7953210..e9845c5 100644
--- a/utilities/doctype/sms_receiver/locale/_messages_doc.json
+++ b/utilities/doctype/sms_receiver/locale/_messages_doc.json
@@ -1,7 +1,7 @@
 [
- "Receiver Name", 
  "SMS Receiver", 
- "Customer Name", 
  "Utilities", 
+ "Receiver Name", 
+ "Customer Name", 
  "Mobile No"
 ]
\ No newline at end of file
diff --git a/website/doctype/blog/locale/_messages_doc.json b/website/doctype/blog/locale/_messages_doc.json
index 1e9be57..033442b 100644
--- a/website/doctype/blog/locale/_messages_doc.json
+++ b/website/doctype/blog/locale/_messages_doc.json
@@ -2,9 +2,11 @@
  "Website", 
  "Content", 
  "Title", 
+ "Blog Intro", 
  "Page Name", 
  "Blog", 
  "File List", 
  "Published", 
- "Email Sent"
+ "Email Sent", 
+ "Description for listing page, in plain text, only a couple of lines."
 ]
\ No newline at end of file
diff --git a/website/doctype/contact_us_settings/locale/_messages_doc.json b/website/doctype/contact_us_settings/locale/_messages_doc.json
index e928395..13ad77b 100644
--- a/website/doctype/contact_us_settings/locale/_messages_doc.json
+++ b/website/doctype/contact_us_settings/locale/_messages_doc.json
@@ -2,11 +2,13 @@
  "Website", 
  "Settings for Contact Us Page", 
  "Help", 
- "Introductory information for the Contact Us Page", 
  "Introduction", 
  "Query Options", 
  "Contact Us Settings", 
  "Address to be displayed on the Contact Page", 
  "Address", 
- "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas."
+ "Default: \"Contact Us\"", 
+ "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas.", 
+ "Heading", 
+ "Introductory information for the Contact Us Page"
 ]
\ No newline at end of file
diff --git a/website/doctype/products_settings/locale/_messages_doc.json b/website/doctype/products_settings/locale/_messages_doc.json
index 74cddb7..c44eb10 100644
--- a/website/doctype/products_settings/locale/_messages_doc.json
+++ b/website/doctype/products_settings/locale/_messages_doc.json
@@ -1,7 +1,6 @@
 [
  "Website", 
- "", 
- "Products Settings", 
  "Product Groups that are listed on the website. The first product group from this list will be listed by default on the \"Products Page\"", 
- "Groups"
+ "Groups", 
+ "Products Settings"
 ]
\ No newline at end of file
diff --git a/website/doctype/style_settings/locale/_messages_doc.json b/website/doctype/style_settings/locale/_messages_doc.json
index 642d19a..28e8e98 100644
--- a/website/doctype/style_settings/locale/_messages_doc.json
+++ b/website/doctype/style_settings/locale/_messages_doc.json
@@ -3,7 +3,6 @@
  "12px", 
  "13px", 
  "Verdana", 
- "Solid background color (default light gray)", 
  "Set your background color, font and image (tiled)", 
  "Custom CSS", 
  "Lato", 
@@ -26,6 +25,7 @@
  "If image is selected, color will be ignored (attach first)", 
  "Background Image", 
  "Tahoma", 
+ "Solid background color (default light gray)", 
  "Font", 
  "Heading Font"
 ]
\ No newline at end of file
diff --git a/website/doctype/web_page/locale/_messages_doc.json b/website/doctype/web_page/locale/_messages_doc.json
index c377271..7055e1f 100644
--- a/website/doctype/web_page/locale/_messages_doc.json
+++ b/website/doctype/web_page/locale/_messages_doc.json
@@ -12,7 +12,6 @@
  "File List", 
  "Page Name", 
  "Page content", 
- "Page to show on the website", 
  "Center", 
  "Content in markdown format that appears on the main side of your page", 
  "Title / headline of your page", 
@@ -22,6 +21,7 @@
  "Left", 
  "Right", 
  "Page url name (auto-generated) (add \".html\")", 
+ "Page to show on the website\n", 
  "Link to other pages in the side bar and next section", 
  "Main Section", 
  "Web Page"
diff --git a/website/doctype/website_product_category/locale/_messages_doc.json b/website/doctype/website_product_category/locale/_messages_doc.json
index c319fe5..cacc0ac 100644
--- a/website/doctype/website_product_category/locale/_messages_doc.json
+++ b/website/doctype/website_product_category/locale/_messages_doc.json
@@ -2,12 +2,6 @@
  "Website", 
  "Product Category for website", 
  "Indent", 
- "1", 
- "0", 
- "3", 
- "2", 
- "5", 
- "4", 
  "Item Group", 
  "Website Product Category"
 ]
\ No newline at end of file
diff --git a/website/doctype/website_settings/locale/_messages_doc.json b/website/doctype/website_settings/locale/_messages_doc.json
index 4c9c59f..2b3501e 100644
--- a/website/doctype/website_settings/locale/_messages_doc.json
+++ b/website/doctype/website_settings/locale/_messages_doc.json
@@ -2,7 +2,6 @@
  "Copyright", 
  "Misc", 
  "Background shade of the top menu bar", 
- "Black", 
  "Website Settings", 
  "Google Analytics ID", 
  "White", 
@@ -18,13 +17,14 @@
  "Sub-domain provided by erpnext.com", 
  "Enter domain names associated to this website, each on a new line", 
  "Domain List", 
- "Brand is what appears on the top-right of the toolbar. If it is an image, make sure ithas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px", 
  "Address and other legal information you may want to put in the footer.", 
  "Footer", 
+ "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px", 
  "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", 
  "Footer Items", 
  "FavIcon", 
  "Twitter Share", 
+ "Twitter Share via", 
  "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]", 
  "Home Page", 
  "Facebook Share", 
@@ -36,6 +36,6 @@
  "Tweet will be shared via your user account (if specified)", 
  "If checked, the Home page will be the default Item Group for the website.", 
  "Brand HTML", 
- "Twitter Share via", 
+ "Black", 
  "Title Prefix"
 ]
\ No newline at end of file
diff --git a/website/module_def/website/locale/_messages_doc.json b/website/module_def/website/locale/_messages_doc.json
index c33eada..9c038db 100644
--- a/website/module_def/website/locale/_messages_doc.json
+++ b/website/module_def/website/locale/_messages_doc.json
@@ -1,14 +1,13 @@
 [
  "Settings for Product Catalog on the website", 
- "", 
+ "Product Category for website", 
  "Settings for Contact Us Page", 
  "Cross Listing of Item in multiple groups", 
- "Product Category for website", 
+ "Page to show on the website\n", 
  "Slideshow like display for the website", 
- "Page to show on the website", 
  "Settings for the About Us Page", 
  "Website Home", 
- "Unsubscribe", 
  "Set your background color, font and image (tiled)", 
+ "Unsubscribe", 
  "Script to attach to all web pages."
 ]
\ No newline at end of file