[update] translations
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 03b8dcc..ff837ce 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -3,7 +3,7 @@
 DocType: Employee,Divorced,離婚
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,Warning: Same item has been entered multiple times.,警告:相同項目已經輸入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,項目已同步
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目將在一個事務中多次添加
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目在一個交易中被多次新增
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費類產品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,請選擇黨第一型
@@ -21,6 +21,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消,首先Unstop它取消
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource > HR Settings,請安裝員工在人力資源命名系統> HR設置
 DocType: Purchase Order,Customer Contact,客戶聯繫
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
@@ -48,12 +49,11 @@
 DocType: Quality Inspection Reading,Parameter,參數
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:速率必須與{1}:{2}({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +228,New Leave Application,新假期申請
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +630,Error: {0} > {1},錯誤:{0}> {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,新假期申請
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款(負債)
 DocType: Employee Education,Year of Passing,路過的一年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
@@ -64,7 +64,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
 DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延遲支付(天)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +612,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
@@ -81,7 +81,7 @@
 DocType: Cost Center,Stock User,股票用戶
 DocType: Company,Phone No,電話號碼
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",活動日誌由用戶對任務可用於跟踪時間,計費執行。
-apps/erpnext/erpnext/controllers/recurring_document.py +130,New {0}: #{1},新{0}:#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +131,New {0}: #{1},新{0}:#{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
@@ -93,7 +93,7 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列,一為舊名稱,一個用於新名稱
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Kg,公斤
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,開放的工作。
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +39,PayPal Settings missing,貝寶設置丟失
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,選擇倉庫...
@@ -101,8 +101,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,從獲得項目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +399,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,取得項目來源
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
@@ -114,6 +114,7 @@
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,股票報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
 DocType: Tax Rule,Tax Type,稅收類型
@@ -126,7 +127,6 @@
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清單
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,開盤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
@@ -164,71 +164,71 @@
 DocType: Delivery Note,Installation Status,安裝狀態
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收+批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
-apps/erpnext/erpnext/stock/get_item_details.py +123,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
+apps/erpnext/erpnext/stock/get_item_details.py +140,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板,填寫相應的數據,並附加了修改過的文件。
 在選定時間段內所有時間和員工的組合會在模板中,與現有的考勤記錄"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,之後銷售發票已提交將被更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +510,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
-apps/erpnext/erpnext/config/hr.py +98,Settings for HR Module,設定人力資源模塊
+apps/erpnext/erpnext/controllers/accounts_controller.py +507,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
+apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
 DocType: BOM Replace Tool,New BOM,新的物料清單
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批處理的時間記錄進行計費。
+apps/erpnext/erpnext/config/projects.py +40,Batch Time Logs for billing.,批處理的時間記錄進行計費。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,新聞已發送
 DocType: Lead,Request Type,請求類型
 DocType: Leave Application,Reason,原因
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,執行
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,進行的作業細節。
+apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
-apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,項目和定價
+apps/erpnext/erpnext/config/stock.py +62,Items and Pricing,項目和定價
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期={0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,選擇要為其創建的考核員工。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
 DocType: Customer,Individual,個人
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,規劃維護訪問。
+apps/erpnext/erpnext/config/support.py +27,Plan for maintenance visits.,規劃維護訪問。
 DocType: SMS Settings,Enter url parameter for message,輸入url參數的訊息
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,規則適用的定價和折扣。
+apps/erpnext/erpnext/config/stock.py +102,Rules for applying pricing and discount.,規則適用的定價和折扣。
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},與此時間登錄衝突{0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率(%)
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,輸出值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,輸出值
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
 ,Purchase Order Trends,採購訂單趨勢
-apps/erpnext/erpnext/config/hr.py +86,Allocate leaves for the year.,離開一年。
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,離開一年。
 DocType: Earning Type,Earning Type,收入類型
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用容量規劃和時間跟踪
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
 DocType: Bank Reconciliation,Bank Account,銀行帳戶
 DocType: Leave Type,Allow Negative Balance,允許負平衡
 DocType: Selling Settings,Default Territory,預設地域
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
-DocType: Production Order Operation,Updated via 'Time Log',通過“時間日誌”更新
+DocType: Production Order Operation,Updated via 'Time Log',經由“時間日誌”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
-DocType: Sales Invoice,Is Opening Entry,是開放報名
+DocType: Sales Invoice,Is Opening Entry,是開放登錄
 DocType: Customer Group,Mention if non-standard receivable account applicable,何況,如果不規範應收賬款適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,對於倉庫之前,需要提交
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,經銷商
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,請輸入公司名稱
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
-,Production Orders in Progress,製程中生產訂單
+,Production Orders in Progress,進行中生產訂單
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,從融資淨現金
 DocType: Lead,Address & Contact,地址及聯繫方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
 DocType: Newsletter List,Total Subscribers,用戶總數
 ,Contact Name,聯繫人姓名
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
 DocType: Time Log,Will be updated when batched.,批處理時將被更新。
@@ -236,7 +236,7 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +420,Leave Blocked,禁假的
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,禁假的
 apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,銀行條目
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
@@ -250,13 +250,13 @@
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供'表中的採購訂單{1}
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,確認客戶的訂單。
+apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,確認客戶的訂單。
 DocType: Purchase Receipt Item,Rejected Quantity,拒絕數量
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order",在送貨單,報價單,銷售發票,銷售訂單可用欄位
 DocType: SMS Settings,SMS Sender Name,短信發送者名稱
@@ -276,10 +276,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,最多5個字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
 apps/erpnext/erpnext/config/desktop.py +83,Learn,學習
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供應商>供應商類型
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,管理銷售人員樹。
+apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,管理銷售人員樹。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
@@ -293,10 +292,10 @@
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Newsletter,Newsletter,新聞
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在創建自動材料需求時已電子郵件通知
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
 apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0}輸入兩次項目稅
@@ -308,14 +307,14 @@
 DocType: Shipping Rule,Valid for Countries,有效的國家
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",在採購入庫單,供應商報價單,採購發票,採購訂單等所有可像貨幣,轉換率,總進口,進口總計進口等相關領域
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板,並且可以在交易不能使用。項目的屬性將被複製到變型,除非“不複製”設置
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,總訂貨考慮
-apps/erpnext/erpnext/config/hr.py +118,"Employee designation (e.g. CEO, Director etc.).",員工指定(例如總裁,總監等) 。
-apps/erpnext/erpnext/controllers/recurring_document.py +203,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
+apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",員工指定(例如總裁,總監等) 。
+apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單,送貨單,採購發票,生產訂單,採購訂單,採購入庫單,銷售發票,銷售訂單,股票,時間表
 DocType: Item Tax,Tax Rate,稅率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +644,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目:{0}管理分批,不能使用\
 庫存調整,而是使用庫存分錄。"
@@ -323,7 +322,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},行#{0}:批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,購買收據必須提交
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,一批該產品的(很多)。
+apps/erpnext/erpnext/config/stock.py +118,Batch (lot) of an Item.,一批該產品的(很多)。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
@@ -340,7 +339,7 @@
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
 ,Schedule Date,排定日期
 DocType: Packed Item,Packed Item,盒裝產品
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,採購交易的預設設定。
+apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,採購交易的預設設定。
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活動費用為員工{0}對活動類型 -  {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,請不要創建客戶和供應商帳戶。他們是直接從客戶/供應商的主人創建的。
 DocType: Currency Exchange,Currency Exchange,外幣兌換
@@ -348,14 +347,14 @@
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用戶(上述授權值)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,貸方餘額
 DocType: Employee,Widowed,寡
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",這是“缺貨”的項目被要求考慮根據預計數量和最小起訂量為所有倉庫
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",根據所有倉庫的預計數量和最小採購數量,所考量的“缺貨”之需求項目
 DocType: Workstation,Working Hours,工作時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續盛行,用戶被要求手動設置優先級來解決衝突。
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
 DocType: Purchase Receipt,Vehicle Date,車日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,原因丟失
@@ -386,16 +385,16 @@
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
 DocType: Stock Reconciliation Item,Do not include symbols (ex. $),不包括符號(例如$)
 DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
+apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
 apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
-apps/erpnext/erpnext/config/hr.py +148,Holiday master.,假日高手。
+apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +737,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,請輸入產品編號。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中,稅額將被視為已包含在列印速率/列印數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
@@ -408,7 +407,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,今天待定活動
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,考勤記錄。
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤記錄。
 DocType: Bank Reconciliation,Journal Entries,日記帳分錄
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間(以分鐘計)
@@ -426,7 +425,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,Please select Company,請選擇公司
 DocType: Stock Entry,Difference Account,差異帳戶
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
 apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
@@ -437,8 +436,7 @@
 DocType: Purchase Invoice Item,Item,項目
 DocType: Journal Entry,Difference (Dr - Cr),差異(Dr - Cr)
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理轉包
-apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無缺省地址模板中。請創建設置>打印和品牌>地址模板一個新的。
+apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,管理轉包
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,家具及固定裝置
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},帳戶{0}不屬於公司:{1}
@@ -446,7 +444,7 @@
 DocType: Selling Settings,Default Customer Group,預設客戶群組
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用,“圓角總計”字段將不可見的任何交易
 DocType: BOM,Operating Cost,營業成本
-,Gross Profit,毛利
+DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,增量不能為0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,刪除公司事務
@@ -473,7 +471,7 @@
 要使用這種分佈分配預算,在**成本中心**設置這個**月**分佈"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,請選擇公司和黨的第一型
-apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,財務/會計年度。
+apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,財務/會計年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起,序列號無法合併
 DocType: Project Task,Project Task,項目任務
@@ -487,12 +485,12 @@
 DocType: Job Applicant,Resume Attachment,簡歷附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,Sales Return,銷貨退回
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,銷貨退回
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨(直接發運)
-apps/erpnext/erpnext/config/hr.py +128,Salary components.,工資組成部分。
+apps/erpnext/erpnext/config/hr.py +115,Salary components.,工資組成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
 DocType: Authorization Rule,Customer or Item,客戶或項目
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,客戶數據庫。
+apps/erpnext/erpnext/config/crm.py +22,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟(Cr )
@@ -503,10 +501,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
 DocType: Sales Invoice,Customer's Vendor,客戶的供應商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,生產訂單是強制性
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的組(通常是基金的流動資產應用>>銀行賬戶,並創建一個新帳戶(點擊添加子)類型的“銀行”
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案寫作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
+apps/erpnext/erpnext/config/accounts.py +70,Masters,大師
+apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,更新銀行交易日期
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤( {6})的項目{0}在倉庫{1}在{2} {3} {4} {5}
+apps/erpnext/erpnext/config/projects.py +30,Time Tracking,時間跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
 DocType: Time Log,Billed,計費
@@ -515,14 +515,14 @@
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
 DocType: Employee,Reason for Resignation,辭退原因
-apps/erpnext/erpnext/config/hr.py +158,Template for performance appraisals.,模板的績效考核。
+apps/erpnext/erpnext/config/hr.py +151,Template for performance appraisals.,模板的績效考核。
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,發票/日記帳分錄詳細資訊
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
 DocType: Buying Settings,Settings for Buying Module,設置購買模塊
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,請先輸入採購入庫單
 DocType: Buying Settings,Supplier Naming By,供應商命名
 DocType: Activity Type,Default Costing Rate,默認成本核算率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +653,Maintenance Schedule,維護計劃
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶,客戶群組,領地,供應商,供應商類型,活動,銷售合作夥伴等。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在庫存淨變動
 DocType: Employee,Passport Number,護照號碼
@@ -534,7 +534,7 @@
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,請設置一個假期名單無論是員工還是公司
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +676,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 DocType: Selling Settings,Customer Naming By,客戶命名由
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
@@ -542,13 +542,13 @@
 DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,項目平衡
 DocType: Sales Invoice,Packing List,包裝清單
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
+apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,購買給供應商的訂單。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,項目用戶
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +141,{0}: {1} not found in Invoice Details table,{0}:在發票明細表中找不到{1}
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +204,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Material Request,Material Transfer,物料轉倉
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開啟(Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
@@ -562,17 +562,17 @@
 DocType: Purchase Invoice,Quarterly,每季
 DocType: Selling Settings,Delivery Note Required,要求送貨單
 DocType: Sales Order Item,Basic Rate (Company Currency),基礎匯率(公司貨幣)
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹為原材料的開
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +57,Please enter item details,請輸入項目細節
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Account,Accounts,會計
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +220,Payment Entry is already created,已創建付款輸入
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,已創建付款輸入
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基於其序列號的銷售和採購文件跟踪的項目。這也可以用來跟踪商品的保修細節。
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,今年的總賬單
 DocType: Account,Expenses Included In Valuation,支出計入估值
-DocType: Employee,Provide email id registered in company,提供的電子郵件ID在公司註冊
+DocType: Employee,Provide email id registered in company,提供在公司註冊的電子郵件ID
 DocType: Hub Settings,Seller City,賣家市
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送:
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
@@ -583,14 +583,15 @@
 DocType: BOM Explosion Item,Qty Consumed Per Unit,數量消耗每單位
 DocType: Serial No,Warranty Expiry Date,保證期到期日
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
-DocType: Sales Invoice,Commission Rate (%),佣金率(%)
+DocType: Sales Invoice,Commission Rate (%),佣金比率(%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +176,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",對憑證類型必須是一個銷售訂單,銷售發票或日記帳分錄
 DocType: Project,Estimated Cost,估計成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任務主題
-apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,從供應商收貨。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,In Value,在數值
+apps/erpnext/erpnext/config/accounts.py +40,Company and Accounts,公司與賬戶
+apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,從供應商收貨。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在數值
 DocType: Lead,Campaign Name,活動名稱
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供應原料
@@ -609,11 +610,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,機會從
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月薪聲明。
+apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
 DocType: Item Group,Website Specifications,網站規格
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,新帳號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}:從{0}類型{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}:從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{0}:轉換係數是強制性的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則,同樣的標準存在,請通過分配優先解決衝突。價格規則:{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,會計分錄可針對葉節點。不允許針對組的分錄。
@@ -621,7 +622,7 @@
 DocType: Opportunity,Maintenance,維護
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,銷售活動。
+apps/erpnext/erpnext/config/crm.py +84,Sales campaigns.,銷售活動。
 DocType: Sales Taxes and Charges Template,"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.
 
 #### Note
@@ -662,19 +663,19 @@
  8。輸入行:如果基於“前行匯總”,您可以選擇將被視為這種計算基礎(預設值是前行)的行號。
  9。這是含稅的基本速率?:如果你檢查這一點,就意味著這個稅不會顯示在項目表中,但在你的主項表將被納入基本速率。你想要給一個單位的價格(包括所有稅費)的價格為顧客這是非常有用的。"
 DocType: Employee,Bank A/C No.,銀行A/C No.
-DocType: Expense Claim,Project,專案
+DocType: Purchase Invoice Item,Project,專案
 DocType: Quality Inspection Reading,Reading 7,7閱讀
 DocType: Address,Personal,個人
 DocType: Expense Claim Detail,Expense Claim Type,費用報銷型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
-apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1},檢查它是否應該被拉到作為提前在此發票。
+apps/erpnext/erpnext/controllers/accounts_controller.py +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1},檢查它是否應該被拉到作為提前在此發票。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技術
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office維護費用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/get_item_details.py +256,Price List not selected,未選擇價格列表
+apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
 apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告:無效的附件{0}
@@ -685,22 +686,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +668,My Invoices,我的發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +666,My Invoices,我的發票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,選擇BOM展開
 DocType: SMS Center,All Customer Contact,所有的客戶聯繫
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通過CSV上傳庫存餘額。
+apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,通過CSV上傳庫存餘額。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
 ,Support Analytics,支援分析
 DocType: Item,Website Warehouse,網站倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
-apps/erpnext/erpnext/config/accounts.py +179,C-Form records,C-往績紀錄
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,客戶和供應商
-DocType: Email Digest,Email Digest Settings,電子郵件摘要設置
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,客戶支持查詢。
+apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-往績紀錄
+apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,客戶和供應商
+DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
+apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
 DocType: Features Setup,"To enable ""Point of Sale"" features",為了使“銷售點”的特點
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
@@ -737,11 +738,11 @@
 DocType: Pricing Rule,Price or Discount,價格或折扣
 DocType: Sales Team,Incentives,獎勵
 DocType: SMS Log,Requested Numbers,請求號碼
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,績效考核。
-DocType: Sales Invoice Item,Stock Details,股票詳細信息
+apps/erpnext/erpnext/config/hr.py +146,Performance appraisal.,績效考核。
+DocType: Sales Invoice Item,Stock Details,股票詳細訊息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
-apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,銷售點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借記帳戶
+apps/erpnext/erpnext/config/selling.py +311,Point-of-Sale,銷售點
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借方帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
@@ -758,12 +759,13 @@
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看訂閱
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +585,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +158,Currency exchange rate master.,貨幣匯率的主人。
+apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
+apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,銷售合作夥伴和地區
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,轉到車
@@ -774,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,總金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Balance Value,平衡值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,餘額
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
 DocType: Bank Reconciliation,Account Currency,賬戶幣種
@@ -806,16 +808,16 @@
 DocType: Material Request Item,Lead Time Date,交貨時間日期
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},列#{0}:請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +532,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
 DocType: Job Opening,Publish on website,發布在網站上
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,發貨給客戶。
+apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,發貨給客戶。
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接收入
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,將付款金額=未償還
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和(s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,對於轉讓項目選擇
 DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
@@ -836,7 +838,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有鉛(開放)
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
@@ -848,7 +850,7 @@
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
-apps/erpnext/erpnext/config/hr.py +85,Leave Allocation Tool,排假工具
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出預算(用於報銷)
 DocType: Workstation,Net Hour Rate,淨小時率
@@ -865,7 +867,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
 DocType: Features Setup,Purchase Discounts,採購折扣
 DocType: Workstation,Wages,工資
-DocType: Time Log,Will be updated only if Time Log is 'Billable',如果時間日誌是“計費”將只更新
+DocType: Time Log,Will be updated only if Time Log is 'Billable',只有時間日誌是“可計費”時才會更新
 DocType: Project,Internal,內部
 DocType: Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
@@ -879,13 +881,14 @@
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客戶不與公司匹配
-apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小,顏色等。
+apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小,顏色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP倉庫
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +181,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
+apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 DocType: BOM Operation,Operation,作業
 DocType: Lead,Organization Name,組織名稱
 DocType: Tax Rule,Shipping State,運輸狀態
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行添加
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
@@ -893,27 +896,26 @@
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯繫方式
-apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +300,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
 DocType: Item,Default Supplier,預設的供應商
-DocType: Manufacturing Settings,Over Production Allowance Percentage,對生產補貼比例
+DocType: Manufacturing Settings,Over Production Allowance Percentage,過度生產容許比例
 DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
 DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,結束日期不能小於開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,博士
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
+apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通過時間更新日誌
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
 DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯繫客戶
 apps/erpnext/erpnext/public/js/setup_wizard.js +235,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
 DocType: Company,Default Currency,預設貨幣
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶組>領地
 DocType: Contact,Enter designation of this Contact,輸入該聯繫人指定
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +337,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
@@ -929,26 +931,26 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼,供大家參考。稅務號碼等
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +926,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,Ordered Items To Be Billed,預付款的訂購物品
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,從範圍必須小於要範圍
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,選擇時間日誌並提交以創建一個新的銷售發票。
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,選擇時間日誌並提交以建立一個新的銷售發票。
 DocType: Global Defaults,Global Defaults,全域預設值
 DocType: Salary Slip,Deductions,扣除
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此時日誌批量一直標榜。
 DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,容量規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,產能規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,無需求
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,無需求
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,活動的考勤表類型
+apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,活動的考勤表類型
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},無論是借方或貸方金額是必需的{0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如,如果你的英文縮寫為“SM”,而該項目的代碼是“T-SHIRT”,該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存,淨付款就會被顯示出來。
@@ -956,19 +958,19 @@
 DocType: Purchase Invoice,Is Return,退貨
 DocType: Price List Country,Price List Country,價目表國家
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,此外節點可以在'集團'類型的節點上創建
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,請設置電子郵件ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,請設定電子郵件ID
 DocType: Item,UOMs,計量單位
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建:{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,計量單位換算係數
 DocType: Stock Settings,Default Item Group,預設項目群組
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供應商數據庫。
+apps/erpnext/erpnext/config/buying.py +33,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +573,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的銷售人員將在此日期被提醒去聯繫客戶
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行,但條目可針對非組進行
-apps/erpnext/erpnext/config/hr.py +133,Tax and other salary deductions.,稅務及其他薪金中扣除。
+apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,稅務及其他薪金中扣除。
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
 DocType: Account,Warehouse,倉庫
@@ -988,7 +990,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +410,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/config/hr.py +220,Setting up Employees,建立職工
+apps/erpnext/erpnext/config/hr.py +242,Setting up Employees,建立職工
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,電網“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,請先選擇前綴稱號
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,研究
@@ -1012,7 +1014,7 @@
 DocType: Purchase Invoice,Is Recurring,是經常性
 DocType: Purchase Order,Supplied Items,提供的物品
 DocType: Production Order,Qty To Manufacture,製造數量
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期保持同樣的速度
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期價格保持一致
 DocType: Opportunity Item,Opportunity Item,項目的機會
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,臨時開通
 ,Employee Leave Balance,員工休假餘額
@@ -1022,7 +1024,7 @@
 DocType: Purchase Receipt,Rejected Warehouse,拒絕倉庫
 DocType: GL Entry,Against Voucher,對傳票
 DocType: Item,Default Buying Cost Center,預設採購成本中心
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為了獲得最好ERPNext,我們建議您花一些時間和觀看這些幫助視頻。
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學,我們建議您花一些時間和觀看這些說明影片。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +33,Item {0} must be Sales Item,項{0}必須是銷售項目
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,到
 DocType: Item,Lead Time in days,在天交貨期
@@ -1056,12 +1058,13 @@
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Warehouse,Warehouse Contact Info,倉庫聯繫方式
 DocType: Address,City/Town,市/鎮
+DocType: Address,Is Your Company Address,是你的公司地址
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0},只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +484,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」,「項目群組」或「品牌」,而選擇定價規則。
 DocType: Hub Settings,Seller Website,賣家網站
@@ -1070,7 +1073,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +757,For Supplier,對供應商
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計(公司貨幣)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
@@ -1107,12 +1110,12 @@
 DocType: Company,If Yearly Budget Exceeded (for expense account),如果年度預算超出(用於報銷)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,存在重疊的條件:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +167,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,總訂單價值
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,您只能對已提交的生產訂單進行時間記錄
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",通訊,聯繫人,線索。
+apps/erpnext/erpnext/config/crm.py +68,"Newsletters to contacts, leads.",通訊,聯繫人,線索。
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
 DocType: Project,Start and End Dates,開始和結束日期
@@ -1124,7 +1127,7 @@
 DocType: Purchase Invoice Item,Accounting,會計
 DocType: Features Setup,Features Setup,功能設置
 DocType: Item,Is Service Item,是服務項目
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +83,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},從{0} | {1} {2}
@@ -1144,16 +1147,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開,如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +516,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},最大數量:{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
-apps/erpnext/erpnext/config/support.py +38,Communication log.,通信日誌。
+apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,購買金額
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,不能大於100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,不能大於100
 apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
@@ -1175,11 +1178,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結,條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/controllers/accounts_controller.py +450,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}:{1}只能在貨幣做:{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +447,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}:{1}只能在貨幣做:{2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,發現員工{0},而該月沒有活動的薪酬結構
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況,學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
-apps/erpnext/erpnext/config/accounts.py +122,Tax Rule for transactions.,稅收規則進行的交易。
+apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,我們買這個項目
 DocType: Address,Billing,計費
@@ -1192,7 +1195,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,庫存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +593,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,辦公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,設置短信閘道設置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗!
@@ -1209,7 +1212,7 @@
 DocType: Notification Control,Expense Claim Rejected,費用索賠被拒絕
 DocType: Item Attribute,Item Attribute,項目屬性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +263,Item Variants,項目變體
+apps/erpnext/erpnext/config/stock.py +290,Item Variants,項目變體
 DocType: Company,Services,服務
 apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),總計({0})
 DocType: Cost Center,Parent Cost Center,父成本中心
@@ -1232,19 +1235,21 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +652,Maintenance Visit,維護訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,維護訪問
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
-DocType: Time Log Batch Detail,Time Log Batch Detail,時間日誌批量詳情
+DocType: Time Log Batch Detail,Time Log Batch Detail,時間日誌批次詳情
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
+DocType: Purchase Invoice,Select Shipping Address,選擇送貨地址
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
 ,Accounts Receivable Summary,應收賬款匯總
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +194,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,貢獻金額
-DocType: Sales Invoice,Shipping Address,送貨地址
+DocType: Purchase Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存,就會顯示出來。
-apps/erpnext/erpnext/config/stock.py +115,Brand master.,品牌主檔。
+apps/erpnext/erpnext/config/stock.py +196,Brand master.,品牌主檔。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供應商>供應商類型
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1262,7 +1267,7 @@
 ,Bank Reconciliation Statement,銀行對帳表
 DocType: Address,Lead Name,鉛名稱
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,期初存貨餘額
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}必須只出現一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0}的排假成功
@@ -1270,19 +1275,20 @@
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +540,Manufacturing Quantity is mandatory,生產數量是必填的
 DocType: Quality Inspection Reading,Reading 4,4閱讀
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
+apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,索賠費用由公司負責。
 DocType: Company,Default Holiday List,預設假日表列
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,現貨負債
 DocType: Purchase Receipt,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯繫手機號碼
-,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +119,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
+,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用條形碼跟踪項目。您將能夠通過掃描物品條碼,進入交貨單和銷售發票的項目。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
+apps/erpnext/erpnext/config/selling.py +210,Other Reports,其他報告
 DocType: Dependent Task,Dependent Task,相關任務
 apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +179,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試規劃X天行動提前。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 DocType: SMS Center,Receiver List,收受方列表
 DocType: Payment Tool Detail,Payment Amount,付款金額
@@ -1299,7 +1305,7 @@
 DocType: Account,Account Name,帳戶名稱
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,起始日期不能大於結束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,供應商類型高手。
+apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 DocType: Purchase Invoice,Reference Document,參考文獻
@@ -1331,9 +1337,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,應付賬款淨額變化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,請驗證您的電子郵件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
-apps/erpnext/erpnext/config/accounts.py +58,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
 DocType: Quotation,Term Details,長期詳情
-DocType: Manufacturing Settings,Capacity Planning For (Days),容量規劃的期限(天)
+DocType: Manufacturing Settings,Capacity Planning For (Days),產能規劃的範圍(天)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,保修索賠
 ,Lead Details,潛在客戶詳情
@@ -1343,8 +1349,9 @@
 DocType: Maintenance Visit,Partially Completed,部分完成
 DocType: Leave Type,Include holidays within leaves as leaves,葉葉子中包括節假日
 DocType: Sales Invoice,Packed Items,盒裝項目
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,針對序列號保修索賠
+apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,針對序列號保修索賠
 DocType: BOM Replace Tool,"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",在它使用的所有其他材料明細表替換特定的BOM。它將取代舊的BOM鏈接,更新成本和再生“BOM展開項目”表按照新的BOM
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total','總'
 DocType: Shopping Cart Settings,Enable Shopping Cart,讓購物車
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
@@ -1363,11 +1370,11 @@
 ,Item Shortage Report,商品短缺報告
 apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,該產品的一個單元。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',時間日誌批量{0}必須是'提交'
+apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,該產品的一個單元。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',時間日誌批次{0}必須是'提交'狀態
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +394,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},在第{0}行需要倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
@@ -1396,7 +1403,7 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,購物車啟用
 DocType: Job Applicant,Applicant for a Job,申請人作業
 DocType: Production Plan Material Request,Production Plan Material Request,生產計劃申請材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,沒有創建生產訂單
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,沒有創建生產訂單
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,Salary Slip of employee {0} already created for this month,員工{0}於本月的工資單已經創建
 DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表,並使用試算表程式進行列印。
@@ -1410,38 +1417,40 @@
 DocType: Employee,Leave Encashed?,離開兌現?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +766,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
-DocType: Sales Team,Contribution to Net Total,貢獻合計淨
+DocType: Sales Team,Contribution to Net Total,貢獻淨合計
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
 DocType: Territory,Territory Name,地區名稱
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,提交之前,需要填入在製品倉庫
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,申請職位
+apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
 apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+apps/erpnext/erpnext/config/hr.py +141,Appraisals,估價
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 (當項目的淨重量總和自動計算)
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,時間日誌製造。
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,製造時間日誌
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒絕倉庫是強制性的反對否決項{1}
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,時間日誌中的任務。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,付款
+apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,任務時間日誌。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1},最多可以有 {0} 被完成。
 DocType: Employee,Salutation,招呼
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在銷售時捆綁項目。
+apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Quotation Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
@@ -1468,22 +1477,22 @@
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
 DocType: Stock Settings,Allowance Percent,津貼百分比
 DocType: SMS Settings,Message Parameter,訊息參數
-apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,財務成本中心的樹。
+apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單獲取項目
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
 DocType: Serial No,Creation Date,創建日期
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},項{0}中多次出現價格表{1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查,如果適用於被選擇為{0}
 DocType: Production Plan Material Request,Material Request Date,材料申請日期
 DocType: Purchase Order Item,Supplier Quotation Item,供應商報價項目
-DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止對創作生產訂單的時間日誌。操作不得對生產訂單追踪
+DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止建立生產訂單的時間日誌。不得對生產訂單追踪作業
 DocType: Item,Has Variants,有變種
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,單擊“製作銷售發票”按鈕來創建一個新的銷售發票。
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,請在公司主檔及全域性預設值指定預設貨幣
 DocType: Purchase Invoice,Recurring Invoice,經常性發票
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,項目管理
+apps/erpnext/erpnext/config/projects.py +78,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget Detail,Fiscal Year,財政年度
 DocType: Cost Center,Budget,預算
@@ -1500,7 +1509,7 @@
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,產品或服務
 DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,項目表不能為空
@@ -1519,34 +1528,34 @@
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項,將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Production Order,Material Request Item,物料需求項目
-apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,項目群組樹。
+apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,項目群組樹。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
-,Item-wise Purchase History,項目明智的購買歷史
+,Item-wise Purchase History,全部項目的購買歷史
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,紅
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
-,Open Production Orders,開啟生產訂單
+,Open Production Orders,開放狀態的生產訂單
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,刪除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生產數量訂單{3}。請經由時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Material Requests in the above table,請輸入在上表請求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,請輸入在上表請求材料
 DocType: Item Attribute,Attribute Name,屬性名稱
 DocType: Item Group,Show In Website,顯示在網站
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,組
 DocType: Task,Expected Time (in hours),預期時間(以小時計)
 ,Qty to Order,訂購數量
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",在下列文件送貨單,機遇,材料要求,項目,採購訂單,採購憑證,買方收貨,報價單,銷售發票,產品捆綁,銷售訂單,序列號跟踪名牌
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,所有任務的甘特圖。
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,所有任務的甘特圖。
 DocType: Appraisal,For Employee Name,對於員工姓名
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +94,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消,因為假平衡已經被搬入轉發在未來休假分配記錄{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消,因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客戶的地址和聯繫方式
 DocType: Employee,Resignation Letter Date,辭退信日期
@@ -1562,12 +1571,11 @@
 ,Maintenance Schedules,保養時間表
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +310,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule Condition,Shipping Amount,航運量
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
 DocType: Purchase Order,Delivered,交付
-apps/erpnext/erpnext/config/hr.py +168,Setup incoming server for jobs email id. (e.g. jobs@example.com),設置接收服務器的工作電子郵件ID 。 (例如jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,車號
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
@@ -1577,7 +1585,7 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
 DocType: HR Settings,HR Settings,人力資源設置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
@@ -1587,8 +1595,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,實際總計
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +107,Please specify Company,請註明公司
-,Customer Acquisition and Loyalty,客戶獲得和忠誠度
+apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,請註明公司
+,Customer Acquisition and Loyalty,客戶取得和忠誠度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,Your financial year ends on,您的財政年度結束於
 DocType: POS Profile,Price List,價格表
@@ -1602,12 +1610,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",顯示/隱藏功能。如序列號, POS等
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +249,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
-apps/erpnext/erpnext/stock/get_item_details.py +243,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
@@ -1638,7 +1646,7 @@
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,拆分送貨單成數個包裝。
+apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,拆分送貨單成數個包裝。
 apps/erpnext/erpnext/hooks.py +71,Shipments,發貨
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
@@ -1649,19 +1657,18 @@
 DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
-apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,費用或差異帳戶是強制性的項目{0} ,因為它影響整個股票價值
-apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費,請在「股票設定」設定
+apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言, 費用或差異帳戶是強制必填的,因為它影響整個庫存總值。
+apps/erpnext/erpnext/controllers/accounts_controller.py +350,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費,請在「股票設定」設定
 DocType: Employee,Bank Name,銀行名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,用戶{0}被禁用
 DocType: Leave Application,Total Leave Days,總休假天數
-DocType: Email Digest,Note: Email will not be sent to disabled users,注:電子郵件將不會被發送到被禁用的用戶
+DocType: Email Digest,Note: Email will not be sent to disabled users,注意:電子郵件將不會被發送到被禁用的用戶
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/config/hr.py +103,"Types of employment (permanent, contract, intern etc.).",就業(永久,合同,實習生等)的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +363,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/config/hr.py +175,"Types of employment (permanent, contract, intern etc.).",就業(永久,合同,實習生等)的類型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的組(通常是基金>流動負債>稅和關稅的來源,並創建一個新帳戶(類型為“稅”點擊添加子),並做提稅率。
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},所需的{0}項目銷售訂單
 DocType: Purchase Invoice Item,Rate (Company Currency),率(公司貨幣)
@@ -1670,25 +1677,27 @@
 DocType: POS Profile,Taxes and Charges,稅收和收費
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買,出售或持有的股票。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,新的成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的組(通常是基金>流動負債>稅和關稅的來源,並創建一個新帳戶(類型為“稅”點擊添加子),並做提稅率。
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
-apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,財務賬目的樹。
+apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,財務賬目的樹。
 DocType: Purchase Order Item,Reference Document Type,參考文檔類型
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +305,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
 DocType: Time Log Batch,Total Billing Amount,總結算金額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,應收賬款
 DocType: Quotation Item,Stock Balance,庫存餘額
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,銷售訂單到付款
+apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,時間日誌創建:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,時間日誌建立於:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Employee,Blood Group,血型
@@ -1701,12 +1710,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,電子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全日制
-DocType: Purchase Invoice,Contact Details,聯繫方式
+DocType: Employee,Contact Details,聯繫方式
 DocType: C-Form,Received Date,接收日期
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已經創建了銷售稅和費模板標準模板,選擇一個,然後點擊下面的按鈕。
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
 DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To is required,借記是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,借方是必填項
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
 DocType: Offer Letter Term,Offer Term,要約期限
 DocType: Quality Inspection,Quality Manager,質量經理
@@ -1715,8 +1724,8 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,請選擇Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,報價函
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,生成物料需求(MRP)和生產訂單。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,總開票金額
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,產生物料需求(MRP)和生產訂單。
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,Total Invoiced Amt,總開票金額
 DocType: Time Log,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授權值)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子節點,探索樹,然後單擊要在其中添加更多節點的節點上。
@@ -1724,13 +1733,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸: {0}不能父母或兒童{2}
 DocType: Production Order Operation,Completed Qty,完成數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0},只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +254,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,價格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允許加班
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
 DocType: Opportunity,Lost Reason,失落的原因
-apps/erpnext/erpnext/config/accounts.py +73,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
+apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,All items have already been invoiced,所有項目已開具發票
@@ -1765,13 +1774,13 @@
 DocType: Company,For Reference Only.,僅供參考。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},無效的{0}:{1}
 DocType: Sales Invoice Advance,Advance Amount,提前量
-DocType: Manufacturing Settings,Capacity Planning,容量規劃
+DocType: Manufacturing Settings,Capacity Planning,產能規劃
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,參考號碼
 DocType: Employee,Employment Details,就業資訊
 DocType: Employee,New Workplace,新工作空間
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,設置為關閉
-apps/erpnext/erpnext/stock/get_item_details.py +97,No Item with Barcode {0},沒有條碼{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},沒有條碼{0}的品項
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,如果你有銷售團隊和銷售合作夥伴(渠道合作夥伴),他們可以被標記,並維持其在銷售貢獻活動
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
@@ -1789,10 +1798,10 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +575,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,轉印材料
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},項{0}必須在銷售物料{1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
-apps/erpnext/erpnext/public/js/controllers/transaction.js +843,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,請設置保存後復發
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -1809,26 +1818,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金來源(負債)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,導入電子郵件發件人
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,輸入電子郵件從
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,邀請成為用戶
 DocType: Features Setup,After Sale Installations,銷售後安裝
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}}已開票
 DocType: Workstation Working Hour,End Time,結束時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,郵件群發
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},項目{0}需要採購訂單號
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +198,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 DocType: Notification Control,Expense Claim Approved,報銷批准
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 DocType: Purchase Invoice,Credit To,信貸
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,活動信息/客戶
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,有效訊息/客戶
 DocType: Employee Education,Post Graduate,研究生
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Quality Inspection Reading,Reading 9,9閱讀
@@ -1836,10 +1846,9 @@
 DocType: Buying Settings,Buying Settings,採購設定
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
 DocType: Upload Attendance,Attendance To Date,出席會議日期
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),設置接收服務器銷售的電子郵件ID 。 (例如sales@example.com )
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +730,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,請註明公司以處理
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,應收賬款淨額變化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
 DocType: Quality Inspection Reading,Accepted,接受的
@@ -1850,7 +1859,7 @@
 ({2})生產訂單的 {3}"
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
 DocType: Newsletter,Test,測試
 apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由於有存量交易為這個項目,\你不能改變的值'有序列號','有批號','是股票項目“和”評估方法“
@@ -1858,23 +1867,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,你不能改變速度,如果BOM中提到反對的任何項目
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
-apps/erpnext/erpnext/config/stock.py +18,Requests for items.,需求的項目。
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目創建獨立的生產訂單。
+apps/erpnext/erpnext/config/stock.py +27,Requests for items.,需求的項目。
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目建立獨立的生產訂單。
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期,除以下指定職位權限外,他人無法修改。
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 (對於NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,創建以下生產訂單:
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,時事通訊錄
+apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,時事通訊錄
 DocType: Delivery Note,Transporter Name,貨運公司名稱
 DocType: Authorization Rule,Authorized Value,授權值
 DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,計量單位
+apps/erpnext/erpnext/config/stock.py +185,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
 DocType: Lead,Opportunity,機會
@@ -1885,7 +1894,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}關閉
 DocType: Email Digest,How frequently?,多久?
 DocType: Purchase Receipt,Get Current Stock,獲取當前庫存
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,物料清單樹
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的組(通常是基金的流動資產應用>>銀行賬戶,並創建一個新帳戶(點擊添加子)類型的“銀行”
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清單樹狀圖
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,馬克現在
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
 DocType: Production Order,Actual End Date,實際結束日期
@@ -1905,7 +1915,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",在這裡輸入靜態URL參數(如稱發件人= ERPNext,用戶名= ERPNext,密碼= 1234等)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不在任何現有的會計年度。詳情查看{2}。
-apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個示例網站從ERPNext自動生成
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,老齡範圍1
 DocType: Purchase Taxes and Charges Template,"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.
 
@@ -1954,7 +1964,7 @@
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/config/accounts.py +174,"e.g. Bank, Cash, Credit Card",例如:銀行,現金,信用卡
+apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例如:銀行,現金,信用卡
 DocType: Journal Entry,Credit Note,信用票據
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},完成數量不能超過{0}操作{1}
 DocType: Features Setup,Quality,品質
@@ -1977,8 +1987,8 @@
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
-apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,或
+apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,組織分支主檔。
+apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,或
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
@@ -1993,22 +2003,23 @@
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
 DocType: Employee,Emergency Contact,緊急聯絡人
 DocType: Item,Quality Parameters,質量參數
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,萊傑
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,分類帳
 DocType: Target Detail,Target  Amount,目標金額
 DocType: Shopping Cart Settings,Shopping Cart Settings,購物車設置
 DocType: Journal Entry,Accounting Entries,會計分錄
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},全球POS檔案{0}的公司已經創建{1}
 DocType: Purchase Order,Ref SQ,參考SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,更換項目/物料清單中的所有材料明細表
-DocType: Purchase Order Item,Received Qty,收到數量
+apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更換項目/物料清單中的所有材料明細表
+DocType: Purchase Order Item,Received Qty,到貨數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,沒有支付,未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +295,Not Paid and Not Delivered,沒有支付,未送達
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
+apps/erpnext/erpnext/config/hr.py +93,Payroll,工資表
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率,行{3}也必須包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼(用於列印)
 DocType: Bin,Reserved Quantity,保留數量
@@ -2017,7 +2028,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +647,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
@@ -2036,21 +2047,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,營銷和銷售主管
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得稅
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選擇的定價規則是由為'價格',它將覆蓋價目表。定價規則價格是最終價格,所以沒有進一步的折扣應適用。因此,在像銷售訂單,採購訂單等交易,這將是“速度”字段進賬,而不是“價格單率”字段。
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,以行業類型追蹤訊息。
+apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,請輸入產品編號,以獲得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +658,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +47,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
+apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,管理客戶群組樹。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,問題
+apps/erpnext/erpnext/config/support.py +7,Issues,問題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
-DocType: Sales Invoice,Debit To,借記
+DocType: Sales Invoice,Debit To,借方
 DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
@@ -2068,10 +2079,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
 DocType: C-Form Invoice Detail,Territory,領土
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,請註明無需訪問
-DocType: Purchase Order,Customer Address Display,客戶地址顯示
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
-apps/erpnext/erpnext/config/accounts.py +68,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
@@ -2080,7 +2090,7 @@
 DocType: Price List,Price List Master,價格表主檔
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易,可以用來標記針對多個**銷售**的人,這樣你可以設置和監控目標。
 ,S.O. No.,SO號
-DocType: Production Order Operation,Make Time Log,讓時間日誌
+DocType: Production Order Operation,Make Time Log,製作時間日誌
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,電腦
@@ -2151,10 +2161,10 @@
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已經從這個清單退訂成功!
 DocType: Purchase Invoice Item,Net Rate (Company Currency),淨利率(公司貨幣)
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理領地樹。
+apps/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
-DocType: Sales Invoice Item,Time Log Batch,時間日誌批
+DocType: Sales Invoice Item,Time Log Batch,時間日誌批次
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,請選擇適用的折扣
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,工資單創建
 DocType: Company,Default Receivable Account,預設應收帳款
@@ -2177,19 +2187,20 @@
 DocType: BOM,Item UOM,項目計量單位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後,優惠金額(公司貨幣)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
 DocType: Quality Inspection,Quality Inspection,品質檢驗
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料&煙草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +557,Can only make payment against unbilled {0},只能使支付對未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大於100
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金比率不能大於100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
-apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,請輸入{0}第一
+apps/erpnext/erpnext/public/js/utils/party.js +124,Please enter {0} first,請輸入{0}第一
 DocType: Production Order Operation,Actual End Time,實際結束時間
 DocType: Production Planning Tool,Download Materials Required,下載所需材料
 DocType: Item,Manufacturer Part Number,製造商零件編號
@@ -2202,26 +2213,26 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,顏色
 DocType: Maintenance Visit,Scheduled,預定
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項,其中“正股項”是“否”和“是銷售物品”是“是”,沒有其他產品捆綁
-apps/erpnext/erpnext/controllers/accounts_controller.py +408,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前({0})對二階{1}不能大於總計({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前({0})對二階{1}不能大於總計({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List Currency not selected,尚未選擇價格表之貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,尚未選擇價格表之貨幣
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,項目行{0}:採購入庫{1}不在上述“採購入庫單”表中存在
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日誌
 DocType: Installation Note Item,Against Document No,對文件編號
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,管理銷售合作夥伴。
+apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Please select {0},請選擇{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究員
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,請在發送之前保存信件
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或電子郵件是強制性
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,進料品質檢驗
+apps/erpnext/erpnext/config/stock.py +159,Incoming quality inspection.,進料品質檢驗
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,root類型是強制性的
@@ -2237,13 +2248,13 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +356,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
-apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日誌維護短信發送狀態
+apps/erpnext/erpnext/config/crm.py +132,Logs for maintaining sms delivery status,日誌維護短信發送狀態
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認
 DocType: Payment Gateway,Gateway,網關
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,請輸入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
+apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱,如果查詢來源是運動
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
@@ -2261,7 +2272,7 @@
 DocType: Sales Invoice,Sales Team,銷售團隊
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重複的條目
 DocType: Serial No,Under Warranty,在保修期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +408,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存,就會顯示出來。
 ,Employee Birthday,員工生日
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
@@ -2275,9 +2286,9 @@
 DocType: Leave Control Panel,Employee Type,員工類型
 DocType: Features Setup,To maintain the customer wise item code and to make them searchable based on their code use this option,為了保持客戶明智的項目代碼,並根據他們的代碼使用此選項可讓他們搜索
 DocType: Employee Leave Approver,Leave Approver,休假審批人
-DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送製造
+DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
-,Issued Items Against Production Order,發出對項目生產訂單
+,Issued Items Against Production Order,生產訂單的已發物料
 DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Payment Tool,Payment Tool,支付工具
 DocType: Target Detail,Target Detail,目標詳細資訊
@@ -2293,9 +2304,9 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
 DocType: GL Entry,Voucher No,憑證編號
 DocType: Leave Allocation,Leave Allocation,排假
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,{0}物料需求已建立
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,模板條款或合同。
-DocType: Customer,Address and Contact,地址和聯繫方式
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,{0}物料需求已建立
+apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,模板條款或合同。
+DocType: Purchase Invoice,Address and Contact,地址和聯繫方式
 DocType: Supplier,Last Day of the Next Month,下個月的最後一天
 DocType: Employee,Feedback,反饋
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假,不是之前分配{0},因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
@@ -2327,24 +2338,24 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,Closing (Dr),關閉(Dr)
 DocType: Contact,Passive,被動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,稅務模板賣出的交易。
+apps/erpnext/erpnext/config/selling.py +163,Tax template for selling transactions.,稅務模板賣出的交易。
 DocType: Sales Invoice,Write Off Outstanding Amount,核銷額(億元)
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",檢查是否需要自動週期性發票。提交任何銷售發票後,經常性部分可見。
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",是否需要自動週期性發票。提交任何銷售發票後,經常性部分就會顯示出來。
 DocType: Account,Accounts Manager,會計經理
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',時間日誌{0}必須是'提交'
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
 DocType: Time Log,Costing Rate based on Activity Type (per hour),成本核算房價為活動類型(每小時)
-DocType: Production Planning Tool,Create Material Requests,建立材料需求
+DocType: Production Planning Tool,Create Material Requests,建立物料需求
 DocType: Employee Education,School/University,學校/大學
-DocType: Payment Request,Reference Details,詳細參考信息
+DocType: Payment Request,Reference Details,詳細參考訊息
 DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
 ,Billed Amount,帳單金額
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,獲取更新
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,添加了一些樣本記錄
-apps/erpnext/erpnext/config/hr.py +225,Leave Management,離開管理
+apps/erpnext/erpnext/config/hr.py +247,Leave Management,離開管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,較低的收入
@@ -2361,6 +2372,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
+apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,序列號和批次
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,製作訂單不能上調:
@@ -2384,7 +2396,7 @@
 DocType: Appraisal,Appraisal,評價
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +186,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},休假審批人必須是一個{0}
 DocType: Hub Settings,Seller Email,賣家電子郵件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本(通過採購發票)
 DocType: Workstation Working Hour,Start Time,開始時間
@@ -2404,7 +2416,7 @@
 DocType: Purchase Receipt Item,Purchase Order Item No,採購訂單編號
 DocType: Project,Project Type,專案類型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,各種活動的費用
+apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,各種活動的費用
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,Not allowed to update stock transactions older than {0},不允許更新比年長的股票交易{0}
 DocType: Item,Inspection Required,需要檢驗
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
@@ -2430,12 +2442,13 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組/客戶
 DocType: Payment Gateway Account,Default Payment Request Message,默認的付款請求消息
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
+apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,銀行和支付
 ,Welcome to ERPNext,歡迎來到ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,憑單詳細人數
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,導致報價
 DocType: Lead,From Customer,從客戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
-DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額(通過時間日誌)
+DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額(經由時間日誌)
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,採購訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,預計
@@ -2445,19 +2458,20 @@
 DocType: Issue,Opening Date,開幕日期
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,葉子度假
 DocType: Sales Order,Not Billed,不發單
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,尚未新增聯絡人。
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本憑證金額
 DocType: Time Log,Batched for Billing,批量計費
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,由供應商提出的帳單。
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限(天數)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,從運營的淨現金
 apps/erpnext/erpnext/public/js/setup_wizard.js +199,e.g. VAT,例如增值稅
-apps/erpnext/erpnext/config/hr.py +65,Mark Employee Attendance in Bulk,馬克員工考勤的散裝
+apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,馬克員工考勤的散裝
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
 DocType: Shopping Cart Settings,Quotation Series,報價系列
@@ -2480,15 +2494,15 @@
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,當提交工資單時確認是否要發送工資單郵件給每個員工。
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,其中,生產操作進行。
+apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生產作業於此進行。
 DocType: Stock Entry Detail,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
 DocType: Employee,Confirmation Date,確認日期
 DocType: C-Form,Total Invoiced Amount,發票總金額
 DocType: Account,Sales User,銷售用戶
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
-DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細信息
-DocType: Payment Request,Email To,通過電子郵件發送給
+DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
+DocType: Payment Request,Email To,發送電子郵件給
 DocType: Lead,Lead Owner,鉛所有者
 DocType: Bin,Requested Quantity,要求的數量
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,倉庫是必需的
@@ -2515,12 +2529,12 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,請送貨單拉項目
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,日記條目{0}都是非聯
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件,電話,聊天,訪問等所有通信記錄
+apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件,電話,聊天,訪問等所有通信記錄
 DocType: Manufacturer,Manufacturers used in Items,在項目中使用製造商
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,新建立
-DocType: Buying Settings,Purchase Order Required,購貨訂單要求
+DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
 ,Purchase Analytics,採購分析
@@ -2533,20 +2547,22 @@
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},價格:{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,首先選擇一組節點。
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},目的必須是一個{0}
+apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",刪除客戶,供應商,銷售夥伴和鉛的參考,因為它是你的公司地址
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,填寫表格,並將其保存
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載一個包含所有原料一份報告,他們最新的庫存狀態
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載包含所有物料與其最新庫存狀態的報告,
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
 DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
 DocType: SMS Center,Send SMS,發送短信
 DocType: Company,Default Letter Head,預設信頭
-DocType: Purchase Order,Get Items from Open Material Requests,獲得從公開材料請求項目,
+DocType: Purchase Order,Get Items from Open Material Requests,從開放狀態的物料需求取得項目
 DocType: Time Log,Billable,計費
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再訂購數量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,當前職位空缺
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
-DocType: Journal Entry,Write Off,註銷
+DocType: Journal Entry,Write Off,註銷項款
 DocType: Time Log,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶(登錄)的標識。如果設定,這將成為的所有人力資源的預設形式。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}:從{1}
@@ -2556,7 +2572,8 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/public/js/controllers/transaction.js +770,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,展會稅分手
 apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,數據導入和導出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果您涉及製造活動。啟動項目「製造的」
@@ -2569,12 +2586,12 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,使維護訪問
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,請聯繫,誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
-apps/erpnext/erpnext/config/accounts.py +84,Company (not Customer or Supplier) master.,公司(不是客戶或供應商)的主人。
+apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,公司(不是客戶或供應商)的主人。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +381,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注:如果付款不反對任何參考製作,手工製作日記條目。
 DocType: Item,Supplier Items,供應商項目
 DocType: Opportunity,Opportunity Type,機會型
@@ -2586,25 +2603,24 @@
 DocType: Hub Settings,Publish Availability,發布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,發送電子郵件的自動對提交的交易聯繫。
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,對提交的交易,自動發送電子郵件給聯絡人。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","行{0}:數量不是在倉庫avalable {1} {2} {3}。
 可用數量:{4},轉讓數量:{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
-DocType: Purchase Order,Customer Contact Email,客戶聯繫電子郵件
+DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 DocType: Sales Team,Contribution (%),貢獻(%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注:付款項將不會被創建因為“現金或銀行帳戶”未指定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,職責
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,模板
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
 apps/erpnext/erpnext/public/js/setup_wizard.js +161,Add Users,添加用戶
 DocType: Pricing Rule,Item Group,項目群組
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,請設置命名為系列{0}通過設置>設置>命名系列
-DocType: Task,Actual Start Date (via Time Logs),實際開始日期(通過時間日誌)
+DocType: Task,Actual Start Date (via Time Logs),實際開始日期(經由時間日誌)
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架(公司貨幣)
@@ -2612,32 +2628,32 @@
 DocType: Sales Order,Partly Billed,天色帳單
 DocType: Item,Default BOM,預設的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,總街貨量金額
 DocType: Time Log Batch,Total Hours,總時數
-DocType: Journal Entry,Printing Settings,打印設置
+DocType: Journal Entry,Printing Settings,列印設定
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,從送貨單
 DocType: Time Log,From Time,從時間
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 DocType: Purchase Invoice Item,Rate,單價
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,實習生
-DocType: Newsletter,A Lead with this email id should exist,與此電子郵件id一個鉛應該存在
+DocType: Newsletter,A Lead with this email id should exist,以此電子郵件id的機會應該存在
 DocType: Stock Entry,From BOM,從BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',請點擊“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
-apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",如公斤,單位,NOS,M
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
+apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",如公斤,單位,NOS,M
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期,參考編號是強制性的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +26,Salary Structure,薪酬結構
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
@@ -2657,6 +2673,7 @@
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
 DocType: Purchase Invoice Item,Image View,圖像查看
+apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
@@ -2675,14 +2692,14 @@
 DocType: Journal Entry,Print Heading,列印標題
 DocType: Quotation,Maintenance Manager,維護經理
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總計不能為零
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
 DocType: C-Form,Amended From,從修訂
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,原料
-DocType: Leave Application,Follow via Email,通過電子郵件跟隨
+DocType: Leave Application,Follow via Email,透過電子郵件追蹤
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 apps/erpnext/erpnext/accounts/doctype/account/account.py +198,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/stock/get_item_details.py +466,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前,
 DocType: Leave Control Panel,Carry Forward,發揚
@@ -2690,17 +2707,18 @@
 DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
 ,Produced,生產
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
-DocType: Issue,Raised By (Email),提出(電子郵件)
+DocType: Issue,Raised By (Email),由(電子郵件)提出
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Attach Letterhead,附加信
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱(如增值稅,關稅等,它們應該具有唯一的名稱)及其標準費率。這將建立一個可以編輯和增加的標準模板。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
+apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,匹配付款與發票
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於(指定)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,添加到購物車
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
-apps/erpnext/erpnext/config/accounts.py +153,Enable / disable currencies.,啟用/禁用的貨幣。
+apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,啟用/禁用的貨幣。
 DocType: Production Planning Tool,Get Material Request,獲取材質要求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵政費用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共(AMT)
@@ -2708,19 +2726,19 @@
 DocType: Quality Inspection,Item Serial No,產品序列號
 apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,總現
+apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,會計報表
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,小時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,所有這些項目已開具發票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
 DocType: Features Setup,Point of Sale,銷售點
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource > HR Settings,請安裝員工在人力資源命名系統> HR設置
 DocType: Account,Tax,稅
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}:{1}不是有效的{2}
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
@@ -2730,7 +2748,7 @@
 DocType: Features Setup,Item Groups in Details,產品群組之詳細資訊
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起點的銷售終端(POS)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,訪問報告維修電話。
+apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,訪問報告維修電話。
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如:如果你下定100個單位量,而你的許可額度是10%,那麼你可以收到最多110個單位量。
 DocType: Pricing Rule,Customer Group,客戶群組
@@ -2744,14 +2762,13 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,無內容可供編輯
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活動總結
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉,如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Item,Attributes,屬性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,找項目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,請輸入核銷帳戶
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,產品編號>項目組>品牌
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最後訂購日期
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +143,Operation ID not set,操作ID沒有設定
@@ -2762,17 +2779,18 @@
 DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Payment Tool,Make Journal Entry,使日記帳分錄
 DocType: Leave Allocation,New Leaves Allocated,新的排假
-apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +343,Commercial,商業
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} > {1},錯誤:{0}> {1}
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,所有的產品或服務。
-DocType: Purchase Invoice,Supplier Address,供應商地址
+apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,所有的產品或服務。
+DocType: Supplier Quotation,Supplier Address,供應商地址
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
-apps/erpnext/erpnext/config/accounts.py +138,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
+apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
@@ -2783,15 +2801,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +646,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,轉讓
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
 DocType: Authorization Rule,Applicable To (Employee),適用於(員工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Payment Reconciliation,To Invoice Date,要發票日期
 DocType: Supplier,Contact HTML,聯繫HTML
+,Inactive Customers,不活躍的客戶
 DocType: Landed Cost Voucher,Purchase Receipts,採購入庫
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定價規則被如何應用?
 DocType: Quality Inspection,Delivery Note No,送貨單號
@@ -2800,17 +2819,18 @@
 DocType: Attendance,Absent,缺席
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,產品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},行{0}:無效參考{1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
 DocType: Upload Attendance,Download Template,下載模板
 DocType: GL Entry,Remarks,備註
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 DocType: Features Setup,POS View,POS機查看
-apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,對於一個序列號安裝記錄
+apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,對於一個序列號安裝記錄
+apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天,重複上月的天必須相等
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
 DocType: Offer Letter,Awaiting Response,正在等待回應
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,時間日誌已帳單
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,時間日誌已計費
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,帳戶{0}不能為集團
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
@@ -2827,7 +2847,8 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,獲取從產品捆綁項目
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,請設置通過設置編號系列考勤>編號系列
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,從產品包取得項目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,帳戶{0}為未啟用
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期,是強制性的
@@ -2842,13 +2863,13 @@
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,產品規格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服裝及配飾
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,訂購數量
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,訂購數量
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML/橫幅,將顯示在產品列表的頂部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定條件來計算運費金額
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,新增子項目
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬,因為它有子節點
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +45,Opening Value,開度值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,開度值
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,銷售佣金
 DocType: Offer Letter Term,Value / Description,值/說明
@@ -2857,11 +2878,11 @@
 DocType: Production Order,Expected Delivery Date,預計交貨日期
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}#不等於{1}。區別是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +191,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,年齡
 DocType: Time Log,Billing Amount,開票金額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,申請許可。
+apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,申請許可。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +196,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
 DocType: Sales Invoice,Posting Time,登錄時間
@@ -2869,15 +2890,15 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,電話費
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列,則勾選此項。如果您勾選此項,則將沒有預設值。
-apps/erpnext/erpnext/stock/get_item_details.py +101,No Item with Serial No {0},沒有序號{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},沒有序號{0}的品項
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打開通知
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接費用
-apps/erpnext/erpnext/controllers/recurring_document.py +192,"{0} is an invalid email address in 'Notification \
-						Email Address'",{0}在“通知\電子郵件地址”無效的電子郵件地址
+apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+						Email Address'",在“通知\電子郵件地址”中,{0}是無效的電子郵件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +530,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易!
@@ -2891,14 +2912,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,規劃
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +20,Make Time Log Batch,做時間記錄批
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,發行
-DocType: Project,Total Billing Amount (via Time Logs),總結算金額(通過時間日誌)
+DocType: Project,Total Billing Amount (via Time Logs),總結算金額(經由時間日誌)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供應商編號
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
 DocType: Sales Partner,Contact Desc,聯繫倒序
-apps/erpnext/erpnext/config/hr.py +143,"Type of leaves like casual, sick etc.",葉似漫不經心,生病等類型
-DocType: Email Digest,Send regular summary reports via Email.,通過電子郵件發送定期匯總報告。
+apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心,生病等類型
+DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
 DocType: Brand,Item Manager,項目經理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,在帳戶的年度預算中加入新一列。
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
@@ -2912,7 +2933,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,原料不能同主品相
 DocType: Item Attribute Value,Abbreviation,縮寫
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
-apps/erpnext/erpnext/config/hr.py +123,Salary template master.,薪資套版主檔。
+apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪資套版主檔。
 DocType: Leave Type,Max Days Leave Allowed,允許的最長休假天
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,購物車設置稅收規則
 DocType: Payment Tool,Set Matching Amounts,設置相同的金額
@@ -2921,11 +2942,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,縮寫是強制性的
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,感謝您的關注中訂閱我們的更新
 ,Qty to Transfer,轉移數量
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,行情到引線或客戶。
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率(公司貨幣)
@@ -2944,11 +2965,11 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,行#{0}:序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存,就會顯示出來。
 apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,增加運輸成本的規則。
+apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,增加運輸成本的規則。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入門
@@ -2963,11 +2984,11 @@
 DocType: Address,Postal Code,郵政編碼
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","在分
-通過“時間日誌”更新"
+經由“時間日誌”更新"
 DocType: Customer,From Lead,從鉛
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,發布生產訂單。
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,所需的POS資料,使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 DocType: Hub Settings,Name Token,名令牌
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Atleast one warehouse is mandatory,至少要有一間倉庫
@@ -2975,7 +2996,7 @@
 DocType: BOM Replace Tool,Replace,更換
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,請輸入預設的計量單位
-DocType: Purchase Invoice Item,Project Name,專案名稱
+DocType: Project,Project Name,專案名稱
 DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Features Setup,Item Batch Nos,項目批NOS
@@ -2990,7 +3011,7 @@
 DocType: Account,Debit,借方
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Production Order,Operation Cost,運營成本
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,從。csv文件上傳考勤
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,從。csv文件上傳考勤
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
@@ -2998,16 +3019,18 @@
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,會計年度:{0}不存在
 DocType: Currency Exchange,To Currency,到貨幣
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允許以下用戶批准許可申請的區塊天。
-apps/erpnext/erpnext/config/hr.py +163,Types of Expense Claim.,報銷的類型。
+apps/erpnext/erpnext/config/hr.py +136,Types of Expense Claim.,報銷的類型。
 DocType: Item,Taxes,稅
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
 DocType: Sales Invoice,End Date,結束日期
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,證券交易
 DocType: Employee,Internal Work History,內部工作經歷
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
 DocType: Sales Invoice,Exhibition,展覽
+apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",公司是強制性的,因為它是你的公司地址
 DocType: Item Attribute,From Range,從範圍
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,項{0}忽略,因為它不是一個股票項目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
@@ -3070,8 +3093,8 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,馬克缺席
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,到時間必須大於從時間
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Sales Order {0} is not submitted,銷售訂單{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +689,Add items from,添加的項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,新增項目從
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}:父帳戶{1}不屬於該公司{2}
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
@@ -3092,7 +3115,7 @@
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶,不允許設為信用帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶,不允許設為信用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Payment Tool Detail,Against Voucher No,針對券無
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
@@ -3102,15 +3125,14 @@
 DocType: Item Group,Parent Item Group,父項目群組
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,成本中心
-apps/erpnext/erpnext/config/stock.py +110,Warehouses.,倉庫。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:與排時序衝突{1}
 DocType: Opportunity,Next Contact,下一頁聯繫
-apps/erpnext/erpnext/config/accounts.py +94,Setup Gateway accounts.,設置網關帳戶。
+apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
 ,Cash Flow,現金周轉
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +86,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
 DocType: Employee,Notice (days),通告(天)
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
@@ -3120,7 +3142,7 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 -  {0}
 DocType: Production Order,Planned Operating Cost,計劃運營成本
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,新{0}名稱
-apps/erpnext/erpnext/controllers/recurring_document.py +131,Please find attached {0} #{1},隨函附上{0}#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},隨函附上{0}#{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶/品項名稱
@@ -3136,14 +3158,17 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,請從指定/至範圍
 DocType: Serial No,Under AMC,在AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,銷售交易的預設設定。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶組>領地
+apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,銷售交易的預設設定。
 DocType: BOM Replace Tool,Current BOM,當前BOM表
-apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,添加序列號
+apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列號
+apps/erpnext/erpnext/config/support.py +43,Warranty,保證
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,組節點
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小時
+apps/erpnext/erpnext/config/buying.py +7,Purchasing,購買
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫(永續盤存)將在該帳戶下新增。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除,因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
@@ -3152,7 +3177,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣:{1}%
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
 DocType: Sales Invoice,Supplier Reference,供應商參考
 DocType: Production Planning Tool,"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.",如果選中,則BOM的子裝配項目將被視為獲取原料。否則,所有的子組件件,將被視為一個原料。
@@ -3162,7 +3187,7 @@
 DocType: Item Price,Item Price,商品價格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,電影和視頻
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,訂購
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
@@ -3184,11 +3209,10 @@
 DocType: Project Task,View Task,查看任務
 apps/erpnext/erpnext/public/js/setup_wizard.js +40,Your financial year begins on,您的會計年度自
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,請輸入採購入庫單
-DocType: Sales Invoice,Get Advances Received,取得進展收稿
+DocType: Sales Invoice,Get Advances Received,取得預先付款
 DocType: Email Digest,Add/Remove Recipients,添加/刪除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值,點擊“設為預設”
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),設置接收郵件服務器支持電子郵件ID 。 (例如support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺數量
 apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
@@ -3198,21 +3222,22 @@
 DocType: Salary Slip,Payment Days,付款日
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Features Setup,Item Advanced,項目高級
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選中的交易都是“已提交”,郵件彈出窗口自動打開,在該事務發送電子郵件到相關的“聯繫”,與交易作為附件。用戶可能會或可能不會發送電子郵件。
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選取的交易都是“已提交”時,郵件會自動自動打開,發送電子郵件到相關的“聯絡人”通知相關交易,並用該交易作為附件。用戶可決定是否發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
 DocType: Employee Education,Employee Education,員工教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +786,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +782,It is needed to fetch Item Details.,需要獲取項目細節。
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Account,Account,帳戶
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列號{0}已收到
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,已收到序號{0}
 ,Requested Items To Be Transferred,將要轉倉的需求項目
 DocType: Customer,Sales Team Details,銷售團隊詳細
 DocType: Expense Claim,Total Claimed Amount,總索賠額
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,潛在的銷售機會。
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},無效的{0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,病假
 DocType: Email Digest,Email Digest,電子郵件摘要
 DocType: Delivery Note,Billing Address Name,帳單地址名稱
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,請設置命名為系列{0}通過設置>設置>命名系列
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
@@ -3220,12 +3245,12 @@
 DocType: Company,Change Abbreviation,更改縮寫
 DocType: Expense Claim Detail,Expense Date,犧牲日期
 DocType: Item,Max Discount (%),最大折讓(%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,最後訂單金額
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
 DocType: Company,Warn,警告
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論,值得一提的努力,應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Order,Raw Materials Supplied,提供供應商
-DocType: Purchase Invoice,Recurring Print Format,經常打印格式
+DocType: Purchase Invoice,Recurring Print Format,經常列印格式
 DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
 DocType: Appraisal,Appraisal Template,評估模板
@@ -3236,7 +3261,7 @@
 ,General Ledger,總帳
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
 DocType: Item Attribute Value,Attribute Value,屬性值
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的,已經存在{0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的,且已經存在於 {0}
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,請先選擇{0}
 DocType: Features Setup,To get Item Group in details table,取得詳細表格裡的項目群組
@@ -3273,12 +3298,12 @@
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
 ,Project wise Stock Tracking,項目明智的庫存跟踪
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},維護時間表{0}針對存在{0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),實際的數量(在源/目標)
+DocType: Stock Entry Detail,Actual Qty (at source/target),實際的數量(於 來源/目標)
 DocType: Item Customer Detail,Ref Code,參考代碼
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,員工記錄。
+apps/erpnext/erpnext/config/hr.py +12,Employee records.,員工記錄。
 DocType: Payment Gateway,Payment Gateway,支付網關
 DocType: HR Settings,Payroll Settings,薪資設置
-apps/erpnext/erpnext/config/accounts.py +63,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
+apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,下單
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,root不能有一個父成本中心
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,選擇品牌...
@@ -3290,23 +3315,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),900px (寬)x 100像素(高)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
-DocType: Payment Tool,Get Outstanding Vouchers,獲得傑出禮券
+DocType: Payment Tool,Get Outstanding Vouchers,取得傑出傳票
 DocType: Warranty Claim,Resolved By,議決
 DocType: Appraisal,Start Date,開始日期
-apps/erpnext/erpnext/config/hr.py +138,Allocate leaves for a period.,離開一段時間。
+apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,點擊這裡核實
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),材料清單(BOM)
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清單(BOM)
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
 DocType: Time Log,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,刪除項目,如果收費並不適用於該項目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如:。 smsgateway.com / API / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%完成
 DocType: Employee,Educational Qualification,學歷
@@ -3319,37 +3344,36 @@
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
-apps/erpnext/erpnext/config/stock.py +136,Main Reports,主報告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心的圖
-,Requested Items To Be Ordered,要訂購的需求項目
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,我的訂單
+,Requested Items To Be Ordered,將要採購的需求項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,我的訂單
 DocType: Price List,Price List Name,價格列表名稱
 DocType: Time Log,For Manufacturing,對於製造業
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,總計
 DocType: BOM,Manufacturing,製造
-,Ordered Items To Be Delivered,訂購項目交付
+,Ordered Items To Be Delivered,未交貨的訂購項目
 DocType: Account,Income,收入
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,出事了!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +102,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金額(公司貨幣)
-apps/erpnext/erpnext/config/hr.py +113,Organization unit (department) master.,組織單位(部門)的主人。
+apps/erpnext/erpnext/config/hr.py +185,Organization unit (department) master.,組織單位(部門)的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,請輸入有效的手機號
 DocType: Budget Detail,Budget Detail,預算案詳情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前,請填寫留言
-apps/erpnext/erpnext/config/accounts.py +137,Point-of-Sale Profile,簡介銷售點的
+apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新短信設置
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,時間日誌{0}已結算
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,數金額金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
 DocType: Purchase Receipt Item,Received and Accepted,收到並接受
 ,Serial No Service Contract Expiry,序號服務合同到期
@@ -3384,12 +3408,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +21,What does it do?,它有什麼作用?
 DocType: Delivery Note,To Warehouse,到倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},帳戶{0}已多次輸入會計年度{1}
-,Average Commission Rate,平均佣金率
+,Average Commission Rate,平均佣金比率
 apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
+apps/erpnext/erpnext/config/stock.py +164,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,電子的
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差(輸出 - )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,行{0}:匯率是必須的
@@ -3397,15 +3421,14 @@
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},生日提醒{0}
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Balance Sheet account,借記帳戶必須是資產負債表科目
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},難道你真的想要提交的所有{1}年{0}月的工資單
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,進口認購
 DocType: Target Detail,Target Qty,目標數量
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,請設置通過設置編號系列考勤>編號系列
 DocType: Shopping Cart Settings,Checkout Settings,結帳設置
 DocType: Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
@@ -3415,9 +3438,9 @@
 DocType: Sales Order Item,Ordered Qty,訂購數量
 apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動/任務。
-apps/erpnext/erpnext/config/hr.py +78,Generate Salary Slips,生成工資條
+apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動/任務。
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查,如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額(公司貨幣)
@@ -3436,7 +3459,7 @@
 DocType: Sales Order,Partly Delivered,部分交付
 DocType: Sales Invoice,Existing Customer,現有客戶
 DocType: Email Digest,Receivables,應收賬款
-DocType: Customer,Additional information regarding the customer.,對於客戶的其他信息。
+DocType: Customer,Additional information regarding the customer.,對於客戶的其他訊息。
 DocType: Quality Inspection Reading,Reading 5,閱讀5
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,活動名稱是必需的
 DocType: Maintenance Visit,Maintenance Date,維修日期
@@ -3453,7 +3476,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設置電子郵件
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,每日提醒
@@ -3465,14 +3488,14 @@
 DocType: Item,Thumbnail,縮略圖
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,確認您的電子郵件
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,報價候選作業。
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,報價候選作業。
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,分配的總葉多天的期限
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
-apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,會計交易的預設設定。
+apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,會計交易的預設設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
-apps/erpnext/erpnext/stock/get_item_details.py +115,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
+apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
 DocType: Sales Order,Printing Details,印刷詳情
@@ -3480,7 +3503,7 @@
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程師
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: Sales Partner,Partner Type,合作夥伴類型
 DocType: Purchase Taxes and Charges,Actual,實際
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
@@ -3506,24 +3529,25 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,不甘心成功
 DocType: Production Order,Planned End Date,計劃的結束日期
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,項目的存儲位置。
+apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,項目的存儲位置。
 DocType: Tax Rule,Validity,有效性
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,發票金額
 DocType: Attendance,Attendance,出勤
+apps/erpnext/erpnext/config/projects.py +55,Reports,報告
 DocType: BOM,Materials,物料
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選中,則列表將被添加到每個應被添加的部門。
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取,則該列表將被加到每個應被應用到的部門。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,稅務模板購買交易。
+apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存,就會顯示出來。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +120,Price List master.,價格表主檔
+apps/erpnext/erpnext/config/stock.py +77,Price List master.,價格表主檔
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,沒有權限使用支付工具
-apps/erpnext/erpnext/controllers/recurring_document.py +196,'Notification Email Addresses' not specified for recurring %s,為重複%不是指定的“通知電子郵件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,重複%的“通知用電子郵件地址”尚未指定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
@@ -3531,7 +3555,7 @@
 DocType: Customer Group,Parent Customer Group,母客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +455,Change,更改
 DocType: Purchase Invoice,Contact Email,聯絡電郵
-DocType: Appraisal Goal,Score Earned,獲得得分
+DocType: Appraisal Goal,Score Earned,得分
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期
 DocType: Bank Reconciliation Detail,Voucher ID,優惠券編號
@@ -3547,7 +3571,7 @@
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
 apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
-DocType: Task,Actual End Date (via Time Logs),實際結束日期(通過時間日誌)
+DocType: Task,Actual End Date (via Time Logs),實際結束日期(經由時間日誌)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,請輸入父成本中心
 DocType: Delivery Note,Print Without Amount,列印表單時不印金額
@@ -3555,22 +3579,23 @@
 DocType: Issue,Support Team,支持團隊
 DocType: Appraisal,Total Score (Out of 5),總分(滿分5分)
 DocType: Batch,Batch,批量
-apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,平衡
+apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,餘額
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷(通過費用報銷)
 DocType: Journal Entry,Debit Note,繳費單
 DocType: Stock Entry,As per Stock UOM,按庫存計量單位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
 DocType: Journal Entry,Total Debit,借方總額
-DocType: Manufacturing Settings,Default Finished Goods Warehouse,默認成品倉庫
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,銷售人員
 DocType: Sales Invoice,Cold Calling,自薦
 DocType: SMS Parameter,SMS Parameter,短信參數
+apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,預算和成本中心
 DocType: Maintenance Schedule Item,Half Yearly,半年度
 DocType: Lead,Blog Subscriber,網誌訂閱者
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中,則總數。工作日將包括節假日,這將縮短每天的工資的價值
 DocType: Purchase Invoice,Total Advance,預付款總計
-apps/erpnext/erpnext/config/hr.py +235,Processing Payroll,處理工資單
+apps/erpnext/erpnext/config/hr.py +257,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,Set as Lost,設為失落
@@ -3578,10 +3603,10 @@
 DocType: Supplier,Credit Days Based On,信貸天基於
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,規劃工作站工作時間以外的時間日誌。
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} 已提交
-,Items To Be Requested,項目要請求
-DocType: Purchase Order,Get Last Purchase Rate,獲取最新預訂價
+,Items To Be Requested,需求項目
+DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根據活動類型計費率(每小時)
 DocType: Company,Company Info,公司資訊
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +216,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到,因此郵件無法發送
@@ -3597,11 +3622,12 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,產品編號>項目組>品牌
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}:{1}不存在
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,客戶提出的賬單。
+apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}用戶已新增
@@ -3622,9 +3648,9 @@
 DocType: Employee,Current Address Is,當前地址是
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣,如果沒有指定。
 DocType: Address,Office,辦公室
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
+apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +248,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,請選擇員工記錄第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客戶不與匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要創建一個納稅帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,Please enter Expense Account,請輸入您的費用帳戶
@@ -3632,7 +3658,7 @@
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目,然後描述,圖像,定價,稅費等會從模板中設置的一個變體,除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購/製造詳細資訊
-apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,批量庫存
+apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單(待定提供)
@@ -3650,7 +3676,7 @@
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
 DocType: Production Order,Actual Start Date,實際開始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,記錄項目移動。
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,記錄項目移動。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
 DocType: Hub Settings,Hub Settings,中心設定
 DocType: Project,Gross Margin %,毛利率%
@@ -3662,29 +3688,29 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,請輸入至少一行的付款金額
 DocType: POS Profile,POS Profile,POS簡介
-DocType: Payment Gateway Account,Payment URL Message,付款URL信息
-apps/erpnext/erpnext/config/accounts.py +163,"Seasonality for setting budgets, targets etc.",季節性設置預算,目標等。
+DocType: Payment Gateway Account,Payment URL Message,付款URL訊息
+apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",季節性設置預算,目標等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}:付款金額不能大於傑出金額
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,總未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,時間日誌是不計費
-apps/erpnext/erpnext/stock/get_item_details.py +118,"Item {0} is a template, please select one of its variants",項目{0}是一個模板,請選擇它的一個變體
+apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",項目{0}是一個模板,請選擇它的一個變體
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,購買者
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,淨工資不能為負
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,Please enter the Against Vouchers manually,請手動輸入對優惠券
 DocType: SMS Settings,Static Parameters,靜態參數
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,材料到供應商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,消費稅發票
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,流動負債
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,發送群發短信到您的聯繫人
+apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,發送群發短信到您的聯繫人
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +59,Actual Qty is mandatory,實際數量是強制性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,庫存交易的預設設定。
+apps/erpnext/erpnext/config/stock.py +175,Default settings for stock transactions.,庫存交易的預設設定。
 DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,請輸入稅費
@@ -3698,14 +3724,16 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在繼續之前,您必須儲存表單
 DocType: Item Attribute,Numeric Values,數字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,附加標誌
-DocType: Customer,Commission Rate,佣金率
+DocType: Customer,Commission Rate,佣金比率
 apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
-apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,按部門封鎖請假申請。
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部門封鎖請假申請。
+apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics(分析)
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無缺省地址模板中。請創建設置>打印和品牌>地址模板一個新的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,root不能被編輯。
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
-DocType: Manufacturing Settings,Allow Production on Holidays,允許生產的假日
+DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
@@ -3714,7 +3742,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,請選擇一個csv文件
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,設計師
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,條款及細則範本
+apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 ,Item-wise Purchase Register,項目明智的購買登記
@@ -3722,21 +3750,21 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平,項目必須購買項目或生產項目
 ,Supplier Addresses and Contacts,供應商的地址和聯繫方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,請先選擇分類
-apps/erpnext/erpnext/config/projects.py +18,Project master.,專案主持。
+apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +402, (Half Day),(半天)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +409, (Half Day),(半天)
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,從物料清單獲取項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清單
+apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:黨的類型和黨的需要應收/應付帳戶{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}:借記條目不能與連接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}:借方條目不能與{1}連接
 apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。